Indicator Date and Time

Merge lp:~kelemeng/indicator-datetime/bug853130 into lp:indicator-datetime/0.3

  1. bug853130
  2. Merge into trunk
Proposed by Gabor Kelemen
Status: Merged
Approved by: Ted Gould
Approved revision: 135
Merged at revision: 135
Proposed branch: lp:~kelemeng/indicator-datetime/bug853130
Merge into: lp:indicator-datetime/0.3
Diff against target: 20 lines (+1/-2)
1 file modified
src/datetime-prefs-locations.c (+1/-2)
To merge this branch: bzr merge lp:~kelemeng/indicator-datetime/bug853130
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+75889@code.launchpad.net
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
=== modified file 'src/datetime-prefs-locations.c'
--- src/datetime-prefs-locations.c 2011-04-11 12:08:12 +0000
+++ src/datetime-prefs-locations.c 2011-09-18 10:19:28 +0000
@@ -421,6 +421,7 @@
421{421{
422 GError * error = NULL;422 GError * error = NULL;
423 GtkBuilder * builder = gtk_builder_new ();423 GtkBuilder * builder = gtk_builder_new ();
424 gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
424 gtk_builder_add_from_file (builder, DATETIME_DIALOG_UI_FILE, &error);425 gtk_builder_add_from_file (builder, DATETIME_DIALOG_UI_FILE, &error);
425 if (error != NULL) {426 if (error != NULL) {
426 /* We have to abort, we can't continue without the ui file */427 /* We have to abort, we can't continue without the ui file */
@@ -429,8 +430,6 @@
429 return NULL;430 return NULL;
430 }431 }
431432
432 gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
433
434 GSettings * conf = g_settings_new (SETTINGS_INTERFACE);433 GSettings * conf = g_settings_new (SETTINGS_INTERFACE);
435434
436#define WIG(name) GTK_WIDGET (gtk_builder_get_object (builder, name))435#define WIG(name) GTK_WIDGET (gtk_builder_get_object (builder, name))

Subscribers

People subscribed via source and target branches