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

Proposed by Gabor Kelemen on 2011-09-09
Status: Merged
Merged at revision: 132
Proposed branch: lp:~kelemeng/indicator-datetime/bug845473
Merge into: lp:indicator-datetime/0.3
Diff against target: 20 lines (+1/-2)
1 file modified
src/datetime-prefs.c (+1/-2)
To merge this branch: bzr merge lp:~kelemeng/indicator-datetime/bug845473
Reviewer Review Type Date Requested Status
Indicator Applet Developers 2011-09-09 Pending
Review via email: mp+74745@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.c'
--- src/datetime-prefs.c 2011-08-16 13:05:22 +0000
+++ src/datetime-prefs.c 2011-09-09 09:49:37 +0000
@@ -653,6 +653,7 @@
653 GError * error = NULL;653 GError * error = NULL;
654654
655 self->priv->builder = gtk_builder_new ();655 self->priv->builder = gtk_builder_new ();
656 gtk_builder_set_translation_domain (self->priv->builder, GETTEXT_PACKAGE);
656 gtk_builder_add_from_file (self->priv->builder, DATETIME_DIALOG_UI_FILE, &error);657 gtk_builder_add_from_file (self->priv->builder, DATETIME_DIALOG_UI_FILE, &error);
657 if (error != NULL) {658 if (error != NULL) {
658 /* We have to abort, we can't continue without the ui file */659 /* We have to abort, we can't continue without the ui file */
@@ -661,8 +662,6 @@
661 return;662 return;
662 }663 }
663664
664 gtk_builder_set_translation_domain (self->priv->builder, GETTEXT_PACKAGE);
665
666 GSettings * conf = g_settings_new (SETTINGS_INTERFACE);665 GSettings * conf = g_settings_new (SETTINGS_INTERFACE);
667666
668#define WIG(name) GTK_WIDGET (gtk_builder_get_object (self->priv->builder, name))667#define WIG(name) GTK_WIDGET (gtk_builder_get_object (self->priv->builder, name))

Subscribers

People subscribed via source and target branches