Commit: 6b607d21b5d0579bacf5a1f530822c027e7af32b - gimageview (git)

GImageView is a GTK+ based image viewer which supports tabbed browsing, thumbnail table views, directory tree views and drag and drop. It also support movies using the Xine library and MPlayer, and supports images in compressed archive formats.

Commit MetaInfo

• Revision: 6b607d21b5d0579bacf5a1f530822c027e7af32b (tree)
• Zeit: 2009-01-07 18:08:59
• Autor: makeinu <makeinu@aeae...>
• Commiter: makeinu

Log Message

Fix a bug that the cancel button on the file selection dialog is removed when an user press it.

git-svn-id: https://gtkmmviewer.svn.sourceforge.net/svnroot/gtkmmviewer/gimageview/trunk@1199 aeae0eed-423c-0410-9251-95fb8af3d19f

Ändern Zusammenfassung

• modified: ChangeLog
• modified: src/fileload.c

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-01-07 Takuro Ashie <[e-mail]>
 
+	* src/fileload.c: Fix a bug that the cancel button on the file selection
+	dialog is removed when an user press it.
+
[phone] Takuro Ashie <[e-mail]>
+
 	* src/gimv_image_win.c, src/gimv_thumb_win.c: Use GTK's stock items
 	for toolbar buttons.
 

--- a/src/fileload.c
+++ b/src/fileload.c
@@ -949,13 +949,13 @@ cb_filebrowser_close (GtkWidget *widget, gpointer parent)
 }
 
 
-/*
- *  create_filebrowser:
- *     @ File open dialog (extend Gtk+'s original file open dialog widget)
- *
- *  parent : Pointer to parent window.
- *  Return : Pointer to new filebrowser.
- */
+static void
+cb_cancel_button_clicked(GtkWidget *widget, gpointer data)
+{
+   gtk_widget_destroy(GTK_WIDGET(data));
+}
+
+
 GtkWidget *
 create_filebrowser (gpointer parent)
 {
@@ -989,7 +989,7 @@ create_filebrowser (gpointer parent)
       G_CALLBACK(cb_filebrowser_ok_sel),
       filesel);
    g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filebrowser)->cancel_button),
-                    "clicked", G_CALLBACK(gtk_widget_destroy),
+                    "clicked", G_CALLBACK(cb_cancel_button_clicked),
                     filebrowser);
 
    bbox = gtk_hbutton_box_new();