[glade3/offscreen-gtk3: 77/78] * Making offscreen-gtk3 branch compile again after merging master, also making libgladeui librar

[Tristan Van Berkom <tvb src gnome org>]

commit 612b0fcfd13494940e65304f8d27def6c00fa9eb
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Wed Dec 22 18:18:59 2010 +0900

    	* Making offscreen-gtk3 branch compile again after merging master,
    	  also making libgladeui library libgladeui-2.

 ChangeLog                          |    5 +++++
 gladeui/glade-cell-renderer-icon.c |    9 ++++-----
 gladeui/glade-previewer.c          |    2 +-
 plugins/gtk+/Makefile.am           |    4 ++--
 plugins/gtk+/glade-gtk.c           |    2 +-
 plugins/python/Makefile.am         |    2 +-
 src/Makefile.am                    |    2 +-
 7 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d1b5500..b531c4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-12-22  Tristan Van Berkom <tristanvb openismus com>
 
+	* Making offscreen-gtk3 branch compile again after merging master,
+	  also making libgladeui library libgladeui-2.
+
+2010-12-22  Tristan Van Berkom <tristanvb openismus com>
+
 	* gladeui/glade-project.[ch]: Removed dialog and added "load-progress" signal
 
 	* gladeui/glade-app.c: Protect against commands executed on loading projects
diff --git a/gladeui/glade-cell-renderer-icon.c b/gladeui/glade-cell-renderer-icon.c
index 7f26acb..5d1a60f 100644
--- a/gladeui/glade-cell-renderer-icon.c
+++ b/gladeui/glade-cell-renderer-icon.c
@@ -32,13 +32,12 @@ static void glade_cell_renderer_icon_set_property  (GObject                    *
 						    guint                       param_id,
 						    const GValue               *value,
 						    GParamSpec                 *pspec);
-
 static gboolean glade_cell_renderer_icon_activate  (GtkCellRenderer            *cell,
 						    GdkEvent                   *event,
 						    GtkWidget                  *widget,
 						    const gchar                *path,
-						    GdkRectangle               *background_area,
-						    GdkRectangle               *cell_area,
+						    const GdkRectangle         *background_area,
+						    const GdkRectangle         *cell_area,
 						    GtkCellRendererState        flags);
 
 enum {
@@ -158,8 +157,8 @@ glade_cell_renderer_icon_activate (GtkCellRenderer      *cell,
 				   GdkEvent             *event,
 				   GtkWidget            *widget,
 				   const gchar          *path,
-				   GdkRectangle         *background_area,
-				   GdkRectangle         *cell_area,
+				   const GdkRectangle   *background_area,
+				   const GdkRectangle   *cell_area,
 				   GtkCellRendererState  flags)
 {
   GladeCellRendererIcon *cellicon;
diff --git a/gladeui/glade-previewer.c b/gladeui/glade-previewer.c
index 7b31905..fa48d1c 100644
--- a/gladeui/glade-previewer.c
+++ b/gladeui/glade-previewer.c
@@ -184,7 +184,7 @@ preview_widget (gchar *name, gchar *buffer, gsize length)
 		g_object_unref(widget);
 	}
 
-	g_signal_connect (GTK_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL);
+	g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 	gtk_widget_show_all (window);	
 }
 
diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index a3a3d59..ba9711b 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = icons
 
-libgladeui = $(top_builddir)/gladeui/libgladeui-3.la
+libgladeui = $(top_builddir)/gladeui/libgladeui-2.la
 
 
 # libgladegtk
@@ -29,7 +29,7 @@ libgladegtk_la_SOURCES     = glade-gtk.c glade-accels.c glade-attributes.c glade
 libgladegtk_la_LDFLAGS     = -module -avoid-version $(AM_LDFLAGS)
 libgladegtk_la_LIBADD      = $(libgladeui) $(GTK_LIBS)
 
-libgladegtkincludedir= $(includedir)/libgladeui-1.0/gladeui
+libgladegtkincludedir= $(includedir)/libgladeui-2.0/gladeui
 libgladegtkinclude_HEADERS = glade-gtk.h glade-accels.h glade-attributes.h glade-column-types.h glade-model-data.h \
 	glade-text-button.h glade-icon-sources.h glade-button-editor.h \
 	glade-tool-button-editor.h glade-image-editor.h glade-image-item-editor.h glade-icon-factory-editor.h \
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index 7f6be9c..64e8db1 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -8921,7 +8921,7 @@ glade_gtk_combo_box_get_children (GladeWidgetAdaptor *adaptor, GtkComboBox *comb
 	 * FIXME: for recent gtk+ we have no comboboxentry
 	 * but a "has-entry" property instead
 	 */
-	if (GTK_IS_COMBO_BOX_ENTRY (combo))
+	if (gtk_combo_box_get_has_entry (combo))
 		list = g_list_append (list, gtk_bin_get_child (GTK_BIN (combo)));
 
 	return list;
diff --git a/plugins/python/Makefile.am b/plugins/python/Makefile.am
index 77ebc7e..8abc73a 100644
--- a/plugins/python/Makefile.am
+++ b/plugins/python/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-libgladeui = $(top_builddir)/gladeui/libgladeui-3.la
+libgladeui = $(top_builddir)/gladeui/libgladeui-2.la
 
 
 # libgladepython
diff --git a/src/Makefile.am b/src/Makefile.am
index 7fb3a27..52db167 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ glade_CFLAGS =           \
 
 glade_LDFLAGS = $(AM_LDFLAGS)
 
-glade_LDADD = $(top_builddir)/gladeui/libgladeui-3.la $(IGE_MAC_LIBS)
+glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(IGE_MAC_LIBS)
 
 glade_SOURCES = \
 	glade-window.c \