Author: colossus
Date: 2008-05-31 20:04:33 +0000 (Sat, 31 May 2008)
New Revision: 27000

Modified:
   xarchiver/trunk/src/archive.c
   xarchiver/trunk/src/gzip.c
   xarchiver/trunk/src/window.c
Log:
Patched some weird behaviour in the code.


Modified: xarchiver/trunk/src/archive.c
===================================================================
--- xarchiver/trunk/src/archive.c       2008-05-31 14:35:42 UTC (rev 26999)
+++ xarchiver/trunk/src/archive.c       2008-05-31 20:04:33 UTC (rev 27000)
@@ -312,7 +312,7 @@
                        ps = waitpid (archive->child_pid, &status, WNOHANG);
                        if (ps < 0)
                                break;
-                       else
+                       else if(MainWindow) //avoid if we are on console
                                gtk_main_iteration_do (FALSE);
                }
                result = xa_check_child_for_error_on_exit(archive,status);
@@ -503,7 +503,7 @@
                        g_free(archive->location_entry_path);
                        archive->location_entry_path = NULL;
                }
-               //gtk_widget_set_sensitive(back_button,FALSE);
+               gtk_widget_set_sensitive(back_button,FALSE);
                gtk_widget_set_sensitive(up_button,FALSE);
                gtk_widget_set_sensitive(home_button,FALSE);
        }

Modified: xarchiver/trunk/src/gzip.c
===================================================================
--- xarchiver/trunk/src/gzip.c  2008-05-31 14:35:42 UTC (rev 26999)
+++ xarchiver/trunk/src/gzip.c  2008-05-31 20:04:33 UTC (rev 27000)
@@ -93,7 +93,7 @@
        XEntry *entry;
        gchar *filename;
        gchar *basename;
-       gpointer item[2];
+       gpointer item[3];
        gint n = 0, a = 0 ,linesize = 0;
 
        linesize = strlen(line);

Modified: xarchiver/trunk/src/window.c
===================================================================
--- xarchiver/trunk/src/window.c        2008-05-31 14:35:42 UTC (rev 26999)
+++ xarchiver/trunk/src/window.c        2008-05-31 20:04:33 UTC (rev 27000)
@@ -2063,6 +2063,11 @@
        current_page = gtk_notebook_get_current_page (notebook);
        idx = xa_find_archive_index (current_page);
 
+       //Avoid segfault if there's no file opened
+       if(idx<0)
+               return;
+
+
        if (strlen(gtk_entry_get_text(GTK_ENTRY(location_entry))) == 0)
        {
                xa_update_window_with_archive_entries(archive[idx],new_entry);

_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to