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

[Gabor Kelemen]

[Mathieu Trudel-Lapierre (cyphermox)]

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

[Gabor Kelemen (kelemeng)]

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/

[Michael Vogt (mvo)]

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

review: Approve

=== modified file 'gtk/rgfiltermanager.cc'
--- gtk/rgfiltermanager.cc	2010-11-12 15:13:26 +0000
+++ gtk/rgfiltermanager.cc	2011-01-13 09:35:19 +0000
@@ -66,7 +66,7 @@
                       GTK_COMBO_BOX(_comboPatternWhat)));
    for (int i = 0; DepOptions[i] != NULL; i++) {
       gtk_list_store_append(comboStore, &comboIter);
-      gtk_list_store_set(comboStore, &comboIter, 0, DepOptions[i], -1);
+      gtk_list_store_set(comboStore, &comboIter, 0, _(DepOptions[i]), -1);
    }
    crt = gtk_cell_renderer_text_new();
    gtk_cell_layout_clear(GTK_CELL_LAYOUT(_comboPatternWhat));
@@ -82,7 +82,7 @@
                       GTK_COMBO_BOX(_comboPatternDo)));
    for (int i = 0; ActOptions[i] != NULL; i++) {
       gtk_list_store_append(comboStore, &comboIter);
-      gtk_list_store_set(comboStore, &comboIter, 0, ActOptions[i], -1);
+      gtk_list_store_set(comboStore, &comboIter, 0, _(ActOptions[i]), -1);
    }
    crt = gtk_cell_renderer_text_new();
    gtk_cell_layout_clear(GTK_CELL_LAYOUT(_comboPatternDo));
@@ -623,7 +623,7 @@
    if (row < 0) {
       gtk_list_store_append(GTK_LIST_STORE(_patternListStore), &iter);
       gtk_list_store_set(GTK_LIST_STORE(_patternListStore), &iter,
-                         0, array[0], 1, _(array[1]), 2, array[2], -1);
+                         0, _(array[0]), 1, _(array[1]), 2, array[2], -1);
       GtkTreeSelection *select =
          gtk_tree_view_get_selection(GTK_TREE_VIEW(_patternList));
       gtk_tree_selection_select_iter(select, &iter);
@@ -633,7 +633,7 @@
       if (gtk_tree_model_get_iter(GTK_TREE_MODEL(_patternListStore),
                                   &iter, path)) {
          gtk_list_store_set(GTK_LIST_STORE(_patternListStore),
-                            &iter, 0, array[0], 1, _(array[1]), 2, 
+                            &iter, 0, _(array[0]), 1, _(array[1]), 2, 
 			    array[2], -1);
       }
       gtk_tree_path_free(path);
 
=== modified file 'gtk/rgmainwindow.cc'
--- gtk/rgmainwindow.cc	2010-12-07 09:40:39 +0000
+++ gtk/rgmainwindow.cc	2011-01-13 09:35:19 +0000
@@ -1551,7 +1551,7 @@
    GtkTreeIter relIter;
    for (int i = 0; relOptions[i] != NULL; i++) {
       gtk_list_store_append(relTypes, &relIter);
-      gtk_list_store_set(relTypes, &relIter, 0, relOptions[i], -1);
+      gtk_list_store_set(relTypes, &relIter, 0, _(relOptions[i]), -1);
    }
    gtk_combo_box_set_model(GTK_COMBO_BOX(comboDepends),
                            GTK_TREE_MODEL(relTypes));