summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2018-01-15 18:54:04 +0100
committerraveit65 <[email protected]>2018-01-25 12:24:43 +0100
commit3a0c5ea4563ce588d30b94f8ea298c8471e3cbeb (patch)
treed02e12f1be79e9430d57b33348ec70b4a0707240
parentf8ba5b40ef9ce1f6c2b7462415ffc2fe9da931b9 (diff)
downloadmate-applets-3a0c5ea4563ce588d30b94f8ea298c8471e3cbeb.tar.bz2
mate-applets-3a0c5ea4563ce588d30b94f8ea298c8471e3cbeb.tar.xz
Revert "Added logic to not send notification if weather update is equal (as decided by weather_info_equal ()) to the previous update"
This reverts commit 109a7fa77bb4745524eca8a0735b210b55b81fe0. fixes clock-applet crashes https://github.com/mate-desktop/libmateweather/issues/51
-rw-r--r--mateweather/main.c3
-rw-r--r--mateweather/mateweather-applet.c7
-rw-r--r--mateweather/mateweather.h3
3 files changed, 1 insertions, 12 deletions
diff --git a/mateweather/main.c b/mateweather/main.c
index e59665f1..de8d8436 100644
--- a/mateweather/main.c
+++ b/mateweather/main.c
@@ -35,9 +35,6 @@ static gboolean mateweather_applet_new(MatePanelApplet* applet, const gchar* iid
gw_applet->applet = applet;
gw_applet->mateweather_info = NULL;
-#ifdef HAVE_LIBNOTIFY
- gw_applet->mateweather_previnfo = NULL;
-#endif
gw_applet->settings = mate_panel_applet_settings_new (applet, "org.mate.weather");
mateweather_applet_create(gw_applet);
diff --git a/mateweather/mateweather-applet.c b/mateweather/mateweather-applet.c
index 118a801b..59768635 100644
--- a/mateweather/mateweather-applet.c
+++ b/mateweather/mateweather-applet.c
@@ -458,8 +458,7 @@ update_finish (WeatherInfo *info, gpointer data)
place_widgets(gw_applet);
#ifdef HAVE_LIBNOTIFY
- if (gw_applet->mateweather_pref.show_notifications &&
- !weather_info_equal(gw_applet->mateweather_previnfo, gw_applet->mateweather_info))
+ if (gw_applet->mateweather_pref.show_notifications)
{
NotifyNotification *n;
@@ -499,9 +498,6 @@ update_finish (WeatherInfo *info, gpointer data)
g_free (detail);
}
}
-
- weather_info_free (gw_applet->mateweather_previnfo);
- gw_applet->mateweather_previnfo = weather_info_clone (gw_applet->mateweather_info);
#endif
}
else
@@ -558,5 +554,4 @@ void mateweather_update (MateWeatherApplet *gw_applet)
&prefs,
update_finish, gw_applet);
}
-
}
diff --git a/mateweather/mateweather.h b/mateweather/mateweather.h
index a2f77b6a..f486017c 100644
--- a/mateweather/mateweather.h
+++ b/mateweather/mateweather.h
@@ -27,9 +27,6 @@ G_BEGIN_DECLS
typedef struct _MateWeatherApplet {
MatePanelApplet* applet;
WeatherInfo* mateweather_info;
-#ifdef HAVE_LIBNOTIFY
- WeatherInfo* mateweather_previnfo;
-#endif
GSettings* settings;