Merge lp:~didrocks/unity/unity-preferences into lp:unity

Proposed by Didier Roche-Tolomelli
Status: Merged
Merged at revision: 1130
Proposed branch: lp:~didrocks/unity/unity-preferences
Merge into: lp:unity
Diff against target: 19 lines (+2/-0)
1 file modified
tools/unity-preferences.c (+2/-0)
To merge this branch: bzr merge lp:~didrocks/unity/unity-preferences
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Review via email: mp+57469@code.launchpad.net

Description of the change

* use gi18n-lib.h to make unity-preferences load translation (LP: #759682)
* don't resize/maximize such a small window

To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

 review approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/unity-preferences.c'
2--- tools/unity-preferences.c 2011-04-09 16:21:33 +0000
3+++ tools/unity-preferences.c 2011-04-13 11:43:25 +0000
4@@ -34,6 +34,7 @@
5 GtkWidget *label, *align, *vbox;
6 GtkWidget *edgeradio, *radio;
7
8+ textdomain (GETTEXT_PACKAGE);
9 bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
10 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
11
12@@ -46,6 +47,7 @@
13 window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
14 gtk_container_set_border_width (GTK_CONTAINER (window), 12);
15 gtk_window_set_title (GTK_WINDOW (window), _("Launcher & Menus"));
16+ gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
17 g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL);
18
19 main_box = gtk_vbox_new (FALSE, 0);