Fix #314: Remote commands for thumbnail maintenance

[geeqie.git] / src / ui_utildlg.c

diff --git a/src/ui_utildlg.c b/src/ui_utildlg.c
index 6016fab..9548a8a 100644 (file)
--- a/src/ui_utildlg.c
+++ b/src/ui_utildlg.c
@@ -1,13 +1,22 @@
 /*
- * (SLIK) SimpLIstic sKin functions
- * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2010 The Geeqie Team
+ * Copyright (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
  *
  * Author: John Ellis
  *
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -62,7 +71,7 @@ static gboolean generic_dialog_default_key_press_cb(GtkWidget *widget, GdkEventK
 {
        GenericDialog *gd = data;
 
-       if (event->keyval == GDK_Return && GTK_WIDGET_HAS_FOCUS(widget)
+       if (event->keyval == GDK_KEY_Return && gtk_widget_has_focus(widget)
            && gd->default_cb)
                {
                gboolean auto_close;
@@ -86,11 +95,12 @@ void generic_dialog_attach_default(GenericDialog *gd, GtkWidget *widget)
 static gboolean generic_dialog_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
        GenericDialog *gd = data;
+       gboolean auto_close = gd->auto_close;
 
-       if (event->keyval == GDK_Escape)
+       if (event->keyval == GDK_KEY_Escape)
                {
                if (gd->cancel_cb) gd->cancel_cb(gd, gd->data);
-               if (gd->auto_close) generic_dialog_click_cb(widget, data);
+               else if (auto_close) generic_dialog_click_cb(widget, data);
                return TRUE;
                }
        return FALSE;
@@ -146,7 +156,7 @@ GtkWidget *generic_dialog_add_button(GenericDialog *gd, const gchar *stock_id, c
        button = pref_button_new(NULL, stock_id, text, FALSE,
                                 G_CALLBACK(generic_dialog_click_cb), gd);
 
-       GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+       gtk_widget_set_can_default(button, TRUE);
        g_object_set_data(G_OBJECT(button), "dialog_function", func_cb);
 
        gtk_container_add(GTK_CONTAINER(gd->hbox), button);
@@ -234,7 +244,7 @@ static void generic_dialog_setup(GenericDialog *gd,
                        GtkWidget *top;
 
                        top = gtk_widget_get_toplevel(parent);
-                       if (GTK_IS_WINDOW(top) && GTK_WIDGET_TOPLEVEL(top)) window = GTK_WINDOW(top);
+                       if (GTK_IS_WINDOW(top) && gtk_widget_is_toplevel(top)) window = GTK_WINDOW(top);
                        }
 
                if (window) gtk_window_set_transient_for(GTK_WINDOW(gd->dialog), window);