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

svn path=/trunk/; revision=11289

4 files changed, 18 insertions, 12 deletions

diff --git a/gweather/ChangeLog b/gweather/ChangeLog
index 5e429021f..9bc09b8c3 100644
--- a/gweather/ChangeLog
+++ b/gweather/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-17  Callum McKenzie  <callum@spooky-possum.org>
+
+	* gweather-applet.c:
+	* gweather-pref.c:
+	* gweather-dialog.c: Replace more deprecated functions. 
+
 2009-02-16  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
 
 	* docs/eu/eu.po: Added Basque translation.
diff --git a/gweather/gweather-applet.c b/gweather/gweather-applet.c
index 4730bb651..0a52a335c 100644
--- a/gweather/gweather-applet.c
+++ b/gweather/gweather-applet.c
@@ -279,12 +279,12 @@ applet_destroy (GtkWidget *widget, GWeatherApplet *gw_applet)
        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_finish (WeatherInfo *info, gpointer data)
 
     /* 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);
     }
 
diff --git a/gweather/gweather-dialog.c b/gweather/gweather-dialog.c
index 92c9bb63f..ba42bba5f 100644
--- a/gweather/gweather-dialog.c
+++ b/gweather/gweather-dialog.c
@@ -551,7 +551,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
 
       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);
diff --git a/gweather/gweather-pref.c b/gweather/gweather-pref.c
index 2c1bea13b..f2aa8d174 100644
--- a/gweather/gweather-pref.c
+++ b/gweather/gweather-pref.c
@@ -340,16 +340,16 @@ auto_update_toggled (GtkToggleButton *button, GWeatherPref *pref)
     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 @@ update_interval_changed (GtkSpinButton *button, GWeatherPref *pref)
     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);
 }