Merge lp:~indicator-applet-developers/indicator-datetime/ubuntu into lp:~ubuntu-desktop/indicator-datetime/ubuntu

Proposed by Ted Gould
Status: Merged
Merged at revision: 123
Proposed branch: lp:~indicator-applet-developers/indicator-datetime/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-datetime/ubuntu
Diff against target: 347 lines (+90/-29)
9 files modified
AUTHORS (+3/-0)
ChangeLog (+32/-0)
configure (+10/-10)
configure.ac (+1/-1)
debian/changelog (+10/-2)
src/datetime-prefs-locations.c (+1/-2)
src/datetime-service.c (+21/-6)
src/indicator-datetime.c (+8/-6)
src/utils.c (+4/-2)
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-datetime/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+77607@code.launchpad.net

Description of the change

Release!

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2011-09-15 15:11:23 +0000
3+++ AUTHORS 2011-09-29 20:41:38 +0000
4@@ -1,5 +1,6 @@
5 # Generated by Makefile. Do not edit.
6
7+ Antti Kaijanmäki
8 David Barth
9 David Planella
10 Dylan McCall
11@@ -8,12 +9,14 @@
12 Gabor Kelemen
13 Javier Jardón
14 Jeremy Bicha
15+ Jörn Horstmann
16 karl-qdh
17 Ken VanDine
18 Kyle Nitzsche
19 Luke Yelavich
20 Marco Trevisan (Treviño)
21 Michael Terry
22+ Robert Ancell
23 Rodrigo Moya
24 Sebastien Bacher
25 Ted Gould
26
27=== modified file 'ChangeLog'
28--- ChangeLog 2011-09-15 15:43:59 +0000
29+++ ChangeLog 2011-09-29 20:41:38 +0000
30@@ -1,5 +1,37 @@
31 # Generated by Makefile. Do not edit.
32
33+2011-09-29 Ted Gould <ted@gould.cx>
34+
35+ 0.3.0
36+
37+2011-09-29 Ted Gould <ted@gould.cx>
38+
39+ Unref Cals in error situations
40+
41+2011-09-29 Antti Kaijanmäki <antti.kaijanmaki@canonical.com>
42+
43+ Fix 100% CPU usage (LP: #774071)
44+
45+2011-09-29 Ted Gould <ted@gould.cx>
46+
47+ Protect setting or unseting the env if we don't have it already.
48+
49+2011-09-28 Robert Ancell <robert.ancell@canonical.com>
50+
51+ Don't call setenv when value is NULL
52+
53+2011-09-21 Jörn Horstmann <launchpad@planetxml.de>
54+
55+ Use g_datetime() to measure string (6 LOC)
56+
57+2011-09-21 Ted Gould <ted@gould.cx>
58+
59+ Moving setting the translation domain for builder to earlier
60+
61+2011-09-18 Gabor Kelemen <kelemeng@gnome.hu>
62+
63+ Set translation domain before gtk_builder_add_from_file, in the other file too. LP: #853130
64+
65 2011-09-15 Ted Gould <ted@gould.cx>
66
67 0.2.95
68
69=== modified file 'configure'
70--- configure 2011-09-15 15:43:59 +0000
71+++ configure 2011-09-29 20:41:38 +0000
72@@ -1,6 +1,6 @@
73 #! /bin/sh
74 # Guess values for system-dependent variables and create Makefiles.
75-# Generated by GNU Autoconf 2.68 for indicator-datetime 0.2.95.
76+# Generated by GNU Autoconf 2.68 for indicator-datetime 0.3.0.
77 #
78 # Report bugs to <http://bugs.launchpad.net/indicator-datetime>.
79 #
80@@ -572,8 +572,8 @@
81 # Identity of this package.
82 PACKAGE_NAME='indicator-datetime'
83 PACKAGE_TARNAME='indicator-datetime'
84-PACKAGE_VERSION='0.2.95'
85-PACKAGE_STRING='indicator-datetime 0.2.95'
86+PACKAGE_VERSION='0.3.0'
87+PACKAGE_STRING='indicator-datetime 0.3.0'
88 PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-datetime'
89 PACKAGE_URL='http://launchpad.net/indicator-datetime'
90
91@@ -1375,7 +1375,7 @@
92 # Omit some internal or obsolete options to make the list less imposing.
93 # This message is too long to be a string in the A/UX 3.1 sh.
94 cat <<_ACEOF
95-\`configure' configures indicator-datetime 0.2.95 to adapt to many kinds of systems.
96+\`configure' configures indicator-datetime 0.3.0 to adapt to many kinds of systems.
97
98 Usage: $0 [OPTION]... [VAR=VALUE]...
99
100@@ -1446,7 +1446,7 @@
101
102 if test -n "$ac_init_help"; then
103 case $ac_init_help in
104- short | recursive ) echo "Configuration of indicator-datetime 0.2.95:";;
105+ short | recursive ) echo "Configuration of indicator-datetime 0.3.0:";;
106 esac
107 cat <<\_ACEOF
108
109@@ -1578,7 +1578,7 @@
110 test -n "$ac_init_help" && exit $ac_status
111 if $ac_init_version; then
112 cat <<\_ACEOF
113-indicator-datetime configure 0.2.95
114+indicator-datetime configure 0.3.0
115 generated by GNU Autoconf 2.68
116
117 Copyright (C) 2010 Free Software Foundation, Inc.
118@@ -1949,7 +1949,7 @@
119 This file contains any messages produced by compilers while
120 running configure, to aid debugging if configure makes a mistake.
121
122-It was created by indicator-datetime $as_me 0.2.95, which was
123+It was created by indicator-datetime $as_me 0.3.0, which was
124 generated by GNU Autoconf 2.68. Invocation command line was
125
126 $ $0 $@
127@@ -2773,7 +2773,7 @@
128
129 # Define the identity of the package.
130 PACKAGE='indicator-datetime'
131- VERSION='0.2.95'
132+ VERSION='0.3.0'
133
134
135 cat >>confdefs.h <<_ACEOF
136@@ -14654,7 +14654,7 @@
137 # report actual input values of CONFIG_FILES etc. instead of their
138 # values after options handling.
139 ac_log="
140-This file was extended by indicator-datetime $as_me 0.2.95, which was
141+This file was extended by indicator-datetime $as_me 0.3.0, which was
142 generated by GNU Autoconf 2.68. Invocation command line was
143
144 CONFIG_FILES = $CONFIG_FILES
145@@ -14721,7 +14721,7 @@
146 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
147 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
148 ac_cs_version="\\
149-indicator-datetime config.status 0.2.95
150+indicator-datetime config.status 0.3.0
151 configured by $0, generated by GNU Autoconf 2.68,
152 with options \\"\$ac_cs_config\\"
153
154
155=== modified file 'configure.ac'
156--- configure.ac 2011-09-15 15:43:59 +0000
157+++ configure.ac 2011-09-29 20:41:38 +0000
158@@ -1,5 +1,5 @@
159 AC_INIT([indicator-datetime],
160- [0.2.95],
161+ [0.3.0],
162 [http://bugs.launchpad.net/indicator-datetime],
163 [indicator-datetime],
164 [http://launchpad.net/indicator-datetime])
165
166=== modified file 'debian/changelog'
167--- debian/changelog 2011-09-29 20:29:20 +0000
168+++ debian/changelog 2011-09-29 20:41:38 +0000
169@@ -1,9 +1,17 @@
170-indicator-datetime (0.2.95-0ubuntu2) UNRELEASED; urgency=low
171+indicator-datetime (0.3.0-0ubuntu1~ppa1) oneiric; urgency=low
172
173+ [ Ken VanDine ]
174 * debian/control
175 - Added recommends for e-d-s
176
177- -- Ken VanDine <ken.vandine@canonical.com> Thu, 29 Sep 2011 16:28:52 -0400
178+ [ Ted Gould ]
179+ * New upstream release.
180+ * Fix corrupt environment when LANGUAGE not set (LP: #861123)
181+ * Measure string size with GLib (LP: #730476)
182+ * Free ECals when they have errors (LP: #774071)
183+ * Fix untranslated string (LP: #853130)
184+
185+ -- Ted Gould <ted@ubuntu.com> Thu, 29 Sep 2011 15:39:41 -0500
186
187 indicator-datetime (0.2.95-0ubuntu1) oneiric; urgency=low
188
189
190=== modified file 'src/datetime-prefs-locations.c'
191--- src/datetime-prefs-locations.c 2011-04-11 12:08:12 +0000
192+++ src/datetime-prefs-locations.c 2011-09-29 20:41:38 +0000
193@@ -421,6 +421,7 @@
194 {
195 GError * error = NULL;
196 GtkBuilder * builder = gtk_builder_new ();
197+ gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
198 gtk_builder_add_from_file (builder, DATETIME_DIALOG_UI_FILE, &error);
199 if (error != NULL) {
200 /* We have to abort, we can't continue without the ui file */
201@@ -429,8 +430,6 @@
202 return NULL;
203 }
204
205- gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
206-
207 GSettings * conf = g_settings_new (SETTINGS_INTERFACE);
208
209 #define WIG(name) GTK_WIDGET (gtk_builder_get_object (builder, name))
210
211=== modified file 'src/datetime-service.c'
212--- src/datetime-service.c 2011-09-15 15:43:59 +0000
213+++ src/datetime-service.c 2011-09-29 20:41:38 +0000
214@@ -1,3 +1,4 @@
215+/*-*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
216 /*
217 An indicator to time and date related information in the menubar.
218
219@@ -430,7 +431,10 @@
220 static void
221 start_ecal_timer(void)
222 {
223- if (ecaltimer != 0) g_source_remove(ecaltimer);
224+ if (ecaltimer != 0) {
225+ g_source_remove(ecaltimer);
226+ ecaltimer = 0;
227+ }
228 if (update_appointment_menu_items(NULL))
229 ecaltimer = g_timeout_add_seconds(60*5, update_appointment_menu_items, NULL);
230 }
231@@ -438,7 +442,10 @@
232 static void
233 stop_ecal_timer(void)
234 {
235- if (ecaltimer != 0) g_source_remove(ecaltimer);
236+ if (ecaltimer != 0) {
237+ g_source_remove(ecaltimer);
238+ ecaltimer = 0;
239+ }
240 }
241 static gboolean
242 idle_start_ecal_timer (gpointer data)
243@@ -748,9 +755,10 @@
244 for (l = comp_instances; l; l = l->next) {
245 const struct comp_instance *ci = l->data;
246 g_object_unref(ci->comp);
247- g_list_free(comp_instances);
248- comp_instances = NULL;
249 }
250+ g_list_free(comp_instances);
251+ comp_instances = NULL;
252+
253 }
254 GSList *cal_list = gconf_client_get_list(gconf, "/apps/evolution/calendar/display/selected_calendars", GCONF_VALUE_STRING, &gerror);
255 if (gerror) {
256@@ -759,6 +767,7 @@
257 gerror = NULL;
258 cal_list = NULL;
259 }
260+
261 // Generate instances for all sources
262 for (g = e_source_list_peek_groups (sources); g; g = g->next) {
263 ESourceGroup *group = E_SOURCE_GROUP (g->data);
264@@ -779,6 +788,7 @@
265 g_debug("Failed to set ecal default timezone %s", gerror->message);
266 g_error_free(gerror);
267 gerror = NULL;
268+ g_object_unref(ecal);
269 continue;
270 }
271
272@@ -786,8 +796,9 @@
273 g_debug("Failed to get ecal sources %s", gerror->message);
274 g_error_free(gerror);
275 gerror = NULL;
276+ g_object_unref(ecal);
277 continue;
278- }
279+ }
280 const gchar *ecal_uid = e_source_peek_uid(source);
281 gboolean match = FALSE;
282 g_debug("Checking ecal_uid is enabled: %s", ecal_uid);
283@@ -798,10 +809,14 @@
284 break;
285 }
286 }
287- if (!match) continue;
288+ if (!match) {
289+ g_object_unref(ecal);
290+ continue;
291+ }
292 g_debug("ecal_uid is enabled, generating instances");
293
294 e_cal_generate_instances (ecal, t1, t2, (ECalRecurInstanceFn) populate_appointment_instances, (gpointer) source);
295+ g_object_unref(ecal);
296 }
297 }
298 g_debug("Number of ECalComponents returned: %d", g_list_length(comp_instances));
299
300=== modified file 'src/indicator-datetime.c'
301--- src/indicator-datetime.c 2011-09-15 15:43:59 +0000
302+++ src/indicator-datetime.c 2011-09-29 20:41:38 +0000
303@@ -1092,12 +1092,14 @@
304 g_debug("Checking against %d possible times", timevals->len);
305 gint check_time;
306 for (check_time = 0; check_time < timevals->len; check_time++) {
307- gchar longstr[256];
308- strftime(longstr, 256, self->priv->time_string, &(g_array_index(timevals, struct tm, check_time)));
309-
310- gchar * utf8 = g_locale_to_utf8(longstr, -1, NULL, NULL, NULL);
311- gint length = measure_string(style, context, utf8);
312- g_free(utf8);
313+ struct tm * timeval = &g_array_index(timevals, struct tm, check_time);
314+ GDateTime * dt = g_date_time_new_local(timeval->tm_year, timeval->tm_mon, timeval->tm_mday, timeval->tm_hour, timeval->tm_min, timeval->tm_sec);
315+ gchar * timestr = g_date_time_format(dt, self->priv->time_string);
316+
317+ gint length = measure_string(style, context, timestr);
318+
319+ g_free(timestr);
320+ g_date_time_unref(dt);
321
322 if (length > *max_width) {
323 *max_width = length;
324
325=== modified file 'src/utils.c'
326--- src/utils.c 2011-06-28 14:32:04 +0000
327+++ src/utils.c 2011-09-29 20:41:38 +0000
328@@ -161,7 +161,8 @@
329 char *time_locale = g_strdup(setlocale(LC_TIME, NULL));
330 char *language = g_strdup(g_getenv("LANGUAGE"));
331 char *rv;
332- g_unsetenv("LANGUAGE");
333+ if (language)
334+ g_unsetenv("LANGUAGE");
335 setlocale(LC_MESSAGES, time_locale);
336
337 /* Get the LC_TIME version */
338@@ -169,7 +170,8 @@
339
340 /* Put everything back the way it was */
341 setlocale(LC_MESSAGES, message_locale);
342- g_setenv("LANGUAGE", language, TRUE);
343+ if (language)
344+ g_setenv("LANGUAGE", language, TRUE);
345 g_free(message_locale);
346 g_free(time_locale);
347 g_free(language);

Subscribers

People subscribed via source and target branches