[gnome-utils] screenshot: remove help button and place copy botton at left

[Cosimo Cecchi <cosimoc src gnome org>]

commit dbcf9b278b421538451e0ea9af6a33aa740c1a34
Author: William Jon McCann <jmccann redhat com>
Date:   Wed Feb 9 13:10:38 2011 -0500

    screenshot: remove help button and place copy botton at left

 gnome-screenshot/gnome-screenshot.ui |   19 ++++++-------------
 gnome-screenshot/screenshot-dialog.c |   15 ---------------
 2 files changed, 6 insertions(+), 28 deletions(-)
---
diff --git a/gnome-screenshot/gnome-screenshot.ui b/gnome-screenshot/gnome-screenshot.ui
index 42aca77..6fdd3fe 100644
--- a/gnome-screenshot/gnome-screenshot.ui
+++ b/gnome-screenshot/gnome-screenshot.ui
@@ -14,7 +14,6 @@
     <property name="skip_pager_hint">False</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <signal handler="on_toplevel_key_press_event" last_modification_time="Thu, 21 Oct 2004 13:29:25 GMT" name="key_press_event"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -25,17 +24,6 @@
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <object class="GtkButton" id="help_button">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-help</property>
-                <property name="use_stock">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
-              </object>
-            </child>
-            <child>
               <object class="GtkButton" id="copy_button">
                 <property name="visible">True</property>
                 <property name="can_default">True</property>
@@ -46,6 +34,12 @@
                 <property name="focus_on_click">True</property>
                 <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+                <property name="secondary">True</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="cancel_button">
@@ -244,7 +238,6 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-11">help_button</action-widget>
       <action-widget response="-6">cancel_button</action-widget>
       <action-widget response="-5">ok_button</action-widget>
       <action-widget response="1">copy_button</action-widget>
diff --git a/gnome-screenshot/screenshot-dialog.c b/gnome-screenshot/screenshot-dialog.c
index cf52b6d..d64ab79 100644
--- a/gnome-screenshot/screenshot-dialog.c
+++ b/gnome-screenshot/screenshot-dialog.c
@@ -23,7 +23,6 @@
 
 #include "screenshot-dialog.h"
 #include "screenshot-save.h"
-#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
@@ -51,19 +50,6 @@ struct ScreenshotDialog
   gint drag_y;
 };
 
-static gboolean
-on_toplevel_key_press_event (GtkWidget *widget,
-			     GdkEventKey *key)
-{
-  if (key->keyval == GDK_KEY_F1)
-    {
-      gtk_dialog_response (GTK_DIALOG (widget), GTK_RESPONSE_HELP);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
 static void
 on_preview_draw (GtkWidget      *drawing_area,
                  cairo_t        *cr,
@@ -260,7 +246,6 @@ screenshot_dialog_new (GdkPixbuf *screenshot,
 			gdk_pixbuf_get_width (screenshot)/
 			(gfloat) gdk_pixbuf_get_height (screenshot),
 			FALSE);
-  g_signal_connect (toplevel, "key_press_event", G_CALLBACK (on_toplevel_key_press_event), dialog);
   g_signal_connect (preview_darea, "draw", G_CALLBACK (on_preview_draw), dialog);
   g_signal_connect (preview_darea, "button_press_event", G_CALLBACK (on_preview_button_press_event), dialog);
   g_signal_connect (preview_darea, "button_release_event", G_CALLBACK (on_preview_button_release_event), dialog);