synaptic

Merge lp:~kelemeng/synaptic/bug702181 into lp:~ubuntu-core-dev/synaptic/ubuntu

  1. bug702181
  2. Merge into ubuntu
Proposed by Gabor Kelemen
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 1740
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp:~kelemeng/synaptic/bug702181
Merge into: lp:~ubuntu-core-dev/synaptic/ubuntu
Diff against target: 52 lines (+5/-5)
2 files modified
gtk/rgfiltermanager.cc (+4/-4)
gtk/rgmainwindow.cc (+1/-1)
To merge this branch: bzr merge lp:~kelemeng/synaptic/bug702181
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Mathieu Trudel-Lapierre Needs Fixing
Review via email: mp+46110@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Nice work, but I think it's done against the wrong branch. You may want to re-apply this on lp:synaptic and file a new merge request.

review: Needs Fixing
Revision history for this message
Gabor Kelemen (kelemeng) wrote :

lp:synaptic is not migrated yet to Gtkbuilder[1], but the version packaged in Natty is. That version looks to be coming from this branch.

[1]: http://bazaar.launchpad.net/~synaptic-developers/synaptic/trunk/files/head:/gtk/glade/

Revision history for this message
Michael Vogt (mvo) wrote :

Thanks a lot Gabor! Now that debian has released I updated trunk to the current gtkbuilder work too and merged your fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk/rgfiltermanager.cc'
2--- gtk/rgfiltermanager.cc 2010-11-12 15:13:26 +0000
3+++ gtk/rgfiltermanager.cc 2011-01-13 09:35:19 +0000
4@@ -66,7 +66,7 @@
5 GTK_COMBO_BOX(_comboPatternWhat)));
6 for (int i = 0; DepOptions[i] != NULL; i++) {
7 gtk_list_store_append(comboStore, &comboIter);
8- gtk_list_store_set(comboStore, &comboIter, 0, DepOptions[i], -1);
9+ gtk_list_store_set(comboStore, &comboIter, 0, _(DepOptions[i]), -1);
10 }
11 crt = gtk_cell_renderer_text_new();
12 gtk_cell_layout_clear(GTK_CELL_LAYOUT(_comboPatternWhat));
13@@ -82,7 +82,7 @@
14 GTK_COMBO_BOX(_comboPatternDo)));
15 for (int i = 0; ActOptions[i] != NULL; i++) {
16 gtk_list_store_append(comboStore, &comboIter);
17- gtk_list_store_set(comboStore, &comboIter, 0, ActOptions[i], -1);
18+ gtk_list_store_set(comboStore, &comboIter, 0, _(ActOptions[i]), -1);
19 }
20 crt = gtk_cell_renderer_text_new();
21 gtk_cell_layout_clear(GTK_CELL_LAYOUT(_comboPatternDo));
22@@ -623,7 +623,7 @@
23 if (row < 0) {
24 gtk_list_store_append(GTK_LIST_STORE(_patternListStore), &iter);
25 gtk_list_store_set(GTK_LIST_STORE(_patternListStore), &iter,
26- 0, array[0], 1, _(array[1]), 2, array[2], -1);
27+ 0, _(array[0]), 1, _(array[1]), 2, array[2], -1);
28 GtkTreeSelection *select =
29 gtk_tree_view_get_selection(GTK_TREE_VIEW(_patternList));
30 gtk_tree_selection_select_iter(select, &iter);
31@@ -633,7 +633,7 @@
32 if (gtk_tree_model_get_iter(GTK_TREE_MODEL(_patternListStore),
33 &iter, path)) {
34 gtk_list_store_set(GTK_LIST_STORE(_patternListStore),
35- &iter, 0, array[0], 1, _(array[1]), 2,
36+ &iter, 0, _(array[0]), 1, _(array[1]), 2,
37 array[2], -1);
38 }
39 gtk_tree_path_free(path);
40
41=== modified file 'gtk/rgmainwindow.cc'
42--- gtk/rgmainwindow.cc 2010-12-07 09:40:39 +0000
43+++ gtk/rgmainwindow.cc 2011-01-13 09:35:19 +0000
44@@ -1551,7 +1551,7 @@
45 GtkTreeIter relIter;
46 for (int i = 0; relOptions[i] != NULL; i++) {
47 gtk_list_store_append(relTypes, &relIter);
48- gtk_list_store_set(relTypes, &relIter, 0, relOptions[i], -1);
49+ gtk_list_store_set(relTypes, &relIter, 0, _(relOptions[i]), -1);
50 }
51 gtk_combo_box_set_model(GTK_COMBO_BOX(comboDepends),
52 GTK_TREE_MODEL(relTypes));

Subscribers

People subscribed via source and target branches

to all changes: