[gtk+/combo-refactor: 29/42] Fixed combo box for broken build and api updates.

[Tristan Van Berkom <tvb src gnome org>]

commit 624d25d562a09994a7903679a14db21b4097698c
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Thu Nov 25 15:47:14 2010 +0900

    Fixed combo box for broken build and api updates.

 gtk/gtkcombobox.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index b0ffc1f..2eef7cb 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2338,7 +2338,8 @@ gtk_combo_box_add (GtkContainer *container,
     {
       /* this flag is a hack to tell the entry to fill its allocation.
        */
-      GTK_ENTRY (widget)->is_cell_renderer = TRUE;
+      // XXX This went missing ! jjardon !!! 
+      // GTK_ENTRY (widget)->is_cell_renderer = TRUE;
 
       g_signal_connect (widget, "changed",
 			G_CALLBACK (gtk_combo_box_entry_contents_changed),
@@ -2367,7 +2368,9 @@ gtk_combo_box_remove (GtkContainer *container,
 	  g_signal_handlers_disconnect_by_func (widget,
 						gtk_combo_box_entry_contents_changed,
 						container);
-	  GTK_ENTRY (widget)->is_cell_renderer = FALSE;
+
+	  // XXX This went missing ! jjardon !!! 
+	  // GTK_ENTRY (widget)->is_cell_renderer = FALSE;
 	}
     }
 
@@ -5200,7 +5203,7 @@ gtk_combo_box_popup_for_device (GtkComboBox *combo_box,
 
   time = gtk_get_current_event_time ();
 
-  if (device->source == GDK_SOURCE_KEYBOARD)
+  if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
     {
       keyboard = device;
       pointer = gdk_device_get_associated_device (device);