seahorse r2826 - in trunk: . gkr libseahorse src

[sadam svn gnome org]

Author: sadam
Date: Tue Feb 17 18:54:37 2009
New Revision: 2826
URL: http://svn.gnome.org/viewvc/seahorse?rev=2826&view=rev

Log:
2009-02-17  Adam Schreiber  <sadam clemson edu>

    * src/seahorse-keyserver-search.c:
    * gkr/seahorse-gkr-item-properties.c:
    * libseahorse/seahorse-object-widget.h: Remove deprecated GTK+ 
symbols
    Fixes bug #572181


Modified:
   trunk/ChangeLog
   trunk/gkr/seahorse-gkr-item-properties.c
   trunk/libseahorse/seahorse-object-widget.h
   trunk/src/seahorse-keyserver-search.c

Modified: trunk/gkr/seahorse-gkr-item-properties.c
==============================================================================
--- trunk/gkr/seahorse-gkr-item-properties.c	(original)
+++ trunk/gkr/seahorse-gkr-item-properties.c	Tue Feb 17 18:54:37 2009
@@ -677,7 +677,7 @@
 	model = gtk_tree_view_get_model (tree);
 	if (!model) {
 		g_assert (2 == APPS_N_COLUMNS);
-		store = gtk_list_store_new (2, boxed_access_control_type (), GTK_TYPE_STRING);
+		store = gtk_list_store_new (2, boxed_access_control_type (), G_TYPE_STRING);
 		model = GTK_TREE_MODEL (store);
 		gtk_tree_view_set_model (tree, model);
 

Modified: trunk/libseahorse/seahorse-object-widget.h
==============================================================================
--- trunk/libseahorse/seahorse-object-widget.h	(original)
+++ trunk/libseahorse/seahorse-object-widget.h	Tue Feb 17 18:54:37 2009
@@ -28,11 +28,11 @@
 #include "seahorse-widget.h"
 
 #define SEAHORSE_TYPE_OBJECT_WIDGET		(seahorse_object_widget_get_type ())
-#define SEAHORSE_OBJECT_WIDGET(obj)		(GTK_CHECK_CAST ((obj), SEAHORSE_TYPE_OBJECT_WIDGET, SeahorseObjectWidget))
-#define SEAHORSE_OBJECT_WIDGET_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_OBJECT_WIDGET, SeahorseObjectWidgetClass))
-#define SEAHORSE_IS_OBJECT_WIDGET(obj)		(GTK_CHECK_TYPE ((obj), SEAHORSE_TYPE_OBJECT_WIDGET))
-#define SEAHORSE_IS_OBJECT_WIDGET_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_OBJECT_WIDGET))
-#define SEAHORSE_OBJECT_WIDGET_GET_CLASS(obj)	(GTK_CHECK_GET_CLASS ((obj), SEAHORSE_TYPE_OBJECT_WIDGET, SeahorseObjectWidgetClass))
+#define SEAHORSE_OBJECT_WIDGET(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_OBJECT_WIDGET, SeahorseObjectWidget))
+#define SEAHORSE_OBJECT_WIDGET_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_OBJECT_WIDGET, SeahorseObjectWidgetClass))
+#define SEAHORSE_IS_OBJECT_WIDGET(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_OBJECT_WIDGET))
+#define SEAHORSE_IS_OBJECT_WIDGET_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_OBJECT_WIDGET))
+#define SEAHORSE_OBJECT_WIDGET_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_OBJECT_WIDGET, SeahorseObjectWidgetClass))
 
 typedef struct _SeahorseObjectWidget SeahorseObjectWidget;
 typedef struct _SeahorseObjectWidgetClass SeahorseObjectWidgetClass;

Modified: trunk/src/seahorse-keyserver-search.c
==============================================================================
--- trunk/src/seahorse-keyserver-search.c	(original)
+++ trunk/src/seahorse-keyserver-search.c	Tue Feb 17 18:54:37 2009
@@ -206,20 +206,8 @@
     GHashTable *unchecked;
     gboolean any = FALSE;
     GtkWidget *check;
-    GtkTooltips *tooltips;
     GSList *l, *n;
     
-    tooltips = GTK_TOOLTIPS (g_object_get_data (G_OBJECT (box), "tooltips"));
-    if (!tooltips) {
-        tooltips = gtk_tooltips_new ();
-
-        /* Special little reference counting for 'floating' reference */
-        g_object_ref (tooltips);
-        gtk_object_sink (GTK_OBJECT (tooltips));
-        
-        g_object_set_data_full (G_OBJECT (box), "tooltips", tooltips, (GDestroyNotify)g_object_unref);
-    }
-    
     /* Remove all checks, and note which ones were unchecked */
     unchecked = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
     gtk_container_foreach (cont, (GtkCallback)remove_checks, unchecked);
@@ -237,7 +225,7 @@
 
         /* Save URI and set it as the tooltip */
         g_object_set_data_full (G_OBJECT (check), "keyserver-uri", g_strdup ((gchar*)l->data), g_free);
-        gtk_tooltips_set_tip (tooltips, check, (gchar*)l->data, "");
+        gtk_widget_set_tooltip_text (check, (gchar*)l->data);
         
         gtk_container_add (cont, check);
     }