gdm r6557 - in trunk: . gui/user-switch-applet

[mccann svn gnome org]

Author: mccann
Date: Wed Oct  1 20:50:52 2008
New Revision: 6557
URL: http://svn.gnome.org/viewvc/gdm?rev=6557&view=rev

Log:
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.




Modified:
   trunk/ChangeLog
   trunk/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
   trunk/gui/user-switch-applet/applet.c

Modified: trunk/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
==============================================================================
--- trunk/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml	(original)
+++ trunk/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml	Wed Oct  1 20:50:52 2008
@@ -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"

Modified: trunk/gui/user-switch-applet/applet.c
==============================================================================
--- trunk/gui/user-switch-applet/applet.c	(original)
+++ trunk/gui/user-switch-applet/applet.c	Wed Oct  1 20:50:52 2008
@@ -314,8 +314,9 @@
                 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);