GNOME.org
 

libgnomeui r5706 - in trunk: . glade libgnomeui test-gnome

Author: kmaraas
Date: Fri Mar  6 10:44:29 2009
New Revision: 5706
URL: http://svn.gnome.org/viewvc/libgnomeui?rev=5706&view=rev

Log:
2009-03-06  Kjartan Maraas  <kmaraas gnome org>

	* configure.in: Correct version. We're at 2.24.1 not .2
	* glade/glade-gnome.c:
	* libgnomeui/gnome-app-helper.c:
	* libgnomeui/gnome-app-util.c: (remove_timeout_cb),
	(gnome_app_flash), (gnome_app_progress_timeout),
	(progress_timeout_remove):
	* libgnomeui/gnome-appbar.c: (gnome_appbar_class_init):
	* libgnomeui/gnome-authentication-manager.c:
	* libgnomeui/gnome-client.c: (client_save_yourself_callback):
	* libgnomeui/gnome-dateedit.c:
	* libgnomeui/gnome-dialog.c: (gnome_pixmap_button):
	* libgnomeui/gnome-entry.c:
	* libgnomeui/gnome-file-entry.c:
	* libgnomeui/gnome-gconf-ui.c:
	(gnome_default_gconf_client_error_handler):
	* libgnomeui/gnome-href.c: (gnome_href_instance_init),
	(gnome_href_destroy):
	* libgnomeui/gnome-icon-entry.c: (ientry_destroy),
	(gnome_icon_entry_instance_init):
	* libgnomeui/gnome-icon-list.c: (if):
	* libgnomeui/gnome-mdi-child.c: (gnome_mdi_child_remove_view):
	* libgnomeui/gnome-mdi.c: (gnome_mdi_destroy),
	(gnome_mdi_add_view), (gnome_mdi_add_toplevel_view),
	(gnome_mdi_remove_child):
	* libgnomeui/gnome-pixmap-entry.c:
	* libgnomeui/gnome-popup-menu.c: (gnome_popup_menu_attach):
	* libgnomeui/gnometypes.c:
	* test-gnome/test-password-dialog.c:
	* test-gnome/testdruid.c:
	* test-gnome/testentry.c:
	* test-gnome/testgnome.c:
	* test-gnome/testgnomegdkpixbuf.c:
	* test-gnome/testiconlist.c:
	- Port to non-deprecated glib/gtk+ api and make
	it build with deprecations enabled where there's still
	porting to do.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/glade/glade-gnome.c
   trunk/libgnomeui/gnome-app-helper.c
   trunk/libgnomeui/gnome-app-util.c
   trunk/libgnomeui/gnome-appbar.c
   trunk/libgnomeui/gnome-authentication-manager.c
   trunk/libgnomeui/gnome-client.c
   trunk/libgnomeui/gnome-dateedit.c
   trunk/libgnomeui/gnome-dialog.c
   trunk/libgnomeui/gnome-entry.c
   trunk/libgnomeui/gnome-file-entry.c
   trunk/libgnomeui/gnome-gconf-ui.c
   trunk/libgnomeui/gnome-href.c
   trunk/libgnomeui/gnome-icon-entry.c
   trunk/libgnomeui/gnome-icon-list.c
   trunk/libgnomeui/gnome-mdi-child.c
   trunk/libgnomeui/gnome-mdi.c
   trunk/libgnomeui/gnome-pixmap-entry.c
   trunk/libgnomeui/gnome-popup-menu.c
   trunk/libgnomeui/gnometypes.c
   trunk/test-gnome/test-password-dialog.c
   trunk/test-gnome/testdruid.c
   trunk/test-gnome/testentry.c
   trunk/test-gnome/testgnome.c
   trunk/test-gnome/testgnomegdkpixbuf.c
   trunk/test-gnome/testiconlist.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Mar  6 10:44:29 2009
@@ -10,8 +10,8 @@
 #
 m4_define([libgnomeui_major_version], [2])
 m4_define([libgnomeui_minor_version], [24])
-m4_define([libgnomeui_micro_version], [2])
-m4_define([libgnomeui_interface_age], [2])
+m4_define([libgnomeui_micro_version], [1])
+m4_define([libgnomeui_interface_age], [1])
 # If you need a modifier for the version number. 
 # Normally empty, but can be used to make "fixup" releases.
 m4_define([libgnomeui_extraversion], [])

Modified: trunk/glade/glade-gnome.c
==============================================================================
--- trunk/glade/glade-gnome.c	(original)
+++ trunk/glade/glade-gnome.c	Fri Mar  6 10:44:29 2009
@@ -22,6 +22,8 @@
 
 /* this file is only built if GNOME support is enabled */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

Modified: trunk/libgnomeui/gnome-app-helper.c
==============================================================================
--- trunk/libgnomeui/gnome-app-helper.c	(original)
+++ trunk/libgnomeui/gnome-app-helper.c	Fri Mar  6 10:44:29 2009
@@ -31,6 +31,8 @@
  * Major cleanups and rearrangements by Federico Mena and Justin Maurer.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

Modified: trunk/libgnomeui/gnome-app-util.c
==============================================================================
--- trunk/libgnomeui/gnome-app-util.c	(original)
+++ trunk/libgnomeui/gnome-app-util.c	Fri Mar  6 10:44:29 2009
@@ -241,7 +241,7 @@
 static void
 remove_timeout_cb ( GtkWidget * app, MessageInfo * mi )
 {
-  gtk_timeout_remove(mi->timeoutid);
+  g_source_remove(mi->timeoutid);
   g_free(mi);
 }
 
@@ -279,9 +279,9 @@
     mi = g_new(MessageInfo, 1);
 
     mi->timeoutid =
-      gtk_timeout_add ( flash_length,
-			(GtkFunction) remove_message_timeout,
-			mi );
+      g_timeout_add (flash_length,
+		     (GtkFunction) remove_message_timeout,
+		      mi);
 
     mi->handlerid =
       g_signal_connect (G_OBJECT(app),
@@ -766,9 +766,9 @@
     progress_dialog (description, key);
   }
 
-  key->timeout_tag = gtk_timeout_add ( interval,
-				       (GtkFunction) progress_timeout_cb,
-				       key );
+  key->timeout_tag = g_timeout_add (interval,
+				    (GtkFunction) progress_timeout_cb,
+				    key);
 
   /* Make sure progress stops if the app is destroyed. */
   key->handler_id = g_signal_connect(app, "destroy",
@@ -852,7 +852,7 @@
 static void progress_timeout_remove(ProgressKeyReal * key)
 {
   if (key->timeout_tag != INVALID_TIMEOUT) {
-    gtk_timeout_remove(key->timeout_tag);
+    g_source_remove (key->timeout_tag);
     key->timeout_tag = INVALID_TIMEOUT;
   }
 }

Modified: trunk/libgnomeui/gnome-appbar.c
==============================================================================
--- trunk/libgnomeui/gnome-appbar.c	(original)
+++ trunk/libgnomeui/gnome-appbar.c	Fri Mar  6 10:44:29 2009
@@ -712,7 +712,7 @@
 
   gobject_class = (GObjectClass *) class;
 
-  parent_class = GTK_HBOX_CLASS (gtk_type_class (GTK_TYPE_HBOX));
+  parent_class = GTK_HBOX_CLASS (g_type_class_ref (GTK_TYPE_HBOX));
 
   gobject_class->constructor  = gnome_appbar_constructor;
   gobject_class->get_property = gnome_appbar_get_property;

Modified: trunk/libgnomeui/gnome-authentication-manager.c
==============================================================================
--- trunk/libgnomeui/gnome-authentication-manager.c	(original)
+++ trunk/libgnomeui/gnome-authentication-manager.c	Fri Mar  6 10:44:29 2009
@@ -32,6 +32,8 @@
  *
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 
 #include <glib/gi18n-lib.h>

Modified: trunk/libgnomeui/gnome-client.c
==============================================================================
--- trunk/libgnomeui/gnome-client.c	(original)
+++ trunk/libgnomeui/gnome-client.c	Fri Mar  6 10:44:29 2009
@@ -702,11 +702,11 @@
   if (gdk_pointer_is_grabbed())
     {
       gboolean waiting = TRUE;
-      gint id = gtk_timeout_add (4000, end_wait, &waiting);
+      gint id = g_timeout_add (4000, end_wait, &waiting);
 
       while (gdk_pointer_is_grabbed() && waiting)
 	gtk_main_iteration();
-      gtk_timeout_remove (id);
+      g_source_remove (id);
     }
 
   /* Check that we did not receive a shutdown cancelled while waiting

Modified: trunk/libgnomeui/gnome-dateedit.c
==============================================================================
--- trunk/libgnomeui/gnome-dateedit.c	(original)
+++ trunk/libgnomeui/gnome-dateedit.c	Fri Mar  6 10:44:29 2009
@@ -31,6 +31,8 @@
 
 #define _XOPEN_SOURCE
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 
 #include <time.h>

Modified: trunk/libgnomeui/gnome-dialog.c
==============================================================================
--- trunk/libgnomeui/gnome-dialog.c	(original)
+++ trunk/libgnomeui/gnome-dialog.c	Fri Mar  6 10:44:29 2009
@@ -453,7 +453,7 @@
 		gtk_box_pack_start(GTK_BOX(hbox), pixmap,
 				   FALSE, FALSE, 0);
 	} else {
-                gtk_widget_unref(pixmap);
+                g_object_unref(pixmap);
         }
 
 	return button;

Modified: trunk/libgnomeui/gnome-entry.c
==============================================================================
--- trunk/libgnomeui/gnome-entry.c	(original)
+++ trunk/libgnomeui/gnome-entry.c	Fri Mar  6 10:44:29 2009
@@ -28,6 +28,8 @@
  * Author: Federico Mena <federico nuclecu unam mx>
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <libgnome/gnome-macros.h>
 

Modified: trunk/libgnomeui/gnome-file-entry.c
==============================================================================
--- trunk/libgnomeui/gnome-file-entry.c	(original)
+++ trunk/libgnomeui/gnome-file-entry.c	Fri Mar  6 10:44:29 2009
@@ -30,6 +30,8 @@
  * Authors: Federico Mena <federico nuclecu unam mx>
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #define _XOPEN_SOURCE 500
 
 #include <config.h>

Modified: trunk/libgnomeui/gnome-gconf-ui.c
==============================================================================
--- trunk/libgnomeui/gnome-gconf-ui.c	(original)
+++ trunk/libgnomeui/gnome-gconf-ui.c	Fri Mar  6 10:44:29 2009
@@ -267,7 +267,7 @@
         pending_errors = g_slist_append(pending_errors, g_error_copy(error));
 
         if (error_handler_idle == 0) {
-                error_handler_idle = gtk_idle_add (error_idle_func, NULL);
+                error_handler_idle = g_idle_add (error_idle_func, NULL);
         }
 }
 

Modified: trunk/libgnomeui/gnome-href.c
==============================================================================
--- trunk/libgnomeui/gnome-href.c	(original)
+++ trunk/libgnomeui/gnome-href.c	Fri Mar  6 10:44:29 2009
@@ -127,7 +127,7 @@
 	href->_priv = g_new0(GnomeHRefPrivate, 1);
 
 	href->_priv->label = gtk_label_new(NULL);
-	gtk_widget_ref(href->_priv->label);
+	g_object_ref(href->_priv->label);
 
 
 	gtk_button_set_relief(GTK_BUTTON(href), GTK_RELIEF_NONE);
@@ -406,7 +406,7 @@
 	href = GNOME_HREF (object);
 
 	if (href->_priv->label != NULL) {
-		gtk_widget_unref (href->_priv->label);
+		g_object_unref (href->_priv->label);
 		href->_priv->label = NULL;
 	}
 

Modified: trunk/libgnomeui/gnome-icon-entry.c
==============================================================================
--- trunk/libgnomeui/gnome-icon-entry.c	(original)
+++ trunk/libgnomeui/gnome-icon-entry.c	Fri Mar  6 10:44:29 2009
@@ -34,6 +34,9 @@
  * icon selection based on original dentry-edit code which was:
  *	Written by: Havoc Pennington, based on code by John Ellis.
  */
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <libgnome/gnome-macros.h>
 
@@ -472,7 +475,7 @@
 	ientry->_priv->picked_file = NULL;
 
 	if (ientry->_priv->fentry != NULL)
-		gtk_widget_unref (ientry->_priv->fentry);
+		g_object_unref (ientry->_priv->fentry);
 	ientry->_priv->fentry = NULL;
 
 	if (ientry->_priv->pick_dialog != NULL)
@@ -1022,7 +1025,7 @@
 			    _("Icon path"),
 			    _("Here you should enter the name of the directory "
 			      "where icon images are located."));
-	gtk_widget_ref (ientry->_priv->fentry);
+	g_object_ref (ientry->_priv->fentry);
 	g_signal_connect_after (ientry->_priv->fentry, "browse_clicked",
 				G_CALLBACK (browse_clicked),
 				ientry);

Modified: trunk/libgnomeui/gnome-icon-list.c
==============================================================================
--- trunk/libgnomeui/gnome-icon-list.c	(original)
+++ trunk/libgnomeui/gnome-icon-list.c	Fri Mar  6 10:44:29 2009
@@ -1437,7 +1437,7 @@
 	}
 
 	if (gil->_priv->timer_tag != 0) {
-		gtk_timeout_remove (gil->_priv->timer_tag);
+		g_source_remove (gil->_priv->timer_tag);
 		gil->_priv->timer_tag = 0;
 	}
 
@@ -2010,7 +2010,7 @@
 	priv->selecting = FALSE;
 
 	if (priv->timer_tag != 0) {
-		gtk_timeout_remove (priv->timer_tag);
+		g_source_remove (priv->timer_tag);
 		priv->timer_tag = 0;
 	}
 
@@ -2073,7 +2073,7 @@
 	if (absolute_y < 0 || absolute_y > widget->allocation.height) {
 
 		if (priv->timer_tag == 0)
-			priv->timer_tag = gtk_timeout_add (SCROLL_TIMEOUT, scroll_timeout, gil);
+			priv->timer_tag = g_timeout_add (SCROLL_TIMEOUT, scroll_timeout, gil);
 
 		if (absolute_y < 0)
 			priv->value_diff = absolute_y;
@@ -2089,7 +2089,7 @@
 		 */
 		priv->value_diff /= 4;
 	} else if (priv->timer_tag != 0) {
-		gtk_timeout_remove (priv->timer_tag);
+		g_source_remove (priv->timer_tag);
 		priv->timer_tag = 0;
 	}
 
@@ -2514,17 +2514,16 @@
 	if (gil->adj) {
 		g_signal_handlers_disconnect_matched (gil->adj, G_SIGNAL_MATCH_DATA,
 						      0, 0, NULL, NULL, gil);
-		g_object_unref (G_OBJECT (gil->adj));
+		g_object_unref (gil->adj);
 	}
 
 	gil->adj = vadj;
 
 	if (gil->adj) {
-		g_object_ref (G_OBJECT (gil->adj));
-		gtk_object_sink (GTK_OBJECT (gil->adj));
-		g_signal_connect (G_OBJECT (gil->adj), "value_changed",
+		g_object_ref_sink (gil->adj);
+		g_signal_connect (gil->adj, "value_changed",
 				  G_CALLBACK (gil_adj_value_changed), gil);
-		g_signal_connect (G_OBJECT (gil->adj), "changed",
+		g_signal_connect (gil->adj, "changed",
 				  G_CALLBACK (gil_adj_value_changed), gil);
 	}
 

Modified: trunk/libgnomeui/gnome-mdi-child.c
==============================================================================
--- trunk/libgnomeui/gnome-mdi-child.c	(original)
+++ trunk/libgnomeui/gnome-mdi-child.c	Fri Mar  6 10:44:29 2009
@@ -176,7 +176,7 @@
 {
 	mdi_child->views = g_list_remove(mdi_child->views, view);
 
-	gtk_widget_unref(view);
+	g_object_unref(view);
 }
 
 /**

Modified: trunk/libgnomeui/gnome-mdi.c
==============================================================================
--- trunk/libgnomeui/gnome-mdi.c	(original)
+++ trunk/libgnomeui/gnome-mdi.c	Fri Mar  6 10:44:29 2009
@@ -240,7 +240,7 @@
 
 	gnome_mdi_remove_all(mdi, TRUE);
 
-	gtk_object_sink(GTK_OBJECT(object));
+	g_object_ref_sink(GTK_OBJECT(object));
 
 	if(GTK_OBJECT_CLASS(parent_class)->destroy)
 		(* GTK_OBJECT_CLASS(parent_class)->destroy)(object);
@@ -1168,7 +1168,7 @@
 	   when removed from its parent later, as we want it to
 	   stay valid until removed from the child with a call
 	   to gnome_mdi_child_remove_view() */
-	gtk_widget_ref(view);
+	g_object_ref(view);
 
 	if(!GTK_WIDGET_VISIBLE(view))
 		gtk_widget_show(view);
@@ -1246,7 +1246,7 @@
 	   when removed from its parent later, as we want it to
 	   stay valid until removed from the child with a call
 	   to gnome_mdi_child_remove_view() */
-	gtk_widget_ref(view);
+	g_object_ref(view);
 
 	if(!GTK_WIDGET_VISIBLE(view))
 		gtk_widget_show(view);
@@ -1450,7 +1450,7 @@
 
 	child->parent = NULL;
 
-	gtk_object_sink(GTK_OBJECT(child));
+	g_object_ref_sink(GTK_OBJECT(child));
 
 	if(mdi->mode == GNOME_MDI_MODAL && mdi->children) {
 		GnomeMDIChild *next_child = mdi->children->data;

Modified: trunk/libgnomeui/gnome-pixmap-entry.c
==============================================================================
--- trunk/libgnomeui/gnome-pixmap-entry.c	(original)
+++ trunk/libgnomeui/gnome-pixmap-entry.c	Fri Mar  6 10:44:29 2009
@@ -30,6 +30,9 @@
  *
  * Author: George Lebl <jirka 5z com>
  */
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <libgnome/gnome-macros.h>
 

Modified: trunk/libgnomeui/gnome-popup-menu.c
==============================================================================
--- trunk/libgnomeui/gnome-popup-menu.c	(original)
+++ trunk/libgnomeui/gnome-popup-menu.c	Fri Mar  6 10:44:29 2009
@@ -326,8 +326,7 @@
 
 	/* Ref/sink the popup menu so that we take "ownership" of it */
 
-	g_object_ref (G_OBJECT (popup));
-	gtk_object_sink (GTK_OBJECT (popup));
+	g_object_ref_sink (popup);
 
 	/* Store the user data pointer in the widget -- we will use it later when the menu has to be
 	 * invoked.

Modified: trunk/libgnomeui/gnometypes.c
==============================================================================
--- trunk/libgnomeui/gnometypes.c	(original)
+++ trunk/libgnomeui/gnometypes.c	Fri Mar  6 10:44:29 2009
@@ -1,3 +1,5 @@
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <gtk/gtk.h>
 #include <libgnomeui.h>

Modified: trunk/test-gnome/test-password-dialog.c
==============================================================================
--- trunk/test-gnome/test-password-dialog.c	(original)
+++ trunk/test-gnome/test-password-dialog.c	Fri Mar  6 10:44:29 2009
@@ -1,3 +1,4 @@
+#undef GTK_DISABLE_DEPRECATED
 
 #include <config.h>
 

Modified: trunk/test-gnome/testdruid.c
==============================================================================
--- trunk/test-gnome/testdruid.c	(original)
+++ trunk/test-gnome/testdruid.c	Fri Mar  6 10:44:29 2009
@@ -1,3 +1,4 @@
+#undef GTK_DISABLE_DEPRECATED
 
 #include <config.h>
 #include <time.h>

Modified: trunk/test-gnome/testentry.c
==============================================================================
--- trunk/test-gnome/testentry.c	(original)
+++ trunk/test-gnome/testentry.c	Fri Mar  6 10:44:29 2009
@@ -1,3 +1,4 @@
+#undef GTK_DISABLE_DEPRECATED
 
 #include <config.h>
 

Modified: trunk/test-gnome/testgnome.c
==============================================================================
--- trunk/test-gnome/testgnome.c	(original)
+++ trunk/test-gnome/testgnome.c	Fri Mar  6 10:44:29 2009
@@ -21,6 +21,8 @@
  * 02111-1307, USA.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <time.h>
 #include <stdlib.h>

Modified: trunk/test-gnome/testgnomegdkpixbuf.c
==============================================================================
--- trunk/test-gnome/testgnomegdkpixbuf.c	(original)
+++ trunk/test-gnome/testgnomegdkpixbuf.c	Fri Mar  6 10:44:29 2009
@@ -1,3 +1,4 @@
+#undef GTK_DISABLE_DEPRECATED
 
 #include <config.h>
 #include <time.h>

Modified: trunk/test-gnome/testiconlist.c
==============================================================================
--- trunk/test-gnome/testiconlist.c	(original)
+++ trunk/test-gnome/testiconlist.c	Fri Mar  6 10:44:29 2009
@@ -1,3 +1,5 @@
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include <libgnomeui.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]