diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2010-06-24 11:32:58 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2010-06-24 11:32:58 -0400 |
| commit | d98486469b525ca805d6cabb7a12972f5980aba9 (patch) | |
| tree | f13d98c0c98e966c081392d8ad936015bd54f1fa /libdbusmenu-gtk/genericmenuitem.c | |
| parent | c6d95ac4d53118c0a2f4b05c760bd03cc55e8c67 (diff) | |
| parent | 32f588f06d63bc4742a4718f6212027aface0137 (diff) | |
| download | libdbusmenu-d98486469b525ca805d6cabb7a12972f5980aba9.tar.gz libdbusmenu-d98486469b525ca805d6cabb7a12972f5980aba9.tar.bz2 libdbusmenu-d98486469b525ca805d6cabb7a12972f5980aba9.zip | |
* New upstream release.
* Adding support for menu shortcuts (LP: #591293)
* Fixing distcheck of documentation builds
* Autogen.sh fix for adding custom prefix (LP: #595565)
* Fixing children property name to match spec (LP: #597321)
* Merging in Debian branch
* debian/control: Switching branch on this branch to be the
dbusmenu-team.
* debian/rules: Updating shlibs to 0.3.3 for shortcut API additions
* Merge from Ubuntu.
Closes: #586069
* debian/control:
- Set Maintainer to pkg-ayatana.
- Add myself as Uploader.
- Update package descriptions.
- Standards-Version: 3.8.4
- Fix Homepage URL.
- Update Vcs-* fields.
* debian/copyright:
- Convert to DEP5 format.
- Add Ken and Sebastien, according to changelog.
- Add Aurélien Gâteau, according to headers.
Diffstat (limited to 'libdbusmenu-gtk/genericmenuitem.c')
| -rw-r--r-- | libdbusmenu-gtk/genericmenuitem.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c index 8f40d93..30b072f 100644 --- a/libdbusmenu-gtk/genericmenuitem.c +++ b/libdbusmenu-gtk/genericmenuitem.c @@ -158,6 +158,8 @@ get_hpadding (GtkWidget * widget) static void set_label (GtkMenuItem * menu_item, const gchar * label) { + if (label == NULL) return; + GtkWidget * child = gtk_bin_get_child(GTK_BIN(menu_item)); GtkLabel * labelw = NULL; gboolean suppress_update = FALSE; @@ -191,9 +193,10 @@ set_label (GtkMenuItem * menu_item, const gchar * label) update the one that we already have. */ if (labelw == NULL) { /* Build it */ - labelw = GTK_LABEL(gtk_label_new(label)); + labelw = GTK_LABEL(gtk_accel_label_new(label)); gtk_label_set_use_underline(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_widget_show(GTK_WIDGET(labelw)); /* Check to see if it needs to be in the bin for this |