Author: colossus
Date: 2008-10-21 06:38:32 +0000 (Tue, 21 Oct 2008)
New Revision: 28343
Modified:
xarchiver/trunk/src/archive.c
xarchiver/trunk/src/interface.c
xarchiver/trunk/src/interface.h
xarchiver/trunk/src/string_utils.c
xarchiver/trunk/src/window.c
Log:
Made the submenu option in "Thanks to" to open the browser to the contribute
page on the xarchiver web site.
Deleted redundant call to xa_watch_child() in xa_run_command().
Restored recurse option with zip archives.
Modified: xarchiver/trunk/src/archive.c
===================================================================
--- xarchiver/trunk/src/archive.c 2008-10-21 05:23:10 UTC (rev 28342)
+++ xarchiver/trunk/src/archive.c 2008-10-21 06:38:32 UTC (rev 28343)
@@ -388,7 +388,6 @@
}
_commands = _commands->next;
}
- xa_watch_child (archive->child_pid, status, archive);
if (xa_main_window)
xa_set_button_state
(1,1,1,1,archive->can_add,archive->can_extract,archive->has_sfx,archive->has_test,archive->has_properties,1,1);
Modified: xarchiver/trunk/src/interface.c
===================================================================
--- xarchiver/trunk/src/interface.c 2008-10-21 05:23:10 UTC (rev 28342)
+++ xarchiver/trunk/src/interface.c 2008-10-21 06:38:32 UTC (rev 28343)
@@ -551,6 +551,7 @@
g_signal_connect ((gpointer) multi_extract_menu,"activate",G_CALLBACK
(xa_show_multi_extract_dialog),NULL);
g_signal_connect ((gpointer) help1,"activate",G_CALLBACK
(xa_show_help),NULL);
g_signal_connect ((gpointer) about1,"activate",G_CALLBACK
(xa_about),NULL);
+ g_signal_connect ((gpointer) donators,"activate",G_CALLBACK
(xa_show_donate_page_on_the_web),NULL);
g_signal_connect ((gpointer) New_button, "clicked",G_CALLBACK
(xa_new_archive),NULL);
g_signal_connect ((gpointer) Open_button, "clicked",G_CALLBACK
(xa_open_archive),NULL);
@@ -831,6 +832,11 @@
return password;
}
+void xa_show_donate_page_on_the_web(GtkMenuItem *item,gpointer data)
+{
+ xa_activate_link
(NULL,"http://xarchiver.xfce.org/contribute.html",NULL);
+}
+
void xa_create_popup_menu()
{
GtkWidget *image6;
Modified: xarchiver/trunk/src/interface.h
===================================================================
--- xarchiver/trunk/src/interface.h 2008-10-21 05:23:10 UTC (rev 28342)
+++ xarchiver/trunk/src/interface.h 2008-10-21 06:38:32 UTC (rev 28343)
@@ -56,6 +56,7 @@
void set_label (GtkWidget *label,gchar *);
gboolean xa_flash_led_indicator (XArchive *);
gboolean xa_pulse_progress_bar_window (Progress_bar_data *);
+void xa_show_donate_page_on_the_web(GtkMenuItem *,gpointer );
void xa_create_popup_menu();
void xa_create_main_window (GtkWidget *,gboolean,gboolean,gboolean);
GtkWidget *xa_create_archive_properties_window();
Modified: xarchiver/trunk/src/string_utils.c
===================================================================
--- xarchiver/trunk/src/string_utils.c 2008-10-21 05:23:10 UTC (rev 28342)
+++ xarchiver/trunk/src/string_utils.c 2008-10-21 06:38:32 UTC (rev 28343)
@@ -339,7 +339,7 @@
continue;
fullname = g_strconcat (path,"/",dirlist->d_name,NULL);
is_dir = g_file_test(fullname,G_FILE_TEST_IS_DIR);
- if (type == XARCHIVETYPE_ARJ && ! is_dir)
+ if ( ! is_dir)
*list = g_slist_prepend(*list,fullname);
if (recurse && is_dir)
xa_recurse_local_directory(fullname,list,recurse,type);
Modified: xarchiver/trunk/src/window.c
===================================================================
--- xarchiver/trunk/src/window.c 2008-10-21 05:23:10 UTC (rev 28342)
+++ xarchiver/trunk/src/window.c 2008-10-21 06:38:32 UTC (rev 28343)
@@ -2674,6 +2674,7 @@
GList *row_list = NULL;
gboolean result = FALSE;
gboolean full_path = FALSE;
+ gboolean overwrite = FALSE;
gint current_index,idx;
gchar *dummy = NULL,*filename = NULL,*e_filename = NULL;
XEntry *entry;
@@ -2706,11 +2707,14 @@
g_free(archive[idx]->extraction_path);
}
archive[idx]->extraction_path = g_strdup(archive[idx]->tmp);
+ overwrite = archive[idx]->overwrite;
full_path = archive[idx]->full_path;
archive[idx]->full_path = FALSE;
+ archive[idx]->overwrite = TRUE;
result = (*archive[idx]->extract) (archive[idx],list);
archive[idx]->full_path = full_path;
+ archive[idx]->overwrite = overwrite;
g_free(archive[idx]->extraction_path);
archive[idx]->extraction_path = NULL;
if (dummy)
@@ -2736,6 +2740,7 @@
gchar *dummy = NULL,*item,*file = NULL,*e_filename = NULL;
GSList *names = NULL;
gboolean result = FALSE;
+ gboolean overwrite = FALSE;
if (! gtk_tree_model_get_iter (GTK_TREE_MODEL
(archive->liststore),&iter,path))
return;
@@ -2762,7 +2767,10 @@
archive->extraction_path = g_strdup(archive->tmp);
item = xa_build_full_path_name_from_entry(entry,0);
names = g_slist_append(names,item);
+ overwrite = archive->overwrite;
+ archive->overwrite = TRUE;
result = (*archive->extract) (archive,names);
+ archive->overwrite = overwrite;
g_free(archive->extraction_path);
archive->extraction_path = NULL;
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
