gnome-applets r11289 - in trunk: accessx-status battstat geyes gweather mixer modemlights stickynotes

[callum svn gnome org]

Author: callum
Date: Mon Feb 16 23:48:56 2009
New Revision: 11289
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=11289&view=rev

Log:
More deprecated function replacement. Why didn't GTK_DISABLE_DEPRECATED pick these up?

Modified:
   trunk/accessx-status/applet.c
   trunk/battstat/ChangeLog
   trunk/battstat/battstat_applet.c
   trunk/battstat/power-management.c
   trunk/geyes/ChangeLog
   trunk/geyes/geyes.c
   trunk/gweather/ChangeLog
   trunk/gweather/gweather-applet.c
   trunk/gweather/gweather-dialog.c
   trunk/gweather/gweather-pref.c
   trunk/mixer/ChangeLog
   trunk/mixer/applet.c
   trunk/modemlights/ChangeLog
   trunk/modemlights/modem-applet.c
   trunk/stickynotes/ChangeLog
   trunk/stickynotes/stickynotes_applet_callbacks.c

Modified: trunk/accessx-status/applet.c
==============================================================================
--- trunk/accessx-status/applet.c	(original)
+++ trunk/accessx-status/applet.c	Mon Feb 16 23:48:56 2009
@@ -1176,7 +1176,7 @@
         gtk_widget_set_style (GTK_WIDGET (sapplet->applet), NULL);
         rc_style = gtk_rc_style_new ();
         gtk_widget_modify_style (GTK_WIDGET (sapplet->applet), rc_style);
-        gtk_rc_style_unref (rc_style);
+        g_object_unref (rc_style);
 
         switch (type) {
                 case PANEL_COLOR_BACKGROUND:

Modified: trunk/battstat/battstat_applet.c
==============================================================================
--- trunk/battstat/battstat_applet.c	(original)
+++ trunk/battstat/battstat_applet.c	Mon Feb 16 23:48:56 2009
@@ -1560,12 +1560,12 @@
      reference to each widget.  This adds a real reference to each widget
      and "sinks" the floating reference.
   */
-  gtk_widget_ref( battstat->status );
-  gtk_widget_ref( battstat->percent );
-  gtk_widget_ref( battstat->battery );
-  gtk_object_sink( GTK_OBJECT( battstat->status ) );
-  gtk_object_sink( GTK_OBJECT( battstat->percent ) );
-  gtk_object_sink( GTK_OBJECT( battstat->battery ) );
+  g_object_ref( battstat->status );
+  g_object_ref( battstat->percent );
+  g_object_ref( battstat->battery );
+  g_object_ref_sink( GTK_OBJECT( battstat->status ) );
+  g_object_ref_sink( GTK_OBJECT( battstat->percent ) );
+  g_object_ref_sink( GTK_OBJECT( battstat->battery ) );
 
   /* Let reconfigure_layout know that the table is currently empty. */
   battstat->layout.status = LAYOUT_NONE;

Modified: trunk/battstat/power-management.c
==============================================================================
--- trunk/battstat/power-management.c	(original)
+++ trunk/battstat/power-management.c	Mon Feb 16 23:48:56 2009
@@ -119,37 +119,37 @@
 
   box = GTK_BOX( gtk_vbox_new( 5, FALSE ) );
 
-  gtk_box_pack_start_defaults( box, gtk_label_new( "percent" ) );
+  gtk_box_pack_start( box, gtk_label_new( "percent" ), TRUE, TRUE, 0);
   w = gtk_spin_button_new_with_range( -1.0, 100.0, 1 );
   gtk_spin_button_set_value( GTK_SPIN_BUTTON( w ), 50.0 );
   g_signal_connect( G_OBJECT( w ), "value-changed",
                     G_CALLBACK( test_update_integer ), &test_status.percent );
-  gtk_box_pack_start_defaults( box, w );
+  gtk_box_pack_start( box, w, TRUE, TRUE, 0 );
 
-  gtk_box_pack_start_defaults( box, gtk_label_new( "minutes" ) );
+  gtk_box_pack_start( box, gtk_label_new( "minutes" ), TRUE, TRUE, 0);
   w = gtk_spin_button_new_with_range( -1.0, 1000.0, 1 );
   gtk_spin_button_set_value( GTK_SPIN_BUTTON( w ), 180.0 );
   g_signal_connect( G_OBJECT( w ), "value-changed",
                     G_CALLBACK( test_update_integer ), &test_status.minutes );
-  gtk_box_pack_start_defaults( box, w );
+  gtk_box_pack_start( box, w, TRUE, TRUE, 0);
 
 
   w = gtk_toggle_button_new_with_label( "on_ac_power" );
   g_signal_connect( G_OBJECT( w ), "toggled",
                     G_CALLBACK( test_update_boolean ),
                     &test_status.on_ac_power );
-  gtk_box_pack_start_defaults( box, w );
+  gtk_box_pack_start( box, w, TRUE, TRUE, 0);
 
   w = gtk_toggle_button_new_with_label( "charging" );
   g_signal_connect( G_OBJECT( w ), "toggled",
                     G_CALLBACK( test_update_boolean ), &test_status.charging );
-  gtk_box_pack_start_defaults( box, w );
+  gtk_box_pack_start( box, w, TRUE, TRUE, 0);
 
   w = gtk_toggle_button_new_with_label( "present" );
   gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( w ), TRUE );
   g_signal_connect( G_OBJECT( w ), "toggled",
                     G_CALLBACK( test_update_boolean ), &test_status.present );
-  gtk_box_pack_start_defaults( box, w );
+  gtk_box_pack_start( box, w, TRUE, TRUE, 0);
 
   w = gtk_window_new( GTK_WINDOW_TOPLEVEL );
   gtk_container_add( GTK_CONTAINER( w ), GTK_WIDGET( box ) );

Modified: trunk/geyes/geyes.c
==============================================================================
--- trunk/geyes/geyes.c	(original)
+++ trunk/geyes/geyes.c	Mon Feb 16 23:48:56 2009
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <math.h>
+#include <stdlib.h>
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>
 #include "geyes.h"
@@ -40,7 +41,7 @@
         gtk_widget_set_style (GTK_WIDGET (eyes_applet->applet), NULL);
         rc_style = gtk_rc_style_new ();
         gtk_widget_modify_style (GTK_WIDGET (eyes_applet->applet), rc_style);
-        gtk_rc_style_unref (rc_style);
+        g_object_unref (rc_style);
 
         switch (type) {
                 case PANEL_COLOR_BACKGROUND:
@@ -299,7 +300,7 @@
 {
 	g_return_if_fail (eyes_applet);
 
-	gtk_timeout_remove (eyes_applet->timeout_id);
+	g_timeout_remove (eyes_applet->timeout_id);
 	if (eyes_applet->hbox)
 		destroy_eyes (eyes_applet);
 	eyes_applet->timeout_id = 0;
@@ -390,7 +391,7 @@
 
 	panel_applet_add_preferences (applet, "/schemas/apps/geyes/prefs", NULL);
 
-        eyes_applet->timeout_id = gtk_timeout_add (
+        eyes_applet->timeout_id = g_timeout_add (
 		UPDATE_TIMEOUT, (GtkFunction) timer_cb, eyes_applet);
 			
 	panel_applet_setup_menu_from_file (eyes_applet->applet,

Modified: trunk/gweather/gweather-applet.c
==============================================================================
--- trunk/gweather/gweather-applet.c	(original)
+++ trunk/gweather/gweather-applet.c	Mon Feb 16 23:48:56 2009
@@ -279,12 +279,12 @@
        gtk_widget_destroy (gw_applet->details_dialog);
 
     if (gw_applet->timeout_tag > 0) {
-       gtk_timeout_remove(gw_applet->timeout_tag);
+       g_timeout_remove(gw_applet->timeout_tag);
        gw_applet->timeout_tag = 0;
     }
 	
     if (gw_applet->suncalc_timeout_tag > 0) {
-       gtk_timeout_remove(gw_applet->suncalc_timeout_tag);
+       g_timeout_remove(gw_applet->suncalc_timeout_tag);
        gw_applet->suncalc_timeout_tag = 0;
     }
 	
@@ -394,18 +394,18 @@
 
     /* Update timer */
     if (gw_applet->timeout_tag > 0)
-        gtk_timeout_remove(gw_applet->timeout_tag);
+        g_timeout_remove(gw_applet->timeout_tag);
     if (gw_applet->gweather_pref.update_enabled)
     {
 	gw_applet->timeout_tag =
-		gtk_timeout_add (
+		g_timeout_add (
                        gw_applet->gweather_pref.update_interval * 1000,
                         timeout_cb, gw_applet);
 
         nxtSunEvent = weather_info_next_sun_event(gw_applet->gweather_info);
         if (nxtSunEvent >= 0)
             gw_applet->suncalc_timeout_tag =
-                        gtk_timeout_add (nxtSunEvent * 1000,
+                        g_timeout_add (nxtSunEvent * 1000,
                                 suncalc_timeout_cb, gw_applet);
     }
 

Modified: trunk/gweather/gweather-dialog.c
==============================================================================
--- trunk/gweather/gweather-dialog.c	(original)
+++ trunk/gweather/gweather-dialog.c	Mon Feb 16 23:48:56 2009
@@ -551,7 +551,7 @@
 
       radar_link_btn = gtk_button_new_with_mnemonic (_("_Visit Weather.com"));
       set_access_namedesc (radar_link_btn, _("Visit Weather.com"), _("Click to Enter Weather.com"));
-      gtk_widget_set_usize(radar_link_btn, 450, -2);
+      gtk_widget_set_size_request (radar_link_btn, 450, -2);
       gtk_widget_show (radar_link_btn);
       if (!gweather_gconf_get_bool (gw_applet->gconf, "use_custom_radar_url", NULL))
           gtk_container_add (GTK_CONTAINER (radar_link_alignment), radar_link_btn);

Modified: trunk/gweather/gweather-pref.c
==============================================================================
--- trunk/gweather/gweather-pref.c	(original)
+++ trunk/gweather/gweather-pref.c	Mon Feb 16 23:48:56 2009
@@ -340,16 +340,16 @@
     soft_set_sensitive (pref->priv->basic_update_spin, toggled);
     gweather_gconf_set_bool(gw_applet->gconf, "auto_update", toggled, NULL);
     if (gw_applet->timeout_tag > 0)
-        gtk_timeout_remove(gw_applet->timeout_tag);
+        g_timeout_remove(gw_applet->timeout_tag);
     if (gw_applet->suncalc_timeout_tag > 0)
-        gtk_timeout_remove(gw_applet->suncalc_timeout_tag);
+        g_timeout_remove(gw_applet->suncalc_timeout_tag);
     if (gw_applet->gweather_pref.update_enabled) {
-        gw_applet->timeout_tag = gtk_timeout_add (
+        gw_applet->timeout_tag = g_timeout_add (
 				gw_applet->gweather_pref.update_interval * 1000,
 				timeout_cb, gw_applet);
 	nxtSunEvent = weather_info_next_sun_event(gw_applet->gweather_info);
 	if (nxtSunEvent >= 0)
-	    gw_applet->suncalc_timeout_tag = gtk_timeout_add (
+	    gw_applet->suncalc_timeout_tag = g_timeout_add (
 	    						nxtSunEvent * 1000,
 							suncalc_timeout_cb,
 							gw_applet);
@@ -545,10 +545,10 @@
     gweather_gconf_set_int(gw_applet->gconf, "auto_update_interval", 
     		               gw_applet->gweather_pref.update_interval, NULL);
     if (gw_applet->timeout_tag > 0)
-        gtk_timeout_remove(gw_applet->timeout_tag);
+        g_timeout_remove(gw_applet->timeout_tag);
     if (gw_applet->gweather_pref.update_enabled)
         gw_applet->timeout_tag =  
-        	gtk_timeout_add (gw_applet->gweather_pref.update_interval * 1000,
+        	g_timeout_add (gw_applet->gweather_pref.update_interval * 1000,
                                  timeout_cb, gw_applet);
 }
 

Modified: trunk/mixer/applet.c
==============================================================================
--- trunk/mixer/applet.c	(original)
+++ trunk/mixer/applet.c	Mon Feb 16 23:48:56 2009
@@ -960,7 +960,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:

Modified: trunk/modemlights/modem-applet.c
==============================================================================
--- trunk/modemlights/modem-applet.c	(original)
+++ trunk/modemlights/modem-applet.c	Mon Feb 16 23:48:56 2009
@@ -266,7 +266,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)
     {
@@ -460,7 +460,7 @@
   /* if show_report, create pulse timeout and show window */
   if (show_report)
     {
-      priv->progress_id = gtk_timeout_add (200, (GSourceFunc) pulse_progressbar, priv->report_window_progress);
+      priv->progress_id = g_timeout_add (200, (GSourceFunc) pulse_progressbar, priv->report_window_progress);
       gtk_window_set_screen (GTK_WINDOW (priv->report_window), gtk_widget_get_screen (GTK_WIDGET (applet)));
       gtk_widget_show (priv->report_window);
     }

Modified: trunk/stickynotes/stickynotes_applet_callbacks.c
==============================================================================
--- trunk/stickynotes/stickynotes_applet_callbacks.c	(original)
+++ trunk/stickynotes/stickynotes_applet_callbacks.c	Mon Feb 16 23:48:56 2009
@@ -210,7 +210,7 @@
 	gtk_widget_set_style (GTK_WIDGET (applet->w_applet), NULL);
 	rc_style = gtk_rc_style_new ();
 	gtk_widget_modify_style (GTK_WIDGET (applet->w_applet), rc_style);
-	gtk_rc_style_unref (rc_style);
+	g_object_unref (rc_style);
 
 	switch (type)
 	{