[maemo-commits] [maemo-commits] r11182 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-04-20 16:46:12 +0300 (Fri, 20 Apr 2007)
New Revision: 11182

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkcombo.c
   projects/haf/trunk/gtk+/gtk/gtkcombobox.c
Log:
2007-04-20  Michael Natterer  <mitch at imendio.com>

	Merge from upstream trunk, replacing the old hildon popup name:

    2007-03-07  Matthias Clasen <mclasen at redhat.com>

	* gtk/gtkcombo.c: (gtk_combo_init):
	* gtk/gtkcombobox.c: (gtk_combo_box_set_popup_widget),
	(gtk_combo_box_menu_setup):
	Set names on the popup widgets to make them themable. (#414975, 
	Benjamin Berg)



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-04-20 13:01:07 UTC (rev 11181)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-04-20 13:46:12 UTC (rev 11182)
@@ -1,5 +1,17 @@
 2007-04-20  Michael Natterer  <mitch at imendio.com>
 
+	Merge from upstream trunk, replacing the old hildon popup name:
+
+    2007-03-07  Matthias Clasen <mclasen at redhat.com>
+
+	* gtk/gtkcombo.c: (gtk_combo_init):
+	* gtk/gtkcombobox.c: (gtk_combo_box_set_popup_widget),
+	(gtk_combo_box_menu_setup):
+	Set names on the popup widgets to make them themable. (#414975, 
+	Benjamin Berg)
+
+2007-04-20  Michael Natterer  <mitch at imendio.com>
+
 	* gtk/gtkscrolledwindow.c: back out "keep focussed child visible
 	when size changes".
 

Modified: projects/haf/trunk/gtk+/gtk/gtkcombo.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkcombo.c	2007-04-20 13:01:07 UTC (rev 11181)
+++ projects/haf/trunk/gtk+/gtk/gtkcombo.c	2007-04-20 13:46:12 UTC (rev 11182)
@@ -939,6 +939,7 @@
 		    G_CALLBACK (gtk_combo_popup_button_leave), combo);
 
   combo->popwin = gtk_window_new (GTK_WINDOW_POPUP);
+  gtk_widget_set_name (combo->popwin, "gtk-combo-popup-window");
   gtk_window_set_type_hint (GTK_WINDOW (combo->popwin), GDK_WINDOW_TYPE_HINT_COMBO);
   g_object_ref (combo->popwin);
   gtk_window_set_resizable (GTK_WINDOW (combo->popwin), FALSE);

Modified: projects/haf/trunk/gtk+/gtk/gtkcombobox.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkcombobox.c	2007-04-20 13:01:07 UTC (rev 11181)
+++ projects/haf/trunk/gtk+/gtk/gtkcombobox.c	2007-04-20 13:46:12 UTC (rev 11182)
@@ -1320,9 +1320,7 @@
 	  GtkWidget *toplevel;
 	  
           combo_box->priv->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
-#ifdef MAEMO_CHANGES
-          gtk_widget_set_name (combo_box->priv->popup_window, "hildon-combobox-window"); 
-#endif /* MAEMO_CHANGES */
+          gtk_widget_set_name (combo_box->priv->popup_window, "gtk-combobox-popup-window");
 
 	  gtk_window_set_type_hint (GTK_WINDOW (combo_box->priv->popup_window),
 				    GDK_WINDOW_TYPE_HINT_COMBO);
@@ -2698,6 +2696,8 @@
 
   /* create our funky menu */
   menu = gtk_menu_new ();
+  gtk_widget_set_name (menu, "gtk-combobox-popup-menu");
+  
   g_signal_connect (menu, "key_press_event",
 		    G_CALLBACK (gtk_combo_box_menu_key_press), combo_box);
   gtk_combo_box_set_popup_widget (combo_box, menu);