Author: colossus
Date: 2008-11-08 20:44:53 +0000 (Sat, 08 Nov 2008)
New Revision: 28674

Modified:
   xarchiver/trunk/src/pref_dialog.c
   xarchiver/trunk/src/rar.c
Log:
Fixed reset of the temp directory to use back to /tmp. Thanks to Frank 
Caraballo for notifying it.


Modified: xarchiver/trunk/src/pref_dialog.c
===================================================================
--- xarchiver/trunk/src/pref_dialog.c   2008-11-08 20:26:34 UTC (rev 28673)
+++ xarchiver/trunk/src/pref_dialog.c   2008-11-08 20:44:53 UTC (rev 28674)
@@ -467,16 +467,15 @@
                                gtk_combo_box_set_active 
(GTK_COMBO_BOX(prefs_data->combo_prefered_viewer),0);
                                g_free(value);
                        }
-                       value = 
g_key_file_get_string(xa_key_file,PACKAGE,"preferred_temp_dir",NULL);
-                       if (value != NULL)
-                       {
-                               gtk_combo_box_remove_text(GTK_COMBO_BOX 
(prefs_data->combo_prefered_temp_dir),0);
-                               gtk_combo_box_insert_text 
(GTK_COMBO_BOX(prefs_data->combo_prefered_temp_dir),0,value);
-                               gtk_combo_box_set_active 
(GTK_COMBO_BOX(prefs_data->combo_prefered_temp_dir),0);
-                               g_free(value);
-                       }
                }
-               gtk_combo_box_set_active 
(GTK_COMBO_BOX(prefs_data->combo_prefered_temp_dir),0);
+               value = 
g_key_file_get_string(xa_key_file,PACKAGE,"preferred_temp_dir",NULL);
+               if (value != NULL)
+               {
+                       gtk_combo_box_remove_text(GTK_COMBO_BOX 
(prefs_data->combo_prefered_temp_dir),0);
+                       gtk_combo_box_insert_text 
(GTK_COMBO_BOX(prefs_data->combo_prefered_temp_dir),0,value);
+                       gtk_combo_box_set_active 
(GTK_COMBO_BOX(prefs_data->combo_prefered_temp_dir),0);
+                       g_free(value);
+               }
                coords = g_key_file_get_integer_list(xa_key_file, PACKAGE, 
"mainwindow", &coords_len, &error);
                if (error)
                {

Modified: xarchiver/trunk/src/rar.c
===================================================================
--- xarchiver/trunk/src/rar.c   2008-11-08 20:26:34 UTC (rev 28673)
+++ xarchiver/trunk/src/rar.c   2008-11-08 20:44:53 UTC (rev 28674)
@@ -273,8 +273,8 @@
                command = g_strconcat ( "rar a ",
                                                                        
archive->update ? "-u " : "",
                                                                        
archive->freshen ? "-f " : "",
-                                                                       
archive->solid_archive ? "-s " : "",
-                                                                       
archive->remove_files ? "-df " : "",
+                                                                       
archive->solid_archive ? "-s " : " ",
+                                                                       
archive->remove_files ? "-df " : " ",
                                                                        "-idp ",
                                                                        
"-m",compression_string," ",
                                                                        
archive->escaped_path,

_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to