diff options
| author | William Jon McCann <jmccann@redhat.com> | 2008-10-01 20:50:52 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2008-10-01 20:50:52 +0000 |
| commit | 5057e912c20561ce865b1febaedfb0d80831d919 (patch) | |
| tree | a0cb7afe8e28e8e771bdfac12f9a170fe229e050 | |
| parent | 2c29881594d1b369cc77472b3f753ba84bef9add (diff) | |
| download | gdm-5057e912c20561ce865b1febaedfb0d80831d919.tar.gz | |
Really remove Help item from menu.
2008-10-01 William Jon McCann <jmccann@redhat.com>
* gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml:
* gui/user-switch-applet/applet.c (applet_change_background_cb):
Really remove Help item from menu.
svn path=/trunk/; revision=6557
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml | 8 | ||||
| -rw-r--r-- | gui/user-switch-applet/applet.c | 3 |
3 files changed, 8 insertions, 9 deletions
@@ -1,3 +1,9 @@ +2008-10-01 William Jon McCann <jmccann@redhat.com> + + * gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml: + * gui/user-switch-applet/applet.c (applet_change_background_cb): + Really remove Help item from menu. + 2008-10-01 Ray Strode <rstrode@redhat.com> * gui/simple-greeter/gdm-option-widget.c diff --git a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml b/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml index 6b4b1844..e1845c85 100644 --- a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml +++ b/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml @@ -9,14 +9,6 @@ name="Users and Groups Admin Item" verb="GdmUsersGroupsAdmin" _label="_Edit Users and Groups"/> - <separator - name="GdmSeparator"/> - <menuitem - name="Help Item" - verb="GdmHelp" - _label="_Help" - pixtype="stock" - pixname="gtk-help"/> <menuitem name="About Item" verb="GdmAbout" diff --git a/gui/user-switch-applet/applet.c b/gui/user-switch-applet/applet.c index fefbcb53..8c6f8411 100644 --- a/gui/user-switch-applet/applet.c +++ b/gui/user-switch-applet/applet.c @@ -314,8 +314,9 @@ applet_change_background_cb (PanelApplet *applet, break; case PANEL_PIXMAP_BACKGROUND: style = gtk_style_copy (adata->menubar->style); - if (style->bg_pixmap[GTK_STATE_NORMAL]) + if (style->bg_pixmap[GTK_STATE_NORMAL]) { g_object_unref (style->bg_pixmap[GTK_STATE_NORMAL]); + } style->bg_pixmap[GTK_STATE_NORMAL] = g_object_ref (pixmap); gtk_widget_set_style (adata->menubar, style); |