[glade3] Fix deprecated symbols (bug 572756)



commit b02be58e940fbc6e6abbfac133aade28f305ebb0
Author: Tristan Van Berkom <vantr TheBully local>
Date:   Sat Jun 20 12:51:01 2009 -0400

    Fix deprecated symbols (bug 572756)
    
    * gladeui/glade-clipboard-view.c, gladeui/glade-command.c, gladeui/glade-property-class.c,
    gladeui/glade-utils.c, plugins/gtk+/glade-gtk.c: Replaced symbols with new glib
    variants (Sam Thursfield - bug 572756)

 ChangeLog                      |    4 ++++
 gladeui/glade-clipboard-view.c |    2 +-
 gladeui/glade-command.c        |    2 +-
 gladeui/glade-property-class.c |    2 +-
 gladeui/glade-utils.c          |    6 +++---
 plugins/gtk+/glade-gtk.c       |    7 +------
 6 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 061c4fd..33fd9d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
 	* plugins/gtk+/gtk+.xml.in: Make GtkMessageDialog texts translatable (bug 586063)
 
+	* gladeui/glade-clipboard-view.c, gladeui/glade-command.c, gladeui/glade-property-class.c,
+	gladeui/glade-utils.c, plugins/gtk+/glade-gtk.c: Replaced symbols with new glib 
+	variants (Sam Thursfield - bug 572756)
+
 2009-06-18  James Liggett <jrliggett cox net>
 	
 	* gladeui/glade-widget.c: Make sure that the project view is not 
diff --git a/gladeui/glade-clipboard-view.c b/gladeui/glade-clipboard-view.c
index 68b2d81..c743842 100644
--- a/gladeui/glade-clipboard-view.c
+++ b/gladeui/glade-clipboard-view.c
@@ -289,7 +289,7 @@ glade_clipboard_view_new (GladeClipboard *clipboard)
 
 	g_return_val_if_fail (GLADE_IS_CLIPBOARD (clipboard), NULL);
 
-	view = gtk_type_new (glade_clipboard_view_get_type ());
+	view = g_object_new (GLADE_TYPE_CLIPBOARD_VIEW, NULL);
 	view->clipboard = clipboard;
 	glade_clipboard_view_construct (view);
 
diff --git a/gladeui/glade-command.c b/gladeui/glade-command.c
index f2d8ebe..097de9d 100644
--- a/gladeui/glade-command.c
+++ b/gladeui/glade-command.c
@@ -1486,7 +1486,7 @@ glade_command_add_remove_finalize (GObject *obj)
 			if (cdata->handler_id)
 				g_signal_handler_disconnect (cdata->placeholder,
 							     cdata->handler_id);
-			if (GTK_OBJECT_FLOATING (cdata->placeholder))
+			if (g_object_is_floating (G_OBJECT (cdata->placeholder)))
 				gtk_widget_destroy (GTK_WIDGET (cdata->placeholder));
 		}
 
diff --git a/gladeui/glade-property-class.c b/gladeui/glade-property-class.c
index eef928c..f1ef33b 100644
--- a/gladeui/glade-property-class.c
+++ b/gladeui/glade-property-class.c
@@ -612,7 +612,7 @@ glade_property_class_make_object_from_string (GladePropertyClass *property_class
 				icon = gtk_widget_render_icon (widget,
 							       GTK_STOCK_MISSING_IMAGE,
 							       GTK_ICON_SIZE_MENU, NULL);
-				gtk_object_sink (GTK_OBJECT (widget));
+				gtk_widget_destroy (widget);
 			}
 			
 			pixbuf = gdk_pixbuf_copy (icon);
diff --git a/gladeui/glade-utils.c b/gladeui/glade-utils.c
index 166a1bd..6a8259a 100644
--- a/gladeui/glade-utils.c
+++ b/gladeui/glade-utils.c
@@ -320,7 +320,7 @@ glade_util_flash_message (GtkWidget *statusbar, guint context_id, gchar *format,
 	fi->context_id = context_id;	
 	fi->message_id = gtk_statusbar_push (fi->statusbar, fi->context_id, message);
 
-	gtk_timeout_add (flash_length, (GtkFunction) remove_message_timeout, fi);
+	g_timeout_add (flash_length, (GSourceFunc) remove_message_timeout, fi);
 
 	g_free (message);
 }
@@ -421,8 +421,8 @@ glade_util_gtk_combo_func (gpointer data)
 	GtkWidget *label;
 	gchar *ltext = NULL;
 
-	ltext = (gchar *) gtk_object_get_data (GTK_OBJECT (listitem),
-					       gtk_combo_string_key);
+	ltext = (gchar *) g_object_get_data (G_OBJECT (listitem),
+					     gtk_combo_string_key);
 	if (!ltext) {
 		label = GTK_BIN (listitem)->child;
 		if (!label || !GTK_IS_LABEL (label))
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index 2d52cbf..bc25b0e 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -4088,12 +4088,7 @@ glade_gtk_notebook_add_child (GladeWidgetAdaptor *adaptor,
 
 		/* Just destroy placeholders */
 		if (GLADE_IS_PLACEHOLDER (child))
-		{
-			if (GTK_OBJECT_FLOATING (child))
-				gtk_object_sink (GTK_OBJECT (child));
-			else
-				g_object_unref (G_OBJECT (child));
-		}
+			gtk_widget_destroy (child);
 		else
 		{
 			gwidget = glade_widget_get_from_gobject (child);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]