From a51ba606493956946e7ca25b595c84bce69c2994 Mon Sep 17 00:00:00 2001
From: Oz N Tiram <oz.tiram@gmail.com>
Date: Sun, 19 Jun 2016 13:28:08 +0200
Subject: Remove usage of GtkAlignment with GTK+3

---
 mate-screenshot/data/mate-screenshot-gtk3.ui | 2 +-
 mate-screenshot/src/mate-screenshot.c        | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mate-screenshot/data/mate-screenshot-gtk3.ui b/mate-screenshot/data/mate-screenshot-gtk3.ui
index 7d149221..baaedcc0 100644
--- a/mate-screenshot/data/mate-screenshot-gtk3.ui
+++ b/mate-screenshot/data/mate-screenshot-gtk3.ui
@@ -6,7 +6,7 @@
   <object class="GtkDialog" id="toplevel">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Save Screenshot new-glade</property>
+    <property name="title" translatable="yes">Save Screenshot</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <signal name="key-press-event" handler="on_toplevel_key_press_event" swapped="no"/>
diff --git a/mate-screenshot/src/mate-screenshot.c b/mate-screenshot/src/mate-screenshot.c
index 0a114a5d..2006c821 100644
--- a/mate-screenshot/src/mate-screenshot.c
+++ b/mate-screenshot/src/mate-screenshot.c
@@ -352,10 +352,12 @@ create_effects_frame (GtkWidget   *outer_vbox,
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
+#if !GTK_CHECK_VERSION (3, 0, 0)
   align = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
   gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 12, 0);
   gtk_box_pack_start (GTK_BOX (hbox), align, FALSE, FALSE, 0);
   gtk_widget_show (align);
+#endif
 
 #if GTK_CHECK_VERSION (3, 0, 0)
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
@@ -457,10 +459,13 @@ create_screenshot_frame (GtkWidget   *outer_vbox,
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
+#if !GTK_CHECK_VERSION (3, 0, 0)
   align = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
   gtk_widget_set_size_request (align, 48, -1);
   gtk_box_pack_start (GTK_BOX (hbox), align, FALSE, FALSE, 0);
   gtk_widget_show (align);
+#endif
+
 #if GTK_CHECK_VERSION (3, 0, 0)
   image = gtk_image_new_from_icon_name (SCREENSHOOTER_ICON,
                                     GTK_ICON_SIZE_DIALOG);
@@ -590,13 +595,11 @@ create_interactive_dialog (void)
 
   create_screenshot_frame (main_vbox, _("Take Screenshot"));
   create_effects_frame (main_vbox, _("Effects"));
-
   gtk_dialog_add_buttons (GTK_DIALOG (retval),
                           GTK_STOCK_HELP, GTK_RESPONSE_HELP,
                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                           _("Take _Screenshot"), GTK_RESPONSE_OK,
                           NULL);
-
   gtk_dialog_set_default_response (GTK_DIALOG (retval), GTK_RESPONSE_OK);
 
   /* we need to block on "response" and keep showing the interactive
-- 
cgit v1.2.1