[gnome-screenshot] screenshot-dialog: Remove the cancel button and add X button instead

[Yosef Or Boczko <yoseforb src gnome org>]

commit d8fcafe7dae95c809e0354577625f8bed8185f64
Author: Yosef Or Boczko <yoseforb src gnome org>
Date:   Sun Feb 16 19:44:04 2014 +0200

    screenshot-dialog: Remove the cancel button and add X button instead
    
    https://bugzilla.gnome.org/show_bug.cgi?id=724471

 src/screenshot-dialog.c  |    2 --
 src/screenshot-dialog.ui |   14 +-------------
 2 files changed, 1 insertions(+), 15 deletions(-)
---
diff --git a/src/screenshot-dialog.c b/src/screenshot-dialog.c
index 31d127c..91ebc36 100644
--- a/src/screenshot-dialog.c
+++ b/src/screenshot-dialog.c
@@ -242,8 +242,6 @@ screenshot_dialog_new (GdkPixbuf              *screenshot,
   g_signal_connect (dialog->save_button, "clicked", G_CALLBACK (button_clicked), dialog);
   dialog->copy_button = GTK_WIDGET (gtk_builder_get_object (ui, "copy_button"));
   g_signal_connect (dialog->copy_button, "clicked", G_CALLBACK (button_clicked), dialog);
-  dialog->copy_button = GTK_WIDGET (gtk_builder_get_object (ui, "cancel_button"));
-  g_signal_connect_swapped (dialog->copy_button, "clicked", G_CALLBACK (gtk_widget_destroy), dialog->dialog);
 
   setup_drawing_area (dialog, ui);
 
diff --git a/src/screenshot-dialog.ui b/src/screenshot-dialog.ui
index 9f184b7..01461d7 100644
--- a/src/screenshot-dialog.ui
+++ b/src/screenshot-dialog.ui
@@ -11,18 +11,7 @@
       <object class="GtkHeaderBar" id="headerbar1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <child>
-          <object class="GtkButton" id="cancel_button">
-            <property name="label" translatable="yes">_Cancel</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_underline">True</property>
-          </object>
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
-        </child>
+        <property name="show_close_button">True</property>
         <child>
           <object class="GtkButton" id="copy_button">
             <property name="label" translatable="yes">C_opy to Clipboard</property>
@@ -162,7 +151,6 @@
   <object class="GtkSizeGroup" id="header_bar_size_group">
     <property name="mode">horizontal</property>
     <widgets>
-      <widget name="cancel_button"/>
       <widget name="copy_button"/>
       <widget name="save_button"/>
     </widgets>