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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-02-21 12:56:02 +0200 (Wed, 21 Feb 2007)
New Revision: 10101

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c
   projects/haf/trunk/hildon-desktop/src/hn-others-button.c
Log:

2007-02-21  Johan Bilien  <johan.bilien at nokia.com>

	* libhildondesktop/hildon-home-titlebar.c: Work around a bug
	in GTK+/matchbox by not attaching the menu to the titlebar



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-02-21 10:52:13 UTC (rev 10100)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-02-21 10:56:02 UTC (rev 10101)
@@ -1,3 +1,8 @@
+2007-02-21  Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/hildon-home-titlebar.c: Work around a bug
+	in GTK+/matchbox by not attaching the menu to the titlebar
+
 2007-02-21  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/main.c: user GETTEXT_PACKAGE to setup the l10n environment.

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c	2007-02-21 10:52:13 UTC (rev 10100)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c	2007-02-21 10:56:02 UTC (rev 10101)
@@ -178,24 +178,6 @@
 }
 
 static void
-titlebar_normal_menu_detach (GtkWidget *widget,
-                             GtkMenu   *menu)
-{
-  HildonHomeTitlebar *titlebar = HILDON_HOME_TITLEBAR (widget);
-
-  titlebar->priv->menu = NULL;
-}
-
-static void
-titlebar_layout_menu_detach (GtkWidget *widget,
-                             GtkMenu   *menu)
-{
-  HildonHomeTitlebar *titlebar = HILDON_HOME_TITLEBAR (widget);
-
-  titlebar->priv->menu = NULL;
-}
-
-static void
 titlebar_menu_position_func (GtkMenu  *menu,
                              gint     *x,
                              gint     *y,
@@ -647,9 +629,6 @@
   if (priv->menu)
     gtk_menu_detach (GTK_MENU (priv->menu));
 
-  gtk_menu_attach_to_widget (GTK_MENU (menu), 
-                             GTK_WIDGET (titlebar),
-                             titlebar_normal_menu_detach);
   priv->menu = menu;
 
   gtk_widget_set_name (menu, HH_TITLEBAR_MENU_WIDGET_NAME);
@@ -676,9 +655,6 @@
   if (priv->layout_menu)
     gtk_menu_detach (GTK_MENU (priv->layout_menu));
 
-  gtk_menu_attach_to_widget (GTK_MENU (menu), 
-                             GTK_WIDGET (titlebar),
-                             titlebar_layout_menu_detach);
   priv->layout_menu = menu;
 
   gtk_widget_set_name (menu, HH_TITLEBAR_MENU_WIDGET_NAME);

Modified: projects/haf/trunk/hildon-desktop/src/hn-others-button.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hn-others-button.c	2007-02-21 10:52:13 UTC (rev 10100)
+++ projects/haf/trunk/hildon-desktop/src/hn-others-button.c	2007-02-21 10:56:02 UTC (rev 10101)
@@ -507,7 +507,7 @@
         menu_item = hildon_thumb_menu_item_new_with_labels (
       	        (item_text_domain && *item_text_domain)?
       	        dgettext(item_text_domain, item_name):
-      	        _(item_name),
+      	        dgettext("maemo-af-desktop", item_name),
       	        NULL,
       	        child_string);
 
@@ -554,7 +554,7 @@
       menu_item = hildon_thumb_menu_item_new_with_labels (
       		(item_text_domain && *item_text_domain)?
       		dgettext(item_text_domain, item_name):
-      		_(item_name),
+      		dgettext("maemo-af-desktop", item_name),
       		NULL,
       		/* work around strange behaviour of gettext for
       		 * empty  strings