[maemo-commits] [maemo-commits] r11774 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-05-23 14:55:12 +0300 (Wed, 23 May 2007)
New Revision: 11774

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c
Log:

	* src/hd-switcher-menu-item.c:
        - Reverting to GtkMenuItem. Image shows but behavior not consistent
        enough.
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-23 11:53:30 UTC (rev 11773)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-23 11:55:12 UTC (rev 11774)
@@ -1,6 +1,12 @@
 2007-05-22  Moises Martinez  <moises.martinez at nokia.com>
 
 	* src/hd-switcher-menu-item.c:
+	- Reverting to GtkMenuItem. Image shows but behavior not consistent
+	enough.
+
+2007-05-22  Moises Martinez  <moises.martinez at nokia.com>
+
+	* src/hd-switcher-menu-item.c:
 	- Inherits againg from GtkImageMenuItem.
 	* src/hd-switcher-menu.c:
 	- Implemented dettached menu button.

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c	2007-05-23 11:53:30 UTC (rev 11773)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c	2007-05-23 11:55:12 UTC (rev 11774)
@@ -129,7 +129,7 @@
   HildonDesktopNotificationManager *nm;
 };
 
-G_DEFINE_TYPE (HDSwitcherMenuItem, hd_switcher_menu_item, GTK_TYPE_IMAGE_MENU_ITEM);
+G_DEFINE_TYPE (HDSwitcherMenuItem, hd_switcher_menu_item, GTK_TYPE_MENU_ITEM);
 
 static void
 hd_switcher_menu_item_finalize (GObject *gobject)
@@ -298,7 +298,7 @@
   gtk_widget_show (hbox);
 
   priv->icon = gtk_image_new ();
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), priv->icon);
+  gtk_box_pack_start (GTK_BOX (hbox), priv->icon, FALSE, FALSE, 0);
   gtk_widget_show (priv->icon);
 
   vbox = gtk_vbox_new (FALSE, 0);