[maemo-commits] [maemo-commits] r11282 - in projects/haf/tags/gtk+2.0: . 2.10.6-0osso11 2.10.6-0osso11/gtk

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-04-25 11:04:46 +0300 (Wed, 25 Apr 2007)
New Revision: 11282

Added:
   projects/haf/tags/gtk+2.0/2.10.6-0osso11/
Modified:
   projects/haf/tags/gtk+2.0/2.10.6-0osso11/ChangeLog
   projects/haf/tags/gtk+2.0/2.10.6-0osso11/gtk/gtkcombo.c
   projects/haf/tags/gtk+2.0/2.10.6-0osso11/gtk/gtkcombobox.c
Log:
gtk+ 2.10.6-0osso11



Copied: projects/haf/tags/gtk+2.0/2.10.6-0osso11 (from rev 11279, projects/haf/trunk/gtk+)

Modified: projects/haf/tags/gtk+2.0/2.10.6-0osso11/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-04-25 08:03:21 UTC (rev 11279)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso11/ChangeLog	2007-04-25 08:04:46 UTC (rev 11282)
@@ -1,17 +1,5 @@
 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/tags/gtk+2.0/2.10.6-0osso11/gtk/gtkcombo.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkcombo.c	2007-04-25 08:03:21 UTC (rev 11279)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso11/gtk/gtkcombo.c	2007-04-25 08:04:46 UTC (rev 11282)
@@ -939,7 +939,6 @@
 		    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/tags/gtk+2.0/2.10.6-0osso11/gtk/gtkcombobox.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkcombobox.c	2007-04-25 08:03:21 UTC (rev 11279)
+++ projects/haf/tags/gtk+2.0/2.10.6-0osso11/gtk/gtkcombobox.c	2007-04-25 08:04:46 UTC (rev 11282)
@@ -1320,7 +1320,9 @@
 	  GtkWidget *toplevel;
 	  
           combo_box->priv->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
-          gtk_widget_set_name (combo_box->priv->popup_window, "gtk-combobox-popup-window");
+#ifdef MAEMO_CHANGES
+          gtk_widget_set_name (combo_box->priv->popup_window, "hildon-combobox-window"); 
+#endif /* MAEMO_CHANGES */
 
 	  gtk_window_set_type_hint (GTK_WINDOW (combo_box->priv->popup_window),
 				    GDK_WINDOW_TYPE_HINT_COMBO);
@@ -2696,8 +2698,6 @@
 
   /* 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);