[gthumb: 6/24] copy_move_to_folder: changes to the copy/move complete popup

[Paolo Bacchilega <paobac src gnome org>]

commit 88e614b706da132c161a159ae5af497e64f4ad91
Author: Marlodavampire <vworker.com>
Date:   Fri Nov 12 04:36:56 2010 +1100

    copy_move_to_folder: changes to the copy/move complete popup

 extensions/copy_move_to_folder/data/ui/Makefile.am |    1 -
 .../data/ui/copy-move-to-folder-copy-complete.ui   |   22 ++----
 .../data/ui/copy-move-to-folder-move-complete.ui   |   80 --------------------
 extensions/copy_move_to_folder/dlg-copy-complete.c |    7 +-
 4 files changed, 11 insertions(+), 99 deletions(-)
---
diff --git a/extensions/copy_move_to_folder/data/ui/Makefile.am b/extensions/copy_move_to_folder/data/ui/Makefile.am
index 2e6f0ce..892481b 100644
--- a/extensions/copy_move_to_folder/data/ui/Makefile.am
+++ b/extensions/copy_move_to_folder/data/ui/Makefile.am
@@ -1,7 +1,6 @@
 uidir = $(pkgdatadir)/ui
 ui_DATA = 					\
 	copy-move-to-folder-copy-complete.ui	\
-	copy-move-to-folder-move-complete.ui	\
 	copy-move-to-folder-preferences.ui
 
 EXTRA_DIST = $(ui_DATA)
diff --git a/extensions/copy_move_to_folder/data/ui/copy-move-to-folder-copy-complete.ui b/extensions/copy_move_to_folder/data/ui/copy-move-to-folder-copy-complete.ui
index 04b91ff..b49d4c0 100644
--- a/extensions/copy_move_to_folder/data/ui/copy-move-to-folder-copy-complete.ui
+++ b/extensions/copy_move_to_folder/data/ui/copy-move-to-folder-copy-complete.ui
@@ -8,7 +8,7 @@
     <property name="modal">True</property>
     <property name="type_hint">normal</property>
     <property name="skip_taskbar_hint">True</property>
-    <property name="text" translatable="yes">File(s) successfully copied.</property>
+    <property name="text" translatable="yes">Go to destination folder?</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -30,13 +30,12 @@
             <property name="visible">True</property>
             <property name="layout_style">center</property>
             <child>
-              <object class="GtkButton" id="open_button">
-                <property name="label" translatable="yes">_Open in the Browser</property>
+              <object class="GtkButton" id="close_button">
+                <property name="label">gtk-no</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="image">icon_image</property>
-                <property name="use_underline">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -45,8 +44,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="close_button">
-                <property name="label">gtk-close</property>
+              <object class="GtkButton" id="open_button">
+                <property name="label">gtk-yes</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -68,13 +67,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="1">open_button</action-widget>
-      <action-widget response="-7">close_button</action-widget>
+      <action-widget response="0">close_button</action-widget>
+      <action-widget response="0">open_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkImage" id="icon_image">
-    <property name="visible">True</property>
-    <property name="yalign">0</property>
-    <property name="stock">gtk-jump-to</property>
-  </object>
 </interface>
diff --git a/extensions/copy_move_to_folder/dlg-copy-complete.c b/extensions/copy_move_to_folder/dlg-copy-complete.c
index 9593558..9312a53 100644
--- a/extensions/copy_move_to_folder/dlg-copy-complete.c
+++ b/extensions/copy_move_to_folder/dlg-copy-complete.c
@@ -87,10 +87,9 @@ dlg_copy_complete (GthBrowser *browser,
 		data->location = g_file_dup(location);
 		data->browser = browser;
 		g_object_ref(browser);
-		if(move)
-			data->builder = _gtk_builder_new_from_file ("copy-move-to-folder-move-complete.ui", "copy_move_to_folder_move_complete");
-		else
-			data->builder = _gtk_builder_new_from_file ("copy-move-to-folder-copy-complete.ui", "copy_move_to_folder_copy_complete");
+
+		data->builder = _gtk_builder_new_from_file ("copy-move-to-folder-copy-complete.ui", "copy_move_to_folder_copy_complete");
+
 		data->dialog = GET_WIDGET ("completed_messagedialog");
 
 		g_signal_connect (G_OBJECT (data->dialog),