seahorse r2827 - in seahorse-plugins/trunk: . libseahorse plugins/applet

[sadam svn gnome org]

Author: sadam
Date: Tue Feb 17 19:13:17 2009
New Revision: 2827
URL: http://svn.gnome.org/viewvc/seahorse?rev=2827&view=rev

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

    * plugins/applet/seahorse-applet.c:
    * libseahorse/seahorse-widget.h: Remove deprecated GTK+ symbols
    Fixes bug #572183


Modified:
   seahorse-plugins/trunk/ChangeLog
   seahorse-plugins/trunk/libseahorse/seahorse-widget.h
   seahorse-plugins/trunk/plugins/applet/seahorse-applet.c

Modified: seahorse-plugins/trunk/libseahorse/seahorse-widget.h
==============================================================================
--- seahorse-plugins/trunk/libseahorse/seahorse-widget.h	(original)
+++ seahorse-plugins/trunk/libseahorse/seahorse-widget.h	Tue Feb 17 19:13:17 2009
@@ -42,11 +42,11 @@
 #include <glade/glade-xml.h>
 
 #define SEAHORSE_TYPE_WIDGET            (seahorse_widget_get_type ())
-#define SEAHORSE_WIDGET(obj)            (GTK_CHECK_CAST ((obj), SEAHORSE_TYPE_WIDGET, SeahorseWidget))
-#define SEAHORSE_WIDGET_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_WIDGET, SeahorseWidgetClass))
-#define SEAHORSE_IS_WIDGET(obj)         (GTK_CHECK_TYPE ((obj), SEAHORSE_TYPE_WIDGET))
-#define SEAHORSE_IS_WIDGET_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_WIDGET))
-#define SEAHORSE_WIDGET_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), SEAHORSE_TYPE_WIDGET, SeahorseWidgetClass))
+#define SEAHORSE_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_WIDGET, SeahorseWidget))
+#define SEAHORSE_WIDGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_WIDGET, SeahorseWidgetClass))
+#define SEAHORSE_IS_WIDGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_WIDGET))
+#define SEAHORSE_IS_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_WIDGET))
+#define SEAHORSE_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_WIDGET, SeahorseWidgetClass))
 
 typedef struct _SeahorseWidget SeahorseWidget;
 typedef struct _SeahorseWidgetClass SeahorseWidgetClass;

Modified: seahorse-plugins/trunk/plugins/applet/seahorse-applet.c
==============================================================================
--- seahorse-plugins/trunk/plugins/applet/seahorse-applet.c	(original)
+++ seahorse-plugins/trunk/plugins/applet/seahorse-applet.c	Tue Feb 17 19:13:17 2009
@@ -147,7 +147,6 @@
 
 typedef struct _SeahorseAppletPrivate {
     GtkWidget           *image;
-    GtkTooltips         *tooltips;
     GtkClipboard        *board;
     GtkWidget           *menu;
     SeahorseTextType    clipboard_contents;
@@ -866,13 +865,10 @@
     priv->clipboard_contents = SEAHORSE_TEXT_TYPE_NONE;
     
     priv->image = gtk_image_new ();
-    priv->tooltips = gtk_tooltips_new ();
 
     gtk_container_add (GTK_CONTAINER (applet), priv->image);
 
-    g_object_ref (priv->tooltips);
-    gtk_object_sink (GTK_OBJECT (priv->tooltips));
-    gtk_tooltips_set_tip (priv->tooltips, GTK_WIDGET (applet), _("Encryption Applet"), NULL);
+    gtk_widget_set_tooltip_text (GTK_WIDGET (applet), _("Encryption Applet"));
 
     set_atk_name_description (GTK_WIDGET (applet), _("Encryption Applet"), 
                               _("Use PGP/GPG to encrypt/decrypt/sign/verify/import the clipboard."));
@@ -902,7 +898,7 @@
     gtk_widget_set_style (GTK_WIDGET (applet), NULL);
     rc_style = gtk_rc_style_new ();
     gtk_widget_modify_style (GTK_WIDGET (applet), rc_style);
-    gtk_rc_style_unref (rc_style);
+    g_object_unref (rc_style);
 
     switch (type){
     case PANEL_NO_BACKGROUND:
@@ -932,10 +928,6 @@
         if (priv->menu)
             gtk_widget_destroy (priv->menu);
         priv->menu = NULL;
-        
-        if (priv->tooltips)
-            g_object_unref (G_OBJECT (priv->tooltips));
-        priv->tooltips = NULL;
     }
     
     if (G_OBJECT_CLASS (seahorse_applet_parent_class)->finalize)