GNOME.org
 

[glade3] * configure.ac: Require GTK+ 3.0 and change package domain from glade3 -> glade

commit 9240c83dddcedaa3dd482418020622b288c6915f
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Tue Jun 15 16:43:51 2010 -0400

    	* configure.ac: Require GTK+ 3.0 and change package domain from glade3 -> glade
    
    	* src/Makefile.am, gladeui/Makefile.am: application 'glade-3' -> 'glade',
    	  library libgladeui-1 -> libgladeui-2
    
    	* plugins/Makefile.am, plugins/gnome/*: Removed libgnomeui support.
    
    	* plugins/gtk/gtk+.xml.in, plugins/gtk/glade-gtk.c: Removed all reference to
    	  deprecated GTK+ widgets (anything removed in 3.0).

 ChangeLog                                          |   12 +
 configure.ac                                       |   36 +-
 gladeui/Makefile.am                                |   23 +-
 gladeui/glade-app.c                                |   11 -
 gladeui/glade-utils.c                              |   71 -
 gladeui/glade-utils.h                              |    4 -
 plugins/Makefile.am                                |    4 -
 plugins/gnome/Makefile.am                          |   45 -
 plugins/gnome/bonobo.xml.in                        |   56 -
 plugins/gnome/canvas.xml.in                        |   88 -
 plugins/gnome/glade-gnome.c                        | 1736 --------------------
 plugins/gnome/gnome.xml.in                         |  384 -----
 plugins/gnome/icons/16x16/Makefile.am              |   30 -
 plugins/gnome/icons/16x16/widget-bonobo-dock.png   |  Bin 142 -> 0 bytes
 .../gnome/icons/16x16/widget-bonobo-dockitem.png   |  Bin 156 -> 0 bytes
 plugins/gnome/icons/16x16/widget-gnome-about.png   |  Bin 221 -> 0 bytes
 plugins/gnome/icons/16x16/widget-gnome-app.png     |  Bin 168 -> 0 bytes
 plugins/gnome/icons/16x16/widget-gnome-appbar.png  |  Bin 113 -> 0 bytes
 plugins/gnome/icons/16x16/widget-gnome-canvas.png  |  Bin 108 -> 0 bytes
 .../gnome/icons/16x16/widget-gnome-colorpicker.png |  Bin 199 -> 0 bytes
 .../gnome/icons/16x16/widget-gnome-dateedit.png    |  Bin 164 -> 0 bytes
 plugins/gnome/icons/16x16/widget-gnome-dialog.png  |  Bin 206 -> 0 bytes
 plugins/gnome/icons/16x16/widget-gnome-druid.png   |  Bin 150 -> 0 bytes
 .../icons/16x16/widget-gnome-druidpageedge.png     |  Bin 150 -> 0 bytes
 .../icons/16x16/widget-gnome-druidpagestandard.png |  Bin 155 -> 0 bytes
 plugins/gnome/icons/16x16/widget-gnome-entry.png   |  Bin 153 -> 0 bytes
 .../gnome/icons/16x16/widget-gnome-fileentry.png   |  Bin 164 -> 0 bytes
 .../gnome/icons/16x16/widget-gnome-fontpicker.png  |  Bin 291 -> 0 bytes
 plugins/gnome/icons/16x16/widget-gnome-href.png    |  Bin 121 -> 0 bytes
 .../gnome/icons/16x16/widget-gnome-iconentry.png   |  Bin 204 -> 0 bytes
 .../gnome/icons/16x16/widget-gnome-iconlist.png    |  Bin 241 -> 0 bytes
 .../icons/16x16/widget-gnome-iconselection.png     |  Bin 224 -> 0 bytes
 .../gnome/icons/16x16/widget-gnome-messagebox.png  |  Bin 229 -> 0 bytes
 plugins/gnome/icons/16x16/widget-gnome-pixmap.png  |  Bin 268 -> 0 bytes
 .../gnome/icons/16x16/widget-gnome-pixmapentry.png |  Bin 164 -> 0 bytes
 .../gnome/icons/16x16/widget-gnome-propertybox.png |  Bin 224 -> 0 bytes
 plugins/gnome/icons/22x22/Makefile.am              |   31 -
 plugins/gnome/icons/22x22/widget-bonobo-dock.png   |  Bin 147 -> 0 bytes
 .../gnome/icons/22x22/widget-bonobo-dockitem.png   |  Bin 174 -> 0 bytes
 plugins/gnome/icons/22x22/widget-gnome-about.png   |  Bin 236 -> 0 bytes
 plugins/gnome/icons/22x22/widget-gnome-app.png     |  Bin 181 -> 0 bytes
 plugins/gnome/icons/22x22/widget-gnome-appbar.png  |  Bin 122 -> 0 bytes
 plugins/gnome/icons/22x22/widget-gnome-canvas.png  |  Bin 115 -> 0 bytes
 .../gnome/icons/22x22/widget-gnome-colorpicker.png |  Bin 168 -> 0 bytes
 .../gnome/icons/22x22/widget-gnome-dateedit.png    |  Bin 177 -> 0 bytes
 plugins/gnome/icons/22x22/widget-gnome-dialog.png  |  Bin 283 -> 0 bytes
 plugins/gnome/icons/22x22/widget-gnome-druid.png   |  Bin 143 -> 0 bytes
 .../icons/22x22/widget-gnome-druidpageedge.png     |  Bin 143 -> 0 bytes
 .../icons/22x22/widget-gnome-druidpagestandard.png |  Bin 143 -> 0 bytes
 plugins/gnome/icons/22x22/widget-gnome-entry.png   |  Bin 170 -> 0 bytes
 .../gnome/icons/22x22/widget-gnome-fileentry.png   |  Bin 177 -> 0 bytes
 .../gnome/icons/22x22/widget-gnome-fontpicker.png  |  Bin 175 -> 0 bytes
 plugins/gnome/icons/22x22/widget-gnome-href.png    |  Bin 150 -> 0 bytes
 .../gnome/icons/22x22/widget-gnome-iconentry.png   |  Bin 226 -> 0 bytes
 .../gnome/icons/22x22/widget-gnome-iconlist.png    |  Bin 265 -> 0 bytes
 .../icons/22x22/widget-gnome-iconselection.png     |  Bin 274 -> 0 bytes
 .../gnome/icons/22x22/widget-gnome-messagebox.png  |  Bin 310 -> 0 bytes
 plugins/gnome/icons/22x22/widget-gnome-pixmap.png  |  Bin 269 -> 0 bytes
 .../gnome/icons/22x22/widget-gnome-pixmapentry.png |  Bin 177 -> 0 bytes
 .../gnome/icons/22x22/widget-gnome-propertybox.png |  Bin 263 -> 0 bytes
 plugins/gnome/icons/Makefile.am                    |    3 -
 plugins/gtk+/Makefile.am                           |    2 +-
 plugins/gtk+/glade-gtk.c                           |  229 +---
 plugins/gtk+/gtk+.xml.in                           |  110 +--
 src/Makefile.am                                    |   20 +-
 src/{glade-3.rc.in => glade.rc.in}                 |    0
 66 files changed, 47 insertions(+), 2848 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 377a24c..16a859b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-06-15  Tristan Van Berkom <tvb gnome org>
+
+	* configure.ac: Require GTK+ 3.0 and change package domain from glade3 -> glade
+
+	* src/Makefile.am, gladeui/Makefile.am: application 'glade-3' -> 'glade', 
+	  library libgladeui-1 -> libgladeui-2
+
+	* plugins/Makefile.am, plugins/gnome/*: Removed libgnomeui support.
+
+	* plugins/gtk/gtk+.xml.in, plugins/gtk/glade-gtk.c: Removed all reference to
+	  deprecated GTK+ widgets (anything removed in 3.0).
+
 2010-06-10  Javier Jardón <jjardon gnome org>
 
 	* m4/python.m4: quote the definition of AM_CHECK_PYMOD
diff --git a/configure.ac b/configure.ac
index 25c4f0a..0277a5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ m4_define(glade_minor_version, 7)
 m4_define(glade_micro_version, 1)
 m4_define(glade_version, glade_major_version.glade_minor_version.glade_micro_version)
 
-AC_INIT([glade3], [glade_version],
+AC_INIT([glade], [glade_version],
 	[http://bugzilla.gnome.org/enter_bug.cgi?product=glade3])
 	
 AC_CONFIG_HEADERS([config.h])
@@ -53,7 +53,7 @@ AM_PROG_LIBTOOL
 # If any interfaces have been removed since the last public release, then set GLADE_AGE to 0.
 # Reference: http://www.gnu.org/software/libtool/manual.html#Versioning
 GLADE_REVISION=0
-GLADE_CURRENT=10
+GLADE_CURRENT=0
 GLADE_AGE=0
 GLADE_CURRENT_MINUS_AGE=`expr $GLADE_CURRENT - $GLADE_AGE`
 AC_SUBST(GLADE_REVISION)
@@ -121,7 +121,7 @@ GTK_DOC_CHECK(1.9)
 dnl ================================================================
 dnl Check for gtk+
 dnl ================================================================
-PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.20 gthread-2.0 libxml-2.0 >= 2.4.0])
+PKG_CHECK_MODULES(GTK, [gtk+-3.0 libxml-2.0 >= 2.4.0])
 AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
 
@@ -133,25 +133,6 @@ AC_CHECK_FUNCS(gtk_print_unix_dialog_new,[have_unix_print=yes]; break,[have_unix
 AM_CONDITIONAL(HAVE_GTK_UNIX_PRINT, test x"$have_unix_print" = "xyes")
 
 dnl ================================================================
-dnl Check for optional gnome libs
-dnl ================================================================
-AC_ARG_ENABLE(gnome,
-    AS_HELP_STRING([--disable-gnome], [disable gnome catalog]),
-    check_gnome=$enableval, check_gnome=yes)
-
-if test x"$check_gnome" = x"yes"; then
-  PKG_CHECK_MODULES(GNOME, [libbonoboui-2.0 libgnomeui-2.0],
-    [have_gnome=yes],[have_gnome=no])
-  AC_SUBST(GNOME_LIBS)
-  AC_SUBST(GNOME_CFLAGS)
-else
-  have_gnome=no
-fi
-
-AM_CONDITIONAL(BUILD_GNOME, test x"$have_gnome" = "xyes")
-
-
-dnl ================================================================
 dnl Python for optional python dev libs
 dnl ================================================================
 AC_ARG_ENABLE(python,
@@ -249,6 +230,10 @@ if test "x$_gdk_tgt" = xquartz; then
    AC_SUBST(IGE_MAC_CFLAGS)
 fi
 
+
+AC_SUBST([GLADE_PREFIX])
+
+
 AC_SUBST([AM_CPPFLAGS])
 AC_SUBST([AM_CFLAGS])
 AC_SUBST([AM_CXXFLAGS])
@@ -276,16 +261,12 @@ data/icons/hicolor/scalable/apps/Makefile
 gladeui/Makefile
 gladeui/gladeui.rc
 src/Makefile
-src/glade-3.rc
+src/glade.rc
 plugins/Makefile
 plugins/gtk+/Makefile
 plugins/gtk+/icons/Makefile
 plugins/gtk+/icons/16x16/Makefile
 plugins/gtk+/icons/22x22/Makefile
-plugins/gnome/Makefile
-plugins/gnome/icons/Makefile
-plugins/gnome/icons/16x16/Makefile
-plugins/gnome/icons/22x22/Makefile
 plugins/python/Makefile
 po/Makefile.in
 doc/Makefile
@@ -302,7 +283,6 @@ Configuration:
 	Source code location:	 ${srcdir}
 	Compiler:		 ${CC}
 	GTK+ UNIX Print Widgets: ${have_unix_print}
-	GNOME UI Widgets:	 ${have_gnome}
 	PYTHON Widgets support:	 ${have_python}
 
 	Build Reference Manual:  ${enable_gtk_doc}
diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
index 490d835..b390f49 100644
--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
@@ -1,22 +1,19 @@
 
 common_defines = \
 	-DG_LOG_DOMAIN=\"GladeUI\"                      \
-	-DGLADE_DATADIR="\"$(pkgdatadir)\""		\
-	-DGLADE_LIBDIR="\"$(pkglibdir)\""		\
 	-DGLADE_CATALOGSDIR="\"$(pkgdatadir)/catalogs\""\
 	-DGLADE_MODULESDIR="\"$(pkglibdir)/modules\""	\
-	-DGLADE_PLUGINSDIR="\"$(pkglibdir)/plugins\""	\
 	-DGLADE_PIXMAPSDIR="\"$(pkgdatadir)/pixmaps\""	\
 	-DGLADE_LOCALEDIR="\"$(datadir)/locale\""
 
-lib_LTLIBRARIES = libgladeui-1.la
+lib_LTLIBRARIES = libgladeui-2.la
 
 BUILT_SOURCES = glade-marshallers.c glade-marshallers.h
 
 EXTRA_DIST = glade-marshallers.list gladeui.rc.in icon-naming-spec.c
 
 # The glade-3 core library
-libgladeui_1_la_SOURCES = \
+libgladeui_2_la_SOURCES = \
 	glade-widget-adaptor.c \
 	glade-debug.c \
 	glade-project.c \
@@ -62,24 +59,24 @@ libgladeui_1_la_SOURCES = \
 	glade-editor-table.c \
 	glade-cell-renderer-icon.c
 
-libgladeui_1_la_CPPFLAGS =  \
+libgladeui_2_la_CPPFLAGS =  \
 	$(common_defines)   \
 	-I$(top_srcdir)     \
 	-I$(top_builddir)   \
 	$(AM_CPPFLAGS)
 
-libgladeui_1_la_CFLAGS =    \
+libgladeui_2_la_CFLAGS =    \
 	$(GTK_CFLAGS)       \
 	$(IGE_MAC_BUNDLE_FLAG) \
 	$(IGE_MAC_CFLAGS)  \
 	$(WARN_CFLAGS)      \
 	$(AM_CFLAGS)
 
-libgladeui_1_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
-libgladeui_1_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS)
+libgladeui_2_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
+libgladeui_2_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS)
 
 
-libgladeuiincludedir=$(includedir)/libgladeui-1.0/gladeui
+libgladeuiincludedir=$(includedir)/libgladeui-2.0/gladeui
 libgladeuiinclude_HEADERS = \
 	glade.h \
 	glade-debug.h \
@@ -120,12 +117,12 @@ libgladeuiinclude_HEADERS = \
 
 
 if PLATFORM_WIN32
-libgladeui_1_la_LDFLAGS += -no-undefined
+libgladeui_2_la_LDFLAGS += -no-undefined
 endif
 
 if NATIVE_WIN32
-libgladeui_1_la_LDFLAGS += -Wl,gladeui-win32-res.o -export-symbols gladeui.def
-libgladeui_1_la_DEPENDENCIES = gladeui-win32-res.o gladeui.def
+libgladeui_2_la_LDFLAGS += -Wl,gladeui-win32-res.o -export-symbols gladeui.def
+libgladeui_2_la_DEPENDENCIES = gladeui-win32-res.o gladeui.def
 endif
 
 gladeui-win32-res.o: gladeui.rc
diff --git a/gladeui/glade-app.c b/gladeui/glade-app.c
index 8c52bb1..81259b9 100644
--- a/gladeui/glade-app.c
+++ b/gladeui/glade-app.c
@@ -101,7 +101,6 @@ static guint glade_app_signals[LAST_SIGNAL] = { 0 };
 /* installation paths */
 static gchar *catalogs_dir = NULL;
 static gchar *modules_dir  = NULL;
-static gchar *plugins_dir  = NULL;
 static gchar *pixmaps_dir  = NULL;
 static gchar *locale_dir   = NULL;
 
@@ -340,15 +339,6 @@ glade_app_get_modules_dir (void)
 }
 
 const gchar *
-glade_app_get_plugins_dir (void)
-{
-	glade_init_check ();
-
-	return plugins_dir;
-}
-
-
-const gchar *
 glade_app_get_pixmaps_dir (void)
 {
 	glade_init_check ();
@@ -389,7 +379,6 @@ build_package_paths (void)
 #else
 	catalogs_dir = g_strdup (GLADE_CATALOGSDIR);
 	modules_dir  = g_strdup (GLADE_MODULESDIR);
-	plugins_dir  = g_strdup (GLADE_PLUGINSDIR);
 	pixmaps_dir  = g_strdup (GLADE_PIXMAPSDIR);
 	locale_dir   = g_strdup (GLADE_LOCALEDIR);
 #endif
diff --git a/gladeui/glade-utils.c b/gladeui/glade-utils.c
index dfd5e22..9d47c52 100644
--- a/gladeui/glade-utils.c
+++ b/gladeui/glade-utils.c
@@ -421,77 +421,6 @@ glade_util_compare_stock_labels (gconstpointer a, gconstpointer b)
 }
 
 /**
- * glade_util_gtk_combo_func:
- * @data:
- *
- * TODO: write me
- *
- * Returns:
- */
-gchar *
-glade_util_gtk_combo_func (gpointer data)
-{
-	GtkListItem * listitem = data;
-
-	/* I needed to pinch this as well - Damon. */
-	static const gchar *gtk_combo_string_key = "gtk-combo-string-value";
-
-	GtkWidget *label;
-	gchar *ltext = NULL;
-
-	ltext = (gchar *) g_object_get_data (G_OBJECT (listitem),
-					     gtk_combo_string_key);
-	if (!ltext) {
-		label = gtk_bin_get_child (GTK_BIN (listitem));
-		if (!label || !GTK_IS_LABEL (label))
-			return NULL;
-		ltext = (gchar*) gtk_label_get_text (GTK_LABEL (label));
-	}
-
-	return ltext;
-}
-
-/* These are pinched from gtkcombo.c */
-/**
- * glade_util_gtk_combo_find:
- * @combo:
- *
- * TODO: write me
- *
- * Returns:
- */
-gpointer /* GtkListItem *  */
-glade_util_gtk_combo_find (GtkCombo * combo)
-{
-	gchar *text;
-	gchar *ltext;
-	GList *clist;
-	gsize len;
-
-	int (*string_compare) (const char *, const char *, gsize);
-
-	if (combo->case_sensitive)
-		string_compare = strncmp;
-	else
-		string_compare = g_ascii_strncasecmp;
-
-	text  = (gchar*) gtk_entry_get_text (GTK_ENTRY (combo->entry));
-	len   = text ? strlen (text) : 0;
-	clist = GTK_LIST (combo->list)->children;
-
-	while (clist && clist->data) {
-		ltext = glade_util_gtk_combo_func (GTK_LIST_ITEM (clist->data));
-		if (!ltext)
-			continue;
-		if (!(*string_compare) (ltext, text, len))
-			return (GtkListItem *) clist->data;
-		clist = clist->next;
-	}
-
-	return NULL;
-}
-
-/**
  * glade_util_hide_window:
  * @window: a #GtkWindow
  *
diff --git a/gladeui/glade-utils.h b/gladeui/glade-utils.h
index edbf8ad..56cea79 100644
--- a/gladeui/glade-utils.h
+++ b/gladeui/glade-utils.h
@@ -49,10 +49,6 @@ gint              glade_util_compare_stock_labels (gconstpointer a, gconstpointe
 
 void              glade_util_hide_window		(GtkWindow *window);
 
-gchar            *glade_util_gtk_combo_func	(gpointer data);
-
-gpointer          glade_util_gtk_combo_find	(GtkCombo *combo);
-
 
 GtkWidget        *glade_util_file_dialog_new (const gchar *title,
 					      GladeProject *project,
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 093e188..1324bc4 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -2,10 +2,6 @@
 
 SUBDIRS = gtk+
 
-if BUILD_GNOME
-SUBDIRS += gnome
-endif
-
 if BUILD_PYTHON
 SUBDIRS += python
 endif
diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index 032397d..c420717 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = icons
 
-libgladeui = $(top_builddir)/gladeui/libgladeui-1.la
+libgladeui = $(top_builddir)/gladeui/libgladeui-2.la
 
 
 # libgladegtk
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index 188c899..acdf675 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -5167,18 +5167,6 @@ glade_gtk_file_chooser_forall (GtkWidget *widget, gpointer data)
 				      NULL);
 }
 
-static void
-glade_gtk_input_dialog_forall (GtkWidget *widget, gpointer data)
-{
-	/* Make every option menu insensitive, yes it use a deprecated widget */
-	if (GTK_IS_OPTION_MENU (widget))
-		gtk_widget_set_sensitive (widget, FALSE);
-	else if (GTK_IS_CONTAINER (widget))
-		gtk_container_forall (GTK_CONTAINER (widget),
-				      glade_gtk_input_dialog_forall,
-				      NULL);
-}
-
 void 
 glade_gtk_dialog_post_create (GladeWidgetAdaptor *adaptor,
 			      GObject            *object, 
@@ -5187,8 +5175,8 @@ glade_gtk_dialog_post_create (GladeWidgetAdaptor *adaptor,
 	GtkDialog    *dialog = GTK_DIALOG (object);
 	GladeWidget  *widget;
 	GladeWidget  *vbox_widget, *actionarea_widget, *colorsel, *fontsel;
-	GladeWidget  *save_button = NULL, *close_button = NULL, *ok_button = NULL,
-		*cancel_button = NULL, *help_button = NULL, *apply_button = NULL;
+	GladeWidget  *ok_button = NULL, *cancel_button = NULL, 
+		*help_button = NULL, *apply_button = NULL;
 	
 	g_return_if_fail (GTK_IS_DIALOG (dialog));
 
@@ -5202,40 +5190,7 @@ glade_gtk_dialog_post_create (GladeWidgetAdaptor *adaptor,
 		glade_widget_property_set (widget, "border-width", 5);
 	}
 
-	if (GTK_IS_INPUT_DIALOG (object))
-	{
-		GtkInputDialog *id = GTK_INPUT_DIALOG (dialog);
-
-		save_button = glade_widget_adaptor_create_internal
-			(widget, G_OBJECT (id->save_button),
-			 "save_button", "inputdialog", FALSE, reason);
-		close_button = glade_widget_adaptor_create_internal
-			(widget, G_OBJECT (id->close_button),
-			 "close_button", "inputdialog", FALSE, reason);
-		/*
-		  On device and mode menu items "activate" signal handlers 
-		  GtkInputDialog call gtk_widget_get_toplevel() and assume that
-		  the toplevel returned is the GtkInputDialog but since the 
-		  dialog is embed inside glade the returned pointer is not what
-		  expected and this gives a segfault :S
-		*/
-		gtk_container_forall (GTK_CONTAINER (dialog),
-				      glade_gtk_input_dialog_forall,
-				      NULL);
-		
-		glade_gtk_dialog_stop_offending_signals (GTK_WIDGET (dialog));
-	}
-	else if (GTK_IS_FILE_SELECTION (object))
-	{
-		ok_button = glade_widget_adaptor_create_internal
-			(widget, G_OBJECT (GTK_FILE_SELECTION (object)->ok_button),
-			 "ok_button", "filesel", FALSE, reason);
-
-		cancel_button = glade_widget_adaptor_create_internal
-			(widget, G_OBJECT (GTK_FILE_SELECTION (object)->cancel_button),
-			 "cancel_button", "filesel", FALSE, reason);
-	}
-	else if (GTK_IS_COLOR_SELECTION_DIALOG (object))
+	if (GTK_IS_COLOR_SELECTION_DIALOG (object))
 	{
 		ok_button = glade_widget_adaptor_create_internal
 			(widget, G_OBJECT (GTK_COLOR_SELECTION_DIALOG (object)->ok_button),
@@ -5346,21 +5301,7 @@ glade_gtk_dialog_get_internal_child (GladeWidgetAdaptor  *adaptor,
 
 	g_return_val_if_fail (GTK_IS_DIALOG (dialog), NULL);
 
-	if (GTK_IS_INPUT_DIALOG (dialog))
-	{
-		if (strcmp ("close_button", name) == 0)
-			child = GTK_INPUT_DIALOG (dialog)->close_button;
-		else if (strcmp ("save_button", name) == 0)
-			child = GTK_INPUT_DIALOG (dialog)->save_button;
-	}
-	else if (GTK_IS_FILE_SELECTION (dialog))
-	{
-		if (strcmp ("ok_button", name) == 0)
-			child = GTK_FILE_SELECTION (dialog)->ok_button;
-		else if (strcmp ("cancel_button", name) == 0)
-			child = GTK_FILE_SELECTION (dialog)->cancel_button;
-	}
-	else if (GTK_IS_COLOR_SELECTION_DIALOG (dialog))
+	if (GTK_IS_COLOR_SELECTION_DIALOG (dialog))
 	{
 		if (strcmp ("ok_button", name) == 0)
 			child = GTK_COLOR_SELECTION_DIALOG (dialog)->ok_button;
@@ -5405,17 +5346,7 @@ glade_gtk_dialog_get_children (GladeWidgetAdaptor  *adaptor,
 
 	list = glade_util_container_get_all_children (GTK_CONTAINER (dialog));
 
-	if (GTK_IS_INPUT_DIALOG (dialog))
-	{
-		list = g_list_prepend (list, GTK_INPUT_DIALOG (dialog)->close_button);
-		list = g_list_prepend (list, GTK_INPUT_DIALOG (dialog)->save_button);
-	}
-	else if (GTK_IS_FILE_SELECTION (dialog))
-	{
-		list = g_list_prepend (list, GTK_FILE_SELECTION (dialog)->ok_button);
-		list = g_list_prepend (list, GTK_FILE_SELECTION (dialog)->cancel_button);
-	}
-	else if (GTK_IS_COLOR_SELECTION_DIALOG (dialog))
+	if (GTK_IS_COLOR_SELECTION_DIALOG (dialog))
 	{
 		list = g_list_prepend (list, GTK_COLOR_SELECTION_DIALOG (dialog)->ok_button);
 		list = g_list_prepend (list, GTK_COLOR_SELECTION_DIALOG (dialog)->cancel_button);
@@ -8902,156 +8833,6 @@ glade_gtk_spin_button_set_property (GladeWidgetAdaptor *adaptor,
 							      id, value);
 }
 
-/* ----------------------------- GtkCombo ------------------------------ */
-void
-glade_gtk_combo_post_create (GladeWidgetAdaptor *adaptor,
-			     GObject            *object,
-			     GladeCreateReason   reason)
-{
-	GladeWidget  *gcombo, *gentry, *glist;
-
-	g_return_if_fail (GTK_IS_COMBO (object));
-
-	if ((gcombo = glade_widget_get_from_gobject (object)) == NULL)
-		return;
-	
-	gentry = glade_widget_adaptor_create_internal
-		(gcombo, G_OBJECT (GTK_COMBO (object)->entry),
-		 "entry", "combo", FALSE, reason);
-
-	/* We mark this 'anarchist' since its outside of the hierarchy */
-	glist  = glade_widget_adaptor_create_internal
-		(gcombo, G_OBJECT (GTK_COMBO (object)->list),
-		 "list", "combo", TRUE, reason);
-
-}
-
-GObject *
-glade_gtk_combo_get_internal_child (GladeWidgetAdaptor *adaptor,
-				    GtkCombo           *combo,
-				    const gchar        *name)
-{
-	GObject *child = NULL;
-
-	g_return_val_if_fail (GTK_IS_COMBO (combo), NULL);
-	
-	if (strcmp ("list", name) == 0)
-		child = G_OBJECT (combo->list);
-	else if (strcmp ("entry", name) == 0)
-		child = G_OBJECT (combo->entry);
-
-	return child;
-}
-
-GList *
-glade_gtk_combo_get_children (GladeWidgetAdaptor *adaptor, GtkCombo *combo)
-{
-	GList *list = NULL;
-
-	g_return_val_if_fail (GTK_IS_COMBO (combo), NULL);
-
-	list = glade_util_container_get_all_children (GTK_CONTAINER (combo));
-
-	/* Ensure that we only return one 'combo->list' */
-	if (g_list_find (list, combo->list) == NULL)
-		list = g_list_append (list, combo->list);
-
-	return list;
-}
-
-/* ----------------------------- GtkListItem ------------------------------ */
-void
-glade_gtk_list_item_post_create (GladeWidgetAdaptor *adaptor,
-				 GObject            *object, 
-				 GladeCreateReason   reason)
-{
-	GtkWidget *label;
-
-	g_return_if_fail (GTK_IS_LIST_ITEM (object));
-
-	label = gtk_label_new ("");
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_misc_set_padding (GTK_MISC (label), 0, 1);
-
-	gtk_container_add (GTK_CONTAINER (object), label);
-	gtk_widget_show (label);
-}
-
-static void
-glade_gtk_list_item_set_label (GObject *object, const GValue *value)
-{
-	GtkWidget *label;
-
-	g_return_if_fail (GTK_IS_LIST_ITEM (object));
-
-	label = gtk_bin_get_child (GTK_BIN (object));
-
-	gtk_label_set_text (GTK_LABEL (label), g_value_get_string (value));
-}
-
-static void
-glade_gtk_list_item_get_label (GObject *object, GValue *value)
-{
-	GtkWidget *label;
-
-	g_return_if_fail (GTK_IS_LIST_ITEM (object));
-
-	label = gtk_bin_get_child (GTK_BIN (object));
-
-	g_value_set_string (value, gtk_label_get_text (GTK_LABEL (label)));
-}
-
-void
-glade_gtk_list_item_set_property (GladeWidgetAdaptor *adaptor,
-				  GObject            *object, 
-				  const gchar        *id,
-				  const GValue       *value)
-{
-	if (!strcmp (id, "label"))
-		glade_gtk_list_item_set_label (object, value);
-	else
-		GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor,
-								  object,
-								  id, value);
-}
-
-void
-glade_gtk_list_item_get_property (GladeWidgetAdaptor *adaptor,
-				  GObject            *object, 
-				  const gchar        *id,
-				  GValue             *value)
-{
-	if (!strcmp (id, "label"))
-		glade_gtk_list_item_get_label (object, value);
-	else
-		GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor,
-								  object,
-								  id, value);
-}
-
-
-void
-glade_gtk_listitem_add_child (GladeWidgetAdaptor  *adaptor,
-			      GObject             *object, 
-			      GObject             *child)
-{
-	g_return_if_fail (GTK_IS_CONTAINER (object));
-	g_return_if_fail (GTK_IS_WIDGET (child));
-
-	gtk_container_add (GTK_CONTAINER (object), GTK_WIDGET (child));
-}
-
-void
-glade_gtk_listitem_remove_child (GladeWidgetAdaptor  *adaptor,
-				 GObject             *object, 
-				 GObject             *child)
-{
-	g_return_if_fail (GTK_IS_CONTAINER (object));
-	g_return_if_fail (GTK_IS_WIDGET (child));
-
-	gtk_container_add (GTK_CONTAINER (object), GTK_WIDGET (child));
-}
-
 /* ------------------------------ GtkAssistant ------------------------------ */
 static void
 glade_gtk_assistant_append_new_page (GladeWidget *parent,
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index a2b61f5..2823199 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -1649,12 +1649,6 @@ embedded in another object</_tooltip>
         <property id="has-separator"  disabled="True"/>
       </properties>
     </glade-widget-class>
-
-    <glade-widget-class name="GtkInputDialog" generic-name="inputdialog" deprecated="True" _title="Input Dialog">
-      <properties>
-        <property id="has-separator"  disabled="True"/>
-      </properties>
-    </glade-widget-class>
     
     <glade-widget-class name="GtkMessageDialog" generic-name="messagedialog" _title="Message Dialog" default-width="400" default-height="115">
       <set-property-function>glade_gtk_message_dialog_set_property</set-property-function>
@@ -1726,99 +1720,10 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkCombo" generic-name="combo" _title="Combo" deprecated="True" libglade-only="True">
-      <post-create-function>glade_gtk_combo_post_create</post-create-function>
-      <get-internal-child-function>glade_gtk_combo_get_internal_child</get-internal-child-function>
-      <get-children-function>glade_gtk_combo_get_children</get-children-function>
-
-      <properties>
-	<property id="size" disabled="True"/>
-
-	<!-- Atk press property -->
-	<property id="atk-press" _name="Press" ignore="True" atk-property="True" save="False">
-	  <parameter-spec>
-	    <type>GParamString</type>
-	  </parameter-spec>
-	  <_tooltip>Set the description of the Press atk action</_tooltip>
-	  <visible-lines>2</visible-lines>
-	</property>
-      </properties>
-
-    </glade-widget-class>
-    
-    <glade-widget-class name="GtkOptionMenu" generic-name="optionmenu" _title="Option Menu" deprecated="True" libglade-only="True">
-      <properties>
-	<!-- Atk press property -->
-	<property id="atk-press" _name="Press" ignore="True" atk-property="True" save="False">
-	  <parameter-spec>
-	    <type>GParamString</type>
-	  </parameter-spec>
-	  <_tooltip>Set the description of the Press atk action</_tooltip>
-	  <visible-lines>2</visible-lines>
-	</property>
-      </properties>
-    </glade-widget-class>
-
-    <glade-widget-class name="GtkList" generic-name="list" _title="List" deprecated="True" libglade-only="True">
-      <add-child-function>glade_gtk_listitem_add_child</add-child-function>
-      <remove-child-function>glade_gtk_listitem_remove_child</remove-child-function>
-      <properties>
-        <property id="selection-mode">
-  	  <displayable-values>
-	    <value id="GTK_SELECTION_NONE" _name="None"/>
-	    <value id="GTK_SELECTION_SINGLE" _name="Single"/>
-	    <value id="GTK_SELECTION_BROWSE" _name="Browse"/>
-	    <value id="GTK_SELECTION_MULTIPLE" _name="Multiple"/>
-	    <value id="GTK_SELECTION_EXTENDED" _name="Extended"/>
-	  </displayable-values>
-	</property>
-      </properties>
-    </glade-widget-class>
-
-    <glade-widget-class name="GtkListItem" generic-name="listitem" _title="List Item" deprecated="True" libglade-only="True">
-      <post-create-function>glade_gtk_list_item_post_create</post-create-function>
-      <set-property-function>glade_gtk_list_item_set_property</set-property-function>
-      <get-property-function>glade_gtk_list_item_get_property</get-property-function>
-      <properties>
-	<property id="label" _name="Label" translatable="True">
-	  <parameter-spec>
-	    <type>GParamString</type>
-	  </parameter-spec>
-	  <_tooltip>The text to display</_tooltip>
-	</property>
-      </properties>
-    </glade-widget-class>
-
-    <glade-widget-class name="GtkCList" generic-name="clist" _title="Columned List" deprecated="True" libglade-only="True">
-      <properties>
-        <property id="sort-type">
-  	  <displayable-values>
-	    <value id="GTK_SORT_ASCENDING" _name="Ascending"/>
-	    <value id="GTK_SORT_DESCENDING" _name="Descending"/>
-	  </displayable-values>
-	</property>
-      </properties>
-    </glade-widget-class>
-
     <glade-widget-class name="GtkColorSelection" generic-name="colorselection" _title="Color Selection"/>
     
     <glade-widget-class name="GtkFontSelection" generic-name="fontselection" _title="Font Selection"/>
     
-    <glade-widget-class name="GtkCurve" generic-name="curve" _title="Curve" deprecated="True">
-      <properties>
-	<property id="curve-type" default="GTK_CURVE_TYPE_SPLINE">
-  	  <displayable-values>
-	    <value id="GTK_CURVE_TYPE_LINEAR" _name="Linear"/>
-	    <value id="GTK_CURVE_TYPE_SPLINE" _name="Spline"/>
-	    <value id="GTK_CURVE_TYPE_FREE" _name="Free"/>
-	  </displayable-values>
-	</property>
-      </properties>
-    </glade-widget-class>
-    
-    <glade-widget-class name="GtkGammaCurve" generic-name="gammacurve" _title="Gamma Curve" deprecated="True"/>
-
-    <glade-widget-class name="GtkFileSelection" generic-name="fileselection" _title="File Selection" deprecated="True" libglade-only="True"/>
     <glade-widget-class name="Custom" generic-name="custom" _title="Custom widget" deprecated="True" libglade-only="True">
       <properties>
 	<property id="creation-function"/>
@@ -3404,7 +3309,6 @@ embedded in another object</_tooltip>
     <glade-widget-class-ref name="GtkColorSelectionDialog"/>
     <glade-widget-class-ref name="GtkFileChooserDialog"/>
     <glade-widget-class-ref name="GtkFontSelectionDialog"/>
-    <glade-widget-class-ref name="GtkInputDialog"/>
     <glade-widget-class-ref name="GtkMessageDialog"/>
     <glade-widget-class-ref name="GtkRecentChooserDialog"/>
     <glade-widget-class-ref name="GtkAssistant"/>
@@ -3530,19 +3434,7 @@ embedded in another object</_tooltip>
     <glade-widget-class-ref name="GtkHRuler"/>
     <glade-widget-class-ref name="GtkVRuler"/>
 
-    <glade-widget-class-ref name="GtkCurve"/>
-    <glade-widget-class-ref name="GtkGammaCurve"/>
-  </glade-widget-group>
-
-  <glade-widget-group name="gtk-obsolete" _title="Gtk+ Obsolete">
-
-    <default-palette-state expanded="False"/>
-
-    <glade-widget-class-ref name="GtkCombo"/>
-    <glade-widget-class-ref name="GtkOptionMenu"/>
-    <glade-widget-class-ref name="GtkList"/>
-    <glade-widget-class-ref name="GtkCList"/>
-    <glade-widget-class-ref name="GtkFileSelection"/>
     <glade-widget-class-ref name="Custom"/>
   </glade-widget-group>
+
 </glade-catalog>
diff --git a/src/Makefile.am b/src/Makefile.am
index ed147b0..1b6a13e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,24 +1,24 @@
 ## Process this file with automake to produce Makefile.in
 
-bin_PROGRAMS = glade-3
+bin_PROGRAMS = glade
 
-glade_3_CPPFLAGS = \
+glade_CPPFLAGS = \
 	-I$(top_srcdir)    \
 	-I$(top_builddir)  \
 	-DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\""
 	$(AM_CPPFLAGS)
 
-glade_3_CFLAGS =           \
+glade_CFLAGS =           \
 	$(GTK_CFLAGS)      \
 	$(IGE_MAC_CFLAGS)  \
 	$(WARN_CFLAGS)     \
 	$(AM_CFLAGS)
 
-glade_3_LDFLAGS = $(AM_LDFLAGS)
+glade_LDFLAGS = $(AM_LDFLAGS)
 
-glade_3_LDADD = $(top_builddir)/gladeui/libgladeui-1.la $(IGE_MAC_LIBS)
+glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(IGE_MAC_LIBS)
 
-glade_3_SOURCES = \
+glade_SOURCES = \
 	glade-window.c \
 	glade-window.h \
 	glade-close-button.c \
@@ -26,13 +26,13 @@ glade_3_SOURCES = \
 	main.c
 
 if NATIVE_WIN32
-glade_3_LDADD += glade-win32-res.o
+glade_LDADD += glade-win32-res.o
 if !GLADE_UNSTABLE
-glade_3_LDFLAGS += -mwindows
+glade_LDFLAGS += -mwindows
 endif
 endif
 
-glade-win32-res.o: glade-3.rc
+glade-win32-res.o: glade.rc
 	$(WINDRES) $< $@
 
-EXTRA_DIST = glade-3.rc.in
+EXTRA_DIST = glade.rc.in
diff --git a/src/glade-3.rc.in b/src/glade.rc.in
similarity index 100%
rename from src/glade-3.rc.in
rename to src/glade.rc.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]