Author: colossus Date: 2008-11-20 07:10:41 +0000 (Thu, 20 Nov 2008) New Revision: 28867
Modified: xarchiver/trunk/doc/Makefile.am xarchiver/trunk/src/open-with-dlg.c xarchiver/trunk/src/window.c xarchiver/trunk/src/window.h Log: Fixed bug #4626. Fixed prototype function for delete-event handler. Modified: xarchiver/trunk/doc/Makefile.am =================================================================== --- xarchiver/trunk/doc/Makefile.am 2008-11-20 00:16:56 UTC (rev 28866) +++ xarchiver/trunk/doc/Makefile.am 2008-11-20 07:10:41 UTC (rev 28867) @@ -39,7 +39,7 @@ pdf: jw -b pdf xarchiver.docbook - mv xarchiver.pdf geany-$(VERSION).pdf + mv xarchiver.pdf xarchiver-$(VERSION).pdf htmldoc: xarchiver.docbook xmlto -m xarchiver.xsl -o html/ xhtml xarchiver.docbook; \ Modified: xarchiver/trunk/src/open-with-dlg.c =================================================================== --- xarchiver/trunk/src/open-with-dlg.c 2008-11-20 00:16:56 UTC (rev 28866) +++ xarchiver/trunk/src/open-with-dlg.c 2008-11-20 07:10:41 UTC (rev 28867) @@ -175,7 +175,7 @@ GSList *app_exe = NULL; GtkTreeIter iter; - filename = g_strconcat(dirname,"applications",NULL); + filename = g_build_path ("/",dirname,"applications",NULL); dir = opendir(filename); if (dir == NULL) Modified: xarchiver/trunk/src/window.c =================================================================== --- xarchiver/trunk/src/window.c 2008-11-20 00:16:56 UTC (rev 28866) +++ xarchiver/trunk/src/window.c 2008-11-20 07:10:41 UTC (rev 28867) @@ -624,7 +624,7 @@ archive[idx] = NULL; } -void xa_quit_application (GtkMenuItem *menuitem,gpointer user_data) +gboolean xa_quit_application (GtkWidget *widget, GdkEvent *event, gpointer data) { gint i; gint idx; @@ -632,7 +632,7 @@ i = gtk_notebook_get_current_page (notebook); idx = xa_find_archive_index (i); if (idx > -1 && archive[idx]->child_pid) - return; + return TRUE; g_list_free ( Suffix); g_list_free ( Name); @@ -671,6 +671,7 @@ socket_finalize(); #endif gtk_main_quit(); + return FALSE; } void xa_delete_archive (GtkMenuItem *menuitem,gpointer user_data) Modified: xarchiver/trunk/src/window.h =================================================================== --- xarchiver/trunk/src/window.h 2008-11-20 00:16:56 UTC (rev 28866) +++ xarchiver/trunk/src/window.h 2008-11-20 07:10:41 UTC (rev 28867) @@ -76,7 +76,7 @@ void xa_list_archive (GtkMenuItem *, gpointer); void xa_print_entry_in_file(XEntry *,gint,unsigned long long int, FILE *,int); void xa_close_archive (GtkMenuItem *, gpointer); -void xa_quit_application (GtkMenuItem *, gpointer); +gboolean xa_quit_application (GtkWidget *, GdkEvent *, gpointer); void xa_delete_archive (GtkMenuItem *, gpointer); void xa_determine_program_to_run(gchar *); void xa_show_help (GtkMenuItem *, gpointer); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits