priv->label = gtk_label_new (NULL);
priv->image = gtk_image_new_from_stock (NULL, GTK_ICON_SIZE_DIALOG);
+ g_object_set (priv->image, "use-fallback", TRUE, NULL);
gtk_widget_set_halign (priv->image, GTK_ALIGN_CENTER);
gtk_widget_set_valign (priv->image, GTK_ALIGN_START);
{
GtkMessageDialogPrivate *priv = dialog->priv;
- if (priv->has_secondary_text && !priv->has_primary_markup)
+ if (!priv->has_primary_markup)
{
PangoAttrList *attributes;
PangoAttribute *attr;
attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
pango_attr_list_insert (attributes, attr);
- attr = pango_attr_scale_new (PANGO_SCALE_LARGE);
- pango_attr_list_insert (attributes, attr);
+ if (priv->has_secondary_text)
+ {
+ attr = pango_attr_scale_new (PANGO_SCALE_LARGE);
+ pango_attr_list_insert (attributes, attr);
+ }
gtk_label_set_attributes (GTK_LABEL (priv->label), attributes);
pango_attr_list_unref (attributes);
GtkMessageDialogPrivate *priv = dialog->priv;
const gchar *stock_id = NULL;
AtkObject *atk_obj;
-
+ GIcon *gicon = NULL;
+
priv->message_type = type;
switch (type)
{
case GTK_MESSAGE_INFO:
stock_id = GTK_STOCK_DIALOG_INFO;
+ gicon = g_themed_icon_new_with_default_fallbacks ("dialog-information-symbolic");
break;
case GTK_MESSAGE_QUESTION:
stock_id = GTK_STOCK_DIALOG_QUESTION;
+ gicon = g_themed_icon_new_with_default_fallbacks ("dialog-question-symbolic");
break;
case GTK_MESSAGE_WARNING:
stock_id = GTK_STOCK_DIALOG_WARNING;
+ gicon = g_themed_icon_new_with_default_fallbacks ("dialog-warning-symbolic");
break;
-
+
case GTK_MESSAGE_ERROR:
stock_id = GTK_STOCK_DIALOG_ERROR;
+ gicon = g_themed_icon_new_with_default_fallbacks ("dialog-error-symbolic");
break;
case GTK_MESSAGE_OTHER:
break;
}
- if (stock_id)
- gtk_image_set_from_stock (GTK_IMAGE (priv->image), stock_id,
- GTK_ICON_SIZE_DIALOG);
-
+ gtk_image_set_from_gicon (GTK_IMAGE (priv->image), gicon, GTK_ICON_SIZE_DIALOG);
+ if (gicon)
+ g_object_unref (gicon);
+
atk_obj = gtk_widget_get_accessible (GTK_WIDGET (dialog));
if (GTK_IS_ACCESSIBLE (atk_obj))
{
* Sets the secondary text of the message dialog to be @message_format
* (with printf()-style).
*
- * Note that setting a secondary text makes the primary text become
- * bold, unless you have provided explicit markup.
- *
* Since: 2.6
*/
void
* printf()-style), which is marked up with the
* <link linkend="PangoMarkupFormat">Pango text markup language</link>.
*
- * Note that setting a secondary text makes the primary text become
- * bold, unless you have provided explicit markup.
- *
* Due to an oversight, this function does not escape special XML characters
* like gtk_message_dialog_new_with_markup() does. Thus, if the arguments
* may contain special XML characters, you should use g_markup_printf_escaped()