diff -u gnome-translate-0.99/debian/changelog gnome-translate-0.99/debian/changelog --- gnome-translate-0.99/debian/changelog +++ gnome-translate-0.99/debian/changelog @@ -1,3 +1,11 @@ +gnome-translate (0.99-0ubuntu3) intrepid; urgency=low + + * Apply the Patch from Thomas Jenkins + fix the Restore Bug + lp:#247347 + + -- Martin Kaufmann Mon, 08 Sep 2008 05:06:17 +0200 + gnome-translate (0.99-0ubuntu2) hardy; urgency=low * recompile for hardy (LP: #193769) only in patch2: unchanged: --- gnome-translate-0.99.orig/src/gt-util.c +++ gnome-translate-0.99/src/gt-util.c @@ -53,8 +53,7 @@ GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, primary, - secondary, - NULL); + secondary); if (blocking) { only in patch2: unchanged: --- gnome-translate-0.99.orig/src/gt-language-view.c +++ gnome-translate-0.99/src/gt-language-view.c @@ -109,13 +109,14 @@ gt_language_view_set_conf_selected_tag(source_view, from); g_free(from); + to = gt_language_view_get_conf_selected_tag(dest_view); + gtk_tree_view_set_model(dest_view, (GtkTreeModel *) dest_store); if (dest_store) g_object_unref(dest_store); gtk_tree_view_set_search_column(dest_view, COLUMN_NAME); - to = gt_language_view_get_conf_selected_tag(dest_view); gt_language_view_select(dest_view, to); g_free(to); } @@ -220,12 +221,13 @@ gt_g_object_slist_free(pairs); g_hash_table_destroy(dest_stores); + selected_tag = gt_language_view_get_conf_selected_tag(view); + gtk_tree_view_set_model(view, GTK_TREE_MODEL(source_store)); g_object_unref(source_store); gtk_tree_view_set_search_column(view, COLUMN_NAME); - selected_tag = gt_language_view_get_conf_selected_tag(view); gt_language_view_select(view, selected_tag); g_free(selected_tag); } only in patch2: unchanged: --- gnome-translate-0.99.orig/src/gt-app.c +++ gnome-translate-0.99/src/gt-app.c @@ -1168,8 +1168,7 @@ GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, _("Overwrite file?"), - secondary, - NULL); + secondary); g_free(secondary); gtk_dialog_set_default_response(GTK_DIALOG(confirmation_dialog), GTK_RESPONSE_NO); /* safe default */