summaryrefslogtreecommitdiff
path: root/mateweather/mateweather-applet.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-11-24 18:21:18 +0100
committerStefano Karapetsas <[email protected]>2012-11-24 18:21:18 +0100
commite41ba47bb489bb79ff8a3251fd896900bb3e42c3 (patch)
treeaa950c57bfc68aa1e3f2d49099c61d567ce09669 /mateweather/mateweather-applet.c
parent75d606567d8e4923e83a58ec8fce410bee89d473 (diff)
downloadmate-applets-e41ba47bb489bb79ff8a3251fd896900bb3e42c3.tar.bz2
mate-applets-e41ba47bb489bb79ff8a3251fd896900bb3e42c3.tar.xz
mateweather: migrate to gsettings
Diffstat (limited to 'mateweather/mateweather-applet.c')
-rw-r--r--mateweather/mateweather-applet.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/mateweather/mateweather-applet.c b/mateweather/mateweather-applet.c
index c00a21c4..8420195e 100644
--- a/mateweather/mateweather-applet.c
+++ b/mateweather/mateweather-applet.c
@@ -21,9 +21,9 @@
#include <arpa/nameser.h>
#include <resolv.h>
-#include <mateconf/mateconf-client.h>
+#include <gio/gio.h>
#include <mate-panel-applet.h>
-#include <mate-panel-applet-mateconf.h>
+#include <mate-panel-applet-gsettings.h>
#include <gdk/gdkkeysyms.h>
@@ -294,8 +294,9 @@ applet_destroy (GtkWidget *widget, MateWeatherApplet *gw_applet)
gw_applet->suncalc_timeout_tag = 0;
}
- if (gw_applet->mateconf) {
- mateweather_mateconf_free (gw_applet->mateconf);
+ if (gw_applet->settings) {
+ g_object_unref (gw_applet->settings);
+ gw_applet->settings = NULL;
}
weather_info_abort (gw_applet->mateweather_info);
@@ -394,7 +395,6 @@ update_finish (WeatherInfo *info, gpointer data)
static int gw_fault_counter = 0;
#ifdef HAVE_LIBMATENOTIFY
char *message, *detail;
- MateConfClient *conf;
#endif
char *s;
MateWeatherApplet *gw_applet = (MateWeatherApplet *)data;
@@ -443,9 +443,6 @@ update_finish (WeatherInfo *info, gpointer data)
place_widgets(gw_applet);
#ifdef HAVE_LIBMATENOTIFY
- if (mate_panel_applet_mateconf_get_bool (gw_applet->applet,
- "show_notifications", NULL))
- {
NotifyNotification *n;
/* Show notifications if possible */
@@ -484,7 +481,6 @@ update_finish (WeatherInfo *info, gpointer data)
g_free (message);
g_free (detail);
}
- }
#endif
}
else