fix segfault while cancel rename dialog

[geeqie.git] / src / ui_utildlg.c

diff --git a/src/ui_utildlg.c b/src/ui_utildlg.c
index 8b31771..c4bfaaf 100644 (file)
--- a/src/ui_utildlg.c
+++ b/src/ui_utildlg.c
@@ -1,7 +1,7 @@
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -49,7 +49,7 @@ static void generic_dialog_click_cb(GtkWidget *widget, gpointer data)
 {
        GenericDialog *gd = data;
        void (*func)(GenericDialog *, gpointer);
-       gint auto_close;
+       gboolean auto_close;
 
        func = g_object_get_data(G_OBJECT(widget), "dialog_function");
        auto_close = gd->auto_close;
@@ -58,14 +58,14 @@ static void generic_dialog_click_cb(GtkWidget *widget, gpointer data)
        if (auto_close) generic_dialog_close(gd);
 }
 
-static gint generic_dialog_default_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean generic_dialog_default_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
        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)
                {
-               gint auto_close;
+               gboolean auto_close;
 
                auto_close = gd->auto_close;
                gd->default_cb(gd, gd->data);
@@ -83,23 +83,23 @@ void generic_dialog_attach_default(GenericDialog *gd, GtkWidget *widget)
                         G_CALLBACK(generic_dialog_default_key_press_cb), gd);
 }
 
-static gint generic_dialog_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean generic_dialog_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
        GenericDialog *gd = data;
 
-       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 (gd->auto_close) generic_dialog_click_cb(widget, data);
                return TRUE;
                }
        return FALSE;
 }
 
-static gint generic_dialog_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
+static gboolean generic_dialog_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
 {
        GenericDialog *gd = data;
-       gint auto_close;
+       gboolean auto_close;
 
        auto_close = gd->auto_close;
 
@@ -121,11 +121,11 @@ static void generic_dialog_show_cb(GtkWidget *widget, gpointer data)
                                             G_CALLBACK(generic_dialog_show_cb), gd);
 }
 
-gint generic_dialog_get_alternative_button_order(GtkWidget *widget)
+gboolean generic_dialog_get_alternative_button_order(GtkWidget *widget)
 {
        GtkSettings *settings;
        GObjectClass *klass;
-       gint alternative_order = FALSE;
+       gboolean alternative_order = FALSE;
 
        settings = gtk_settings_get_for_screen(gtk_widget_get_screen(widget));
        klass = G_OBJECT_CLASS(GTK_SETTINGS_GET_CLASS(settings));
@@ -138,15 +138,15 @@ gint generic_dialog_get_alternative_button_order(GtkWidget *widget)
 }
 
 GtkWidget *generic_dialog_add_button(GenericDialog *gd, const gchar *stock_id, const gchar *text,
-                                    void (*func_cb)(GenericDialog *, gpointer), gint is_default)
+                                    void (*func_cb)(GenericDialog *, gpointer), gboolean is_default)
 {
        GtkWidget *button;
-       gint alternative_order;
+       gboolean alternative_order;
 
        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);
@@ -178,7 +178,7 @@ GtkWidget *generic_dialog_add_message(GenericDialog *gd, const gchar *icon_stock
        GtkWidget *vbox;
        GtkWidget *label;
 
-       hbox = pref_box_new(gd->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
+       hbox = pref_box_new(gd->vbox, TRUE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
        if (icon_stock_id)
                {
                GtkWidget *image;
@@ -208,8 +208,8 @@ GtkWidget *generic_dialog_add_message(GenericDialog *gd, const gchar *icon_stock
 
 static void generic_dialog_setup(GenericDialog *gd,
                                 const gchar *title,
-                                const gchar *wmclass, const gchar *wmsubclass,
-                                GtkWidget *parent, gint auto_close,
+                                const gchar *role,
+                                GtkWidget *parent, gboolean auto_close,
                                 void (*cancel_cb)(GenericDialog *, gpointer), gpointer data)
 {
        GtkWidget *vbox;
@@ -218,7 +218,7 @@ static void generic_dialog_setup(GenericDialog *gd,
        gd->data = data;
        gd->cancel_cb = cancel_cb;
 
-       gd->dialog = window_new(GTK_WINDOW_TOPLEVEL, wmsubclass, NULL, NULL, title);
+       gd->dialog = window_new(GTK_WINDOW_TOPLEVEL, role, NULL, NULL, title);
        gtk_window_set_type_hint(GTK_WINDOW(gd->dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
 
        if (parent)
@@ -234,7 +234,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);
@@ -281,14 +281,14 @@ static void generic_dialog_setup(GenericDialog *gd,
 }
 
 GenericDialog *generic_dialog_new(const gchar *title,
-                                 const gchar *wmclass, const gchar *wmsubclass,
-                                 GtkWidget *parent, gint auto_close,
+                                 const gchar *role,
+                                 GtkWidget *parent, gboolean auto_close,
                                  void (*cancel_cb)(GenericDialog *, gpointer), gpointer data)
 {
        GenericDialog *gd;
 
        gd = g_new0(GenericDialog, 1);
-       generic_dialog_setup(gd, title, wmclass, wmsubclass,
+       generic_dialog_setup(gd, title, role,
                             parent, auto_close, cancel_cb, data);
        return gd;
 }
@@ -308,7 +308,7 @@ GenericDialog *warning_dialog(const gchar *heading, const gchar *text,
 {
        GenericDialog *gd;
 
-       gd = generic_dialog_new(heading, GQ_WMCLASS, "warning", parent, TRUE, NULL, NULL);
+       gd = generic_dialog_new(heading, "warning", parent, TRUE, NULL, NULL);
        generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, warning_dialog_ok_cb, TRUE);
 
        generic_dialog_add_message(gd, icon_stock_id, heading, text);
@@ -334,7 +334,7 @@ void file_dialog_close(FileDialog *fdlg)
 }
 
 FileDialog *file_dialog_new(const gchar *title,
-                           const gchar *wmclass, const gchar *wmsubclass,
+                           const gchar *role,
                            GtkWidget *parent,
                            void (*cancel_cb)(FileDialog *, gpointer), gpointer data)
 {
@@ -343,17 +343,17 @@ FileDialog *file_dialog_new(const gchar *title,
        fdlg = g_new0(FileDialog, 1);
 
        generic_dialog_setup(GENERIC_DIALOG(fdlg), title,
-                            wmclass, wmsubclass, parent, FALSE,
-                            (void *)cancel_cb, data);
+                            role, parent, FALSE,
+                            (gpointer)cancel_cb, data);
 
        return fdlg;
 }
 
 GtkWidget *file_dialog_add_button(FileDialog *fdlg, const gchar *stock_id, const gchar *text,
-                                 void (*func_cb)(FileDialog *, gpointer), gint is_default)
+                                 void (*func_cb)(FileDialog *, gpointer), gboolean is_default)
 {
        return generic_dialog_add_button(GENERIC_DIALOG(fdlg), stock_id, text,
-                                        (void *)func_cb, is_default);
+                                        (gpointer)func_cb, is_default);
 }
 
 static void file_dialog_entry_cb(GtkWidget *widget, gpointer data)
@@ -386,7 +386,7 @@ void file_dialog_add_path_widgets(FileDialog *fdlg, const gchar *default_path, c
        generic_dialog_attach_default(GENERIC_DIALOG(fdlg), fdlg->entry);
        gtk_widget_show(tabcomp);
 
-       if (path && path[0] == '/')
+       if (path && path[0] == G_DIR_SEPARATOR)
                {
                fdlg->dest_path = g_strdup(path);
                }
@@ -401,7 +401,7 @@ void file_dialog_add_path_widgets(FileDialog *fdlg, const gchar *default_path, c
 
                if (path)
                        {
-                       fdlg->dest_path = concat_dir_and_file(base, path);
+                       fdlg->dest_path = g_build_filename(base, path, NULL);
                        }
                else
                        {
@@ -425,7 +425,7 @@ void file_dialog_add_path_widgets(FileDialog *fdlg, const gchar *default_path, c
                         G_CALLBACK(file_dialog_entry_cb), fdlg);
 }
 
-void file_dialog_add_filter(FileDialog *fdlg, const gchar *filter, const gchar *filter_desc, gint set)
+void file_dialog_add_filter(FileDialog *fdlg, const gchar *filter, const gchar *filter_desc, gboolean set)
 {
        if (!fdlg->entry) return;
        path_selection_add_filter(fdlg->entry, filter, filter_desc, set);
@@ -437,7 +437,7 @@ void file_dialog_clear_filter(FileDialog *fdlg)
        path_selection_clear_filter(fdlg->entry);
 }
 
-void file_dialog_sync_history(FileDialog *fdlg, gint dir_only)
+void file_dialog_sync_history(FileDialog *fdlg, gboolean dir_only)
 {
        if (!fdlg->dest_path) return;
 
@@ -453,3 +453,4 @@ void file_dialog_sync_history(FileDialog *fdlg, gint dir_only)
                g_free(buf);
                }
 }
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */