|
1
|
|
-From 6fc574987f9c2f4d52b2f452acd8194061d32623 Mon Sep 17 00:00:00 2001
|
|
2
|
|
-From: Hal Gentz <zegentzy@gmail.com>
|
|
3
|
|
-Date: Wed, 15 Mar 2017 17:44:26 -0600
|
|
4
|
|
-Subject: [PATCH] Fixes bug 823790 in Debian by removing the update every
|
|
5
|
|
- sunrise/sunset... why do we have it anyways?
|
|
6
|
|
-
|
|
7
|
|
-Signed-off-by: Hal Gentz <zegentzy@gmail.com>
|
|
8
|
|
----
|
|
9
|
|
- mateweather/mateweather-applet.c | 8 --------
|
|
10
|
|
- mateweather/mateweather-applet.h | 1 -
|
|
11
|
|
- mateweather/mateweather-pref.c | 12 ------------
|
|
12
|
|
- mateweather/mateweather.h | 1 -
|
|
13
|
|
- 4 files changed, 22 deletions(-)
|
|
14
|
|
-
|
|
15
|
|
-diff --git a/mateweather/mateweather-applet.c b/mateweather/mateweather-applet.c
|
|
16
|
|
-index 9d774e5..c15cbb7 100644
|
|
17
|
|
---- a/mateweather/mateweather-applet.c
|
|
18
|
|
-+++ b/mateweather/mateweather-applet.c
|
|
19
|
|
-@@ -515,14 +515,6 @@ update_finish (WeatherInfo *info, gpointer data)
|
|
20
|
|
- }
|
|
21
|
|
- }
|
|
22
|
|
-
|
|
23
|
|
--gint suncalc_timeout_cb (gpointer data)
|
|
24
|
|
--{
|
|
25
|
|
-- WeatherInfo *info = ((MateWeatherApplet *)data)->mateweather_info;
|
|
26
|
|
-- update_finish(info, data);
|
|
27
|
|
-- return 0; /* Do not repeat timeout (will be reset by update_finish) */
|
|
28
|
|
--}
|
|
29
|
|
--
|
|
30
|
|
--
|
|
31
|
|
- void mateweather_update (MateWeatherApplet *gw_applet)
|
|
32
|
|
- {
|
|
33
|
|
- WeatherPrefs prefs;
|
|
34
|
|
-diff --git a/mateweather/mateweather-applet.h b/mateweather/mateweather-applet.h
|
|
35
|
|
-index eef4f8b..8073429 100644
|
|
36
|
|
---- a/mateweather/mateweather-applet.h
|
|
37
|
|
-+++ b/mateweather/mateweather-applet.h
|
|
38
|
|
-@@ -21,7 +21,6 @@ G_BEGIN_DECLS
|
|
39
|
|
-
|
|
40
|
|
- extern void mateweather_applet_create(MateWeatherApplet *gw_applet);
|
|
41
|
|
- extern gint timeout_cb (gpointer data);
|
|
42
|
|
--extern gint suncalc_timeout_cb (gpointer data);
|
|
43
|
|
- extern void mateweather_update (MateWeatherApplet *applet);
|
|
44
|
|
-
|
|
45
|
|
- G_END_DECLS
|
|
46
|
|
-diff --git a/mateweather/mateweather-pref.c b/mateweather/mateweather-pref.c
|
|
47
|
|
-index d2b31c0..ec535d7 100644
|
|
48
|
|
---- a/mateweather/mateweather-pref.c
|
|
49
|
|
-+++ b/mateweather/mateweather-pref.c
|
|
50
|
|
-@@ -321,7 +321,6 @@ static void auto_update_toggled(GtkToggleButton* button, MateWeatherPref* pref)
|
|
51
|
|
- {
|
|
52
|
|
- MateWeatherApplet* gw_applet = pref->priv->applet;
|
|
53
|
|
- gboolean toggled;
|
|
54
|
|
-- gint nxtSunEvent;
|
|
55
|
|
-
|
|
56
|
|
- toggled = gtk_toggle_button_get_active(button);
|
|
57
|
|
- gw_applet->mateweather_pref.update_enabled = toggled;
|
|
58
|
|
-@@ -333,20 +332,9 @@ static void auto_update_toggled(GtkToggleButton* button, MateWeatherPref* pref)
|
|
59
|
|
- g_source_remove(gw_applet->timeout_tag);
|
|
60
|
|
- }
|
|
61
|
|
-
|
|
62
|
|
-- if (gw_applet->suncalc_timeout_tag > 0)
|
|
63
|
|
-- {
|
|
64
|
|
-- g_source_remove(gw_applet->suncalc_timeout_tag);
|
|
65
|
|
-- }
|
|
66
|
|
--
|
|
67
|
|
- if (gw_applet->mateweather_pref.update_enabled)
|
|
68
|
|
- {
|
|
69
|
|
- gw_applet->timeout_tag = g_timeout_add_seconds(gw_applet->mateweather_pref.update_interval, timeout_cb, gw_applet);
|
|
70
|
|
-- nxtSunEvent = weather_info_next_sun_event(gw_applet->mateweather_info);
|
|
71
|
|
--
|
|
72
|
|
-- if (nxtSunEvent >= 0)
|
|
73
|
|
-- {
|
|
74
|
|
-- gw_applet->suncalc_timeout_tag = g_timeout_add_seconds(nxtSunEvent, suncalc_timeout_cb, gw_applet);
|
|
75
|
|
-- }
|
|
76
|
|
- }
|
|
77
|
|
- }
|
|
78
|
|
-
|
|
79
|
|
-diff --git a/mateweather/mateweather.h b/mateweather/mateweather.h
|
|
80
|
|
-index f486017..1fe270b 100644
|
|
81
|
|
---- a/mateweather/mateweather.h
|
|
82
|
|
-+++ b/mateweather/mateweather.h
|
|
83
|
|
-@@ -38,7 +38,6 @@ typedef struct _MateWeatherApplet {
|
|
84
|
|
- MatePanelAppletOrient orient;
|
|
85
|
|
- gint size;
|
|
86
|
|
- gint timeout_tag;
|
|
87
|
|
-- gint suncalc_timeout_tag;
|
|
88
|
|
-
|
|
89
|
|
- /* preferences */
|
|
90
|
|
- MateWeatherPrefs mateweather_pref;
|
|
91
|
|
---
|
|
92
|
|
-2.11.0
|
|
93
|
|
-
|