Commit b02be58e authored by Tristan Van Berkom's avatar Tristan Van Berkom
Browse files

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)
parent a862f710
......@@ -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
......
......@@ -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);
......
......@@ -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));
}
......
......@@ -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);
......
......@@ -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))
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment