diff options
| author | Ted Gould <ted@gould.cx> | 2011-08-22 21:43:13 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-08-22 21:43:13 -0500 |
| commit | 007c157b059f3b3619d7a6c4aa3ff79f5b46f539 (patch) | |
| tree | 8a6456175ac75e3130800f94b4774a9866fc8d0d /libdbusmenu-gtk | |
| parent | c9245e5be5eba930ebb83b6dc1ac3f0ba30ca4a6 (diff) | |
| download | libdbusmenu-007c157b059f3b3619d7a6c4aa3ff79f5b46f539.tar.gz libdbusmenu-007c157b059f3b3619d7a6c4aa3ff79f5b46f539.tar.bz2 libdbusmenu-007c157b059f3b3619d7a6c4aa3ff79f5b46f539.zip | |
Fixing the comparision so that we don't block updates
Diffstat (limited to 'libdbusmenu-gtk')
| -rw-r--r-- | libdbusmenu-gtk/genericmenuitem.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c index e474446..b1d7a29 100644 --- a/libdbusmenu-gtk/genericmenuitem.c +++ b/libdbusmenu-gtk/genericmenuitem.c @@ -198,22 +198,22 @@ get_text_color (GenericmenuitemDisposition disposition, GtkStyleContext * contex /* Set the label on the item */ static void -set_label (GtkMenuItem * menu_item, const gchar * label) +set_label (GtkMenuItem * menu_item, const gchar * in_label) { - if (label == NULL) return; + if (in_label == NULL) return; /* Build a label that might include the colors of the disposition so that it gets rendered in the menuitem. */ gchar * local_label = NULL; switch (GENERICMENUITEM(menu_item)->priv->disposition) { case GENERICMENUITEM_DISPOSITION_NORMAL: - local_label = g_strdup(label); + local_label = g_strdup(in_label); break; case GENERICMENUITEM_DISPOSITION_INFORMATIONAL: case GENERICMENUITEM_DISPOSITION_WARNING: case GENERICMENUITEM_DISPOSITION_ALERT: { gchar * color = get_text_color(GENERICMENUITEM(menu_item)->priv->disposition, gtk_widget_get_style_context(GTK_WIDGET(menu_item))); - local_label = g_markup_printf_escaped("<span color=\"%s\">%s</span>", color, label); + local_label = g_markup_printf_escaped("<span fgcolor=\"%s\">%s</span>", color, in_label); g_free(color); break; } @@ -260,6 +260,7 @@ set_label (GtkMenuItem * menu_item, const gchar * label) gtk_label_set_use_markup(GTK_LABEL(labelw), TRUE); gtk_misc_set_alignment(GTK_MISC(labelw), 0.0, 0.5); gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item)); + gtk_label_set_markup_with_mnemonic(labelw, local_label); gtk_widget_show(GTK_WIDGET(labelw)); /* Check to see if it needs to be in the bin for this @@ -271,7 +272,7 @@ set_label (GtkMenuItem * menu_item, const gchar * label) } } else { /* Oh, just an update. No biggie. */ - if (!g_strcmp0(label, gtk_label_get_label(labelw))) { + if (!g_strcmp0(local_label, gtk_label_get_label(labelw))) { /* The only reason to suppress the update is if we had a label and the value was the same as the one we're getting in. */ |