summaryrefslogtreecommitdiff
path: root/mateweather
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-04-11 07:26:37 -0700
committerStefano Karapetsas <[email protected]>2013-04-11 07:26:37 -0700
commit4201dbf6a41538083734153f3371c0c65d672979 (patch)
tree0a744b43c3b742b9824aeaab2f6a8464bd8312af /mateweather
parenta48819d511d123db2e45c7f159169910c0cf6dc9 (diff)
parent32953ecd2e50799c34f7e5f2794f2b1f1a6a13ef (diff)
downloadmate-applets-4201dbf6a41538083734153f3371c0c65d672979.tar.bz2
mate-applets-4201dbf6a41538083734153f3371c0c65d672979.tar.xz
Merge pull request #40 from muesli4/master
Making the notification in mate-applets/mateweather an optional feature
Diffstat (limited to 'mateweather')
-rw-r--r--mateweather/mateweather-applet.c4
-rw-r--r--mateweather/mateweather-pref.c41
2 files changed, 44 insertions, 1 deletions
diff --git a/mateweather/mateweather-applet.c b/mateweather/mateweather-applet.c
index fdb9879e..7743ed05 100644
--- a/mateweather/mateweather-applet.c
+++ b/mateweather/mateweather-applet.c
@@ -312,6 +312,7 @@ void mateweather_applet_create (MateWeatherApplet *gw_applet)
AtkObject *atk_obj;
gw_applet->mateweather_pref.location = NULL;
+ gw_applet->mateweather_pref.show_notifications = FALSE;
gw_applet->mateweather_pref.update_interval = 1800;
gw_applet->mateweather_pref.update_enabled = TRUE;
gw_applet->mateweather_pref.detailed = FALSE;
@@ -442,6 +443,8 @@ update_finish (WeatherInfo *info, gpointer data)
place_widgets(gw_applet);
#ifdef HAVE_LIBNOTIFY
+ if (gw_applet->mateweather_pref.show_notifications)
+ {
NotifyNotification *n;
/* Show notifications if possible */
@@ -479,6 +482,7 @@ update_finish (WeatherInfo *info, gpointer data)
g_free (message);
g_free (detail);
}
+ }
#endif
}
else
diff --git a/mateweather/mateweather-pref.c b/mateweather/mateweather-pref.c
index 97340a1e..90b35875 100644
--- a/mateweather/mateweather-pref.c
+++ b/mateweather/mateweather-pref.c
@@ -53,6 +53,10 @@ struct _MateWeatherPrefPrivate {
GtkWidget* basic_radar_url_entry;
#endif /* RADARMAP */
+ #ifdef HAVE_LIBNOTIFY
+ GtkWidget* basic_show_notifications_btn;
+ #endif
+
GtkWidget* basic_update_spin;
GtkWidget* basic_update_btn;
GtkWidget* tree;
@@ -197,7 +201,9 @@ static gboolean update_dialog(MateWeatherPref* pref)
#endif /* RADARMAP */
-
+ #ifdef HAVE_LIBNOTIFY
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pref->priv->basic_show_notifications_btn), gw_applet->mateweather_pref.show_notifications);
+ #endif
return TRUE;
}
@@ -295,6 +301,22 @@ static void load_locations(MateWeatherPref* pref)
}
}
+static void show_notifications_toggled(GtkToggleButton* button, MateWeatherPref* pref)
+{
+ MateWeatherApplet* gw_applet = pref->priv->applet;
+
+ gboolean toggled = gtk_toggle_button_get_active(button);
+
+ if (toggled != gw_applet->mateweather_pref.show_notifications)
+ {
+ /* sync with mateweather_pref struct */
+ gw_applet->mateweather_pref.show_notifications = toggled;
+
+ /* sync with gsettings */
+ g_settings_set_boolean (gw_applet->settings, "show-notifications", toggled);
+ }
+}
+
static void auto_update_toggled(GtkToggleButton* button, MateWeatherPref* pref)
{
MateWeatherApplet* gw_applet = pref->priv->applet;
@@ -1005,6 +1027,18 @@ static void mateweather_pref_create(MateWeatherPref* pref)
}
#endif /* RADARMAP */
+ #ifdef HAVE_LIBNOTIFY
+ /* setup show-notifications button */
+ pref->priv->basic_show_notifications_btn = gtk_check_button_new_with_mnemonic (_("Show _notifications"));
+
+ if (!g_settings_is_writable (pref->priv->applet->settings, "show-notifications"))
+ {
+ hard_set_sensitive (pref->priv->basic_show_notifications_btn, FALSE);
+ }
+
+ g_signal_connect (G_OBJECT (pref->priv->basic_show_notifications_btn), "toggled", G_CALLBACK (show_notifications_toggled), pref);
+ #endif
+
frame = create_hig_catagory (pref_basic_vbox, _("Update"));
pref_basic_update_hbox = gtk_hbox_new (FALSE, 12);
@@ -1057,6 +1091,11 @@ static void mateweather_pref_create(MateWeatherPref* pref)
gtk_box_pack_start (GTK_BOX (vbox), radar_toggle_hbox, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), pref->priv->basic_radar_url_hbox, TRUE, TRUE, 0);
#endif /* RADARMAP */
+
+ #ifdef HAVE_LIBNOTIFY
+ /* add the show-notification toggle button to the vbox of the display section */
+ gtk_box_pack_start (GTK_BOX (vbox), pref->priv->basic_show_notifications_btn, TRUE, TRUE, 0);
+ #endif
gtk_container_add (GTK_CONTAINER (frame), vbox);