[Xfce4-commits] r25922 - xarchiver/trunk/src
Giuseppe Torelli
colossus at xfce.org
Tue Jul 17 08:29:36 CEST 2007
Author: colossus
Date: 2007-07-17 06:29:36 +0000 (Tue, 17 Jul 2007)
New Revision: 25922
Modified:
xarchiver/trunk/src/archive.c
xarchiver/trunk/src/archive.h
xarchiver/trunk/src/pref_dialog.c
xarchiver/trunk/src/pref_dialog.h
xarchiver/trunk/src/window.c
xarchiver/trunk/src/window.h
Log:
Fixed wrong behaviour in the archive navigation code. Still to be fixed overwrite in the
hash table of unique dirs.
Beautified the preferences dialog.
Added a further option to the prefs dialog in the Advanced tab.
Modified: xarchiver/trunk/src/archive.c
===================================================================
--- xarchiver/trunk/src/archive.c 2007-07-16 21:25:51 UTC (rev 25921)
+++ xarchiver/trunk/src/archive.c 2007-07-17 06:29:36 UTC (rev 25922)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Giuseppe Torelli <colossus73 at gmail.com>
+ * Copyright (c) 2007 Giuseppe Torelli <colossus73 at gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -74,7 +74,7 @@
}
ioc = g_io_channel_unix_new ( archive->output_fd );
- g_io_channel_set_encoding (ioc, locale , NULL);
+ g_io_channel_set_encoding (ioc, NULL , NULL);
g_io_channel_set_flags ( ioc , G_IO_FLAG_NONBLOCK , NULL );
if ( archive->parse_output )
@@ -299,7 +299,7 @@
if (strchr(filename,'/') != NULL)
{
- path_items = g_strsplit_set(filename,"/",-1);
+ path_items = g_strsplit_set(filename,"/\n",-1);
home_entry = g_hash_table_lookup(filename_paths_buffer,path_items[0]);
if (home_entry == NULL)
{
@@ -312,6 +312,7 @@
last_entry = home_entry;
while (path_items[x])
{
+ //Let's avoid to insert empty rows
if (strlen (path_items[x]) == 0)
goto here;
child_entry = g_hash_table_lookup(filename_paths_buffer,path_items[x]);
@@ -319,8 +320,11 @@
{
child_entry = xa_alloc_memory_for_each_row (archive->nc,archive->column_types);
child_entry->filename = g_strdup(path_items[x]);
+ g_print ("Inserisco: %s da %s\n",path_items[x],path_items[x-1]);
child_entry->columns = xa_fill_archive_entry_columns_for_each_row(archive,child_entry,items);
- g_hash_table_insert (filename_paths_buffer,child_entry->filename,child_entry);
+ //Do not insert files in the hash table
+ if (path_items[x+1] != NULL)
+ g_hash_table_insert (filename_paths_buffer,child_entry->filename,child_entry);
child_entry->next = last_entry->child;
last_entry->child = child_entry;
@@ -391,7 +395,11 @@
entry = s->data;
current_column = entry->columns;
gtk_list_store_append (archive->liststore, &iter);
- gtk_list_store_set (archive->liststore,&iter,0,GTK_STOCK_DIRECTORY,1,entry->filename,-1);
+ //TODO: free the char in g_convert and also at line 445
+ if(!g_utf8_validate(entry->filename, -1, NULL) )
+ gtk_list_store_set (archive->liststore,&iter,0,GTK_STOCK_DIRECTORY,1,g_convert(entry->filename, -1, "UTF-8", "WINDOWS-1252", NULL, NULL, NULL),-1);
+ else
+ gtk_list_store_set (archive->liststore,&iter,0,GTK_STOCK_DIRECTORY,1,entry->filename,-1);
for (i = 0; i < archive->nc; i++)
{
@@ -437,7 +445,10 @@
{
current_column = entry->columns;
gtk_list_store_append (archive->liststore, &iter);
- gtk_list_store_set (archive->liststore,&iter,0,GTK_STOCK_DIRECTORY,1,entry->filename,-1);
+ if(!g_utf8_validate(entry->filename, -1, NULL))
+ gtk_list_store_set (archive->liststore,&iter,0,GTK_STOCK_DIRECTORY,1,g_convert(entry->filename, -1, "UTF-8", "WINDOWS-1252", NULL, NULL, NULL),-1);
+ else
+ gtk_list_store_set (archive->liststore,&iter,0,GTK_STOCK_DIRECTORY,1,entry->filename,-1);
for (i = 0; i < archive->nc; i++)
{
Modified: xarchiver/trunk/src/archive.h
===================================================================
--- xarchiver/trunk/src/archive.h 2007-07-16 21:25:51 UTC (rev 25921)
+++ xarchiver/trunk/src/archive.h 2007-07-17 06:29:36 UTC (rev 25922)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Giuseppe Torelli <colossus73 at gmail.com>
+ * Copyright (c) 2007 Giuseppe Torelli <colossus73 at gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: xarchiver/trunk/src/pref_dialog.c
===================================================================
--- xarchiver/trunk/src/pref_dialog.c 2007-07-16 21:25:51 UTC (rev 25921)
+++ xarchiver/trunk/src/pref_dialog.c 2007-07-17 06:29:36 UTC (rev 25922)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006 Giuseppe Torelli - <colossus73 at gmail.com>
+ * Copyright (C) 2007 Giuseppe Torelli - <colossus73 at gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
{
GtkWidget *vbox1, *vbox2, *vbox3, *vbox4,*hbox1, *scrolledwindow1, *prefs_iconview, *label5;
GtkWidget *label1, *label2, *label3, *label4, *frame1, *frame2, *frame3, *alignment1, *alignment2, *alignment3;
- GtkWidget *hbox3, *hbox4, *label6, *label7, *hbox5;
+ GtkWidget *hbox3, *hbox4, *label6, *label7, *hbox5, *label8, *hbox6;
GtkTreeIter iter;
GList *archive_type;
GdkPixbuf *icon_pixbuf;
@@ -42,76 +42,65 @@
gtk_dialog_set_default_response (GTK_DIALOG (prefs_data->dialog1), GTK_RESPONSE_OK);
vbox1 = GTK_DIALOG (prefs_data->dialog1)->vbox;
- gtk_widget_show (vbox1);
+ hbox1 = gtk_hbox_new (FALSE, 6);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 6);
- hbox1 = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 2);
-
scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
- gtk_box_pack_start (GTK_BOX (hbox1), scrolledwindow1, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox1), scrolledwindow1, TRUE, TRUE, 6);
g_object_set (G_OBJECT (scrolledwindow1),"hscrollbar-policy", GTK_POLICY_NEVER,"shadow-type", GTK_SHADOW_IN,"vscrollbar-policy", GTK_POLICY_NEVER, NULL);
- gtk_widget_show (scrolledwindow1);
-
- prefs_data->prefs_liststore = gtk_list_store_new ( 2, GDK_TYPE_PIXBUF, G_TYPE_UINT);
- prefs_iconview = gtk_icon_view_new_with_model(GTK_TREE_MODEL(prefs_data->prefs_liststore));
- g_object_unref (prefs_data->prefs_liststore);
-
- gtk_widget_set_size_request(prefs_iconview, 80, 140);
- gtk_icon_view_set_orientation (GTK_ICON_VIEW (prefs_iconview), GTK_ORIENTATION_VERTICAL);
- gtk_icon_view_set_columns (GTK_ICON_VIEW (prefs_iconview),1);
- gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (prefs_iconview), 0);
- gtk_container_add (GTK_CONTAINER (scrolledwindow1), prefs_iconview);
-
+
+ prefs_data->prefs_liststore = gtk_list_store_new ( 3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_UINT);
gtk_list_store_append (prefs_data->prefs_liststore, &iter);
icon_pixbuf = gdk_pixbuf_new_from_file ("./pixmaps/xarchiver-behaviour.svg", NULL);
- gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf, 1,0,-1);
+ gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf, 1, _("Behaviour"),2,0,-1);
g_object_unref (icon_pixbuf);
gtk_list_store_append (prefs_data->prefs_liststore, &iter);
- icon_pixbuf = gtk_widget_render_icon (prefs_iconview, "gtk-find", GTK_ICON_SIZE_DND, NULL);
- gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf, 1,1,-1);
+ icon_pixbuf = gtk_widget_render_icon (prefs_data->dialog1, "gtk-find", GTK_ICON_SIZE_DND, NULL);
+ gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf, 1, _("View"),2,1,-1);
g_object_unref (icon_pixbuf);
gtk_list_store_append (prefs_data->prefs_liststore, &iter);
- icon_pixbuf = gtk_widget_render_icon (prefs_iconview, "gtk-execute", GTK_ICON_SIZE_DND, NULL);
- gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf, 1,2,-1);
- gtk_tooltips_set_tip(tooltips, icon_pixbuf, _("View"), NULL);
+ icon_pixbuf = gtk_widget_render_icon (prefs_data->dialog1, "gtk-execute", GTK_ICON_SIZE_DND, NULL);
+ gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf, 1, _("Advanced"),2,2,-1);
g_object_unref (icon_pixbuf);
- gtk_widget_show (prefs_iconview);
+ prefs_iconview = gtk_icon_view_new_with_model(GTK_TREE_MODEL(prefs_data->prefs_liststore));
+ g_object_unref (prefs_data->prefs_liststore);
+
+ gtk_widget_set_size_request(prefs_iconview, 140, 190);
+ gtk_icon_view_set_orientation (GTK_ICON_VIEW (prefs_iconview), GTK_ORIENTATION_VERTICAL);
+ gtk_icon_view_set_item_width (GTK_ICON_VIEW (prefs_iconview),130);
+ gtk_icon_view_set_columns (GTK_ICON_VIEW (prefs_iconview),1);
+ gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (prefs_iconview), 0);
+ gtk_icon_view_set_text_column(GTK_ICON_VIEW (prefs_iconview), 1);
+ gtk_container_add (GTK_CONTAINER (scrolledwindow1), prefs_iconview);
+
prefs_data->prefs_notebook = gtk_notebook_new ();
g_object_set (G_OBJECT (prefs_data->prefs_notebook),"show-border", FALSE,"show-tabs", FALSE,"enable-popup",FALSE,NULL);
- gtk_widget_show (prefs_data->prefs_notebook);
gtk_box_pack_start (GTK_BOX (hbox1), prefs_data->prefs_notebook, TRUE, TRUE, 0);
GTK_WIDGET_UNSET_FLAGS (prefs_data->prefs_notebook, GTK_CAN_FOCUS);
g_signal_connect (G_OBJECT (prefs_iconview), "selection-changed",G_CALLBACK (xa_prefs_iconview_changed), prefs_data);
/* Behaviour page*/
frame1 = gtk_frame_new (NULL);
- gtk_widget_show (frame1);
gtk_container_add (GTK_CONTAINER (prefs_data->prefs_notebook), frame1);
gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_NONE);
alignment1 = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_widget_show (alignment1);
gtk_container_add (GTK_CONTAINER (frame1), alignment1);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment1), 0, 0, 12, 0);
vbox4 = gtk_vbox_new (FALSE, 2);
- gtk_widget_show (vbox4);
gtk_container_add (GTK_CONTAINER (alignment1), vbox4);
hbox1 = gtk_hbox_new (FALSE, 5);
- gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox4), hbox1, FALSE, TRUE, 0);
label4 = gtk_label_new (_("Preferred format for new archives:"));
- gtk_widget_show (label4);
gtk_box_pack_start (GTK_BOX (hbox1), label4, FALSE, FALSE, 0);
prefs_data->combo_box1 = gtk_combo_box_new_text();
- gtk_widget_show (prefs_data->combo_box1);
gtk_box_pack_start (GTK_BOX (hbox1), prefs_data->combo_box1, FALSE, TRUE, 0);
archive_type = g_list_first ( ArchiveType );
while ( archive_type != NULL )
@@ -125,132 +114,115 @@
}
prefs_data->check_save_add_dialog = gtk_check_button_new_with_mnemonic (_("Save settings for add dialog"));
- gtk_widget_show (prefs_data->check_save_add_dialog);
gtk_box_pack_start (GTK_BOX (vbox4), prefs_data->check_save_add_dialog, FALSE, FALSE, 0);
gtk_button_set_focus_on_click (GTK_BUTTON (prefs_data->check_save_add_dialog), FALSE);
prefs_data->check_save_extract_dialog = gtk_check_button_new_with_mnemonic (_("Save settings for extract dialog"));
- gtk_widget_show (prefs_data->check_save_extract_dialog);
gtk_box_pack_start (GTK_BOX (vbox4), prefs_data->check_save_extract_dialog, FALSE, FALSE, 0);
gtk_button_set_focus_on_click (GTK_BUTTON (prefs_data->check_save_extract_dialog), FALSE);
prefs_data->allow_dir_extract_with_dnd = gtk_check_button_new_with_mnemonic (_("Allow extracting directories by drag and drop"));
- gtk_widget_show (prefs_data->allow_dir_extract_with_dnd);
gtk_box_pack_start (GTK_BOX (vbox4), prefs_data->allow_dir_extract_with_dnd, FALSE, FALSE, 0);
gtk_button_set_focus_on_click (GTK_BUTTON (prefs_data->allow_dir_extract_with_dnd), FALSE);
prefs_data->confirm_deletion = gtk_check_button_new_with_mnemonic (_("Confirm deletion of files inside the archive"));
- gtk_widget_show (prefs_data->confirm_deletion);
gtk_box_pack_start (GTK_BOX (vbox4), prefs_data->confirm_deletion, FALSE, FALSE, 0);
gtk_button_set_focus_on_click (GTK_BUTTON (prefs_data->confirm_deletion), FALSE);
label1 = gtk_label_new ("");
- gtk_widget_show (label1);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (prefs_data->prefs_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (prefs_data->prefs_notebook), 0), label1);
/* View page*/
frame2 = gtk_frame_new (NULL);
- gtk_widget_show (frame2);
gtk_container_add (GTK_CONTAINER (prefs_data->prefs_notebook), frame2);
gtk_frame_set_shadow_type (GTK_FRAME (frame2), GTK_SHADOW_NONE);
alignment2 = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_widget_show (alignment2);
gtk_container_add (GTK_CONTAINER (frame2), alignment2);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment2), 0, 0, 12, 0);
vbox2 = gtk_vbox_new (FALSE, 2);
- gtk_widget_show (vbox2);
gtk_container_add (GTK_CONTAINER (alignment2), vbox2);
hbox3 = gtk_hbox_new (FALSE, 5);
- gtk_widget_show (hbox3);
gtk_box_pack_start (GTK_BOX (vbox2), hbox3, FALSE, TRUE, 0);
label5 = gtk_label_new (_("View archive content as"));
- gtk_widget_show (label5);
gtk_box_pack_start (GTK_BOX (hbox3), label5, FALSE, FALSE, 0);
prefs_data->combo_box2 = gtk_combo_box_new_text();
- gtk_widget_show (prefs_data->combo_box2);
gtk_box_pack_start (GTK_BOX (hbox3), prefs_data->combo_box2, FALSE, TRUE, 0);
gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_box2), _("list") );
gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_box2), _("icon") );
prefs_data->check_show_comment = gtk_check_button_new_with_mnemonic (_("Show archive comment after loading it"));
- gtk_widget_show (prefs_data->check_show_comment);
gtk_box_pack_start (GTK_BOX (vbox2), prefs_data->check_show_comment, FALSE, FALSE, 0);
gtk_button_set_focus_on_click (GTK_BUTTON (prefs_data->check_show_comment), FALSE);
prefs_data->check_show_iso_info = gtk_check_button_new_with_mnemonic (_("Show ISO info after loading the image"));
- gtk_widget_show (prefs_data->check_show_iso_info);
gtk_box_pack_start (GTK_BOX (vbox2), prefs_data->check_show_iso_info, FALSE, FALSE, 0);
gtk_button_set_focus_on_click (GTK_BUTTON (prefs_data->check_show_iso_info), FALSE);
prefs_data->check_sort_filename_column = gtk_check_button_new_with_mnemonic (_("Sort content by filename"));
- gtk_widget_show (prefs_data->check_sort_filename_column);
gtk_box_pack_start (GTK_BOX (vbox2), prefs_data->check_sort_filename_column, FALSE, FALSE, 0);
gtk_button_set_focus_on_click (GTK_BUTTON (prefs_data->check_sort_filename_column), FALSE);
gtk_tooltips_set_tip(tooltips, prefs_data->check_sort_filename_column, _("The filename column is sort after loading the archive"), NULL);
prefs_data->show_location_bar = gtk_check_button_new_with_mnemonic (_("Show location bar"));
- gtk_widget_show (prefs_data->show_location_bar);
gtk_box_pack_start (GTK_BOX (vbox2), prefs_data->show_location_bar, FALSE, FALSE, 0);
gtk_button_set_focus_on_click (GTK_BUTTON (prefs_data->show_location_bar), FALSE);
label2 = gtk_label_new ("");
- gtk_widget_show (label2);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (prefs_data->prefs_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (prefs_data->prefs_notebook), 1), label2);
/* Advanced page*/
frame3 = gtk_frame_new (NULL);
- gtk_widget_show (frame3);
gtk_container_add (GTK_CONTAINER (prefs_data->prefs_notebook), frame3);
gtk_frame_set_shadow_type (GTK_FRAME (frame3), GTK_SHADOW_NONE);
alignment3 = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_widget_show (alignment3);
gtk_container_add (GTK_CONTAINER (frame3), alignment3);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment3), 0, 0, 12, 0);
vbox3 = gtk_vbox_new (FALSE, 2);
- gtk_widget_show (vbox3);
gtk_container_add (GTK_CONTAINER (alignment3), vbox3);
hbox4 = gtk_hbox_new (FALSE, 5);
- gtk_widget_show (hbox4);
gtk_box_pack_start (GTK_BOX (vbox3), hbox4, FALSE, TRUE, 0);
label6 = gtk_label_new (_("Preferred web browser:"));
- gtk_widget_show (label6);
gtk_box_pack_start (GTK_BOX (hbox4), label6, FALSE, FALSE, 0);
prefs_data->combo_box3 = gtk_combo_box_new_text();
- gtk_widget_show (prefs_data->combo_box3);
gtk_box_pack_start (GTK_BOX (hbox4), prefs_data->combo_box3, FALSE, TRUE, 0);
gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_box3), _("xfce default") );
gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_box3), _("konqueror") );
hbox5 = gtk_hbox_new (FALSE, 5);
- gtk_widget_show (hbox5);
gtk_box_pack_start (GTK_BOX (vbox3), hbox5, FALSE, TRUE, 0);
label7 = gtk_label_new (_("Preferred view application:"));
- gtk_widget_show (label7);
gtk_box_pack_start (GTK_BOX (hbox5), label7, FALSE, FALSE, 0);
prefs_data->combo_box4 = gtk_combo_box_new_text();
- gtk_widget_show (prefs_data->combo_box4);
gtk_box_pack_start (GTK_BOX (hbox5), prefs_data->combo_box4, FALSE, TRUE, 0);
gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_box4), _("choose...") );
+
+ hbox6 = gtk_hbox_new (FALSE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox3), hbox6, FALSE, TRUE, 0);
+ label8 = gtk_label_new (_("Preferred temp directory:"));
+ gtk_box_pack_start (GTK_BOX (hbox6), label8, FALSE, FALSE, 0);
+
+ prefs_data->combo_box5 = gtk_combo_box_new_text();
+ gtk_box_pack_start (GTK_BOX (hbox6), prefs_data->combo_box5, FALSE, TRUE, 0);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_box5), _("choose...") );
+
prefs_data->check_save_geometry = gtk_check_button_new_with_mnemonic (_("Save window geometry on exit"));
- gtk_widget_show (prefs_data->check_save_geometry);
gtk_box_pack_start (GTK_BOX (vbox3), prefs_data->check_save_geometry, FALSE, FALSE, 0);
gtk_button_set_focus_on_click (GTK_BUTTON (prefs_data->check_save_geometry), FALSE);
label3 = gtk_label_new ("");
- gtk_widget_show (label3);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (prefs_data->prefs_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (prefs_data->prefs_notebook), 2), label3);
return prefs_data;
}
@@ -271,7 +243,7 @@
path = (GtkTreePath*)list->data;
gtk_tree_model_get_iter ( GTK_TREE_MODEL(prefs->prefs_liststore), &iter, path );
- gtk_tree_model_get ( GTK_TREE_MODEL(prefs->prefs_liststore), &iter, 1, &column, -1);
+ gtk_tree_model_get ( GTK_TREE_MODEL(prefs->prefs_liststore), &iter, 2, &column, -1);
gtk_tree_path_free( (GtkTreePath*)list->data );
g_list_free (list);
Modified: xarchiver/trunk/src/pref_dialog.h
===================================================================
--- xarchiver/trunk/src/pref_dialog.h 2007-07-16 21:25:51 UTC (rev 25921)
+++ xarchiver/trunk/src/pref_dialog.h 2007-07-17 06:29:36 UTC (rev 25922)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006 Giuseppe Torelli - <colossus73 at gmail.com>
+ * Copyright (C) 2007 Giuseppe Torelli - <colossus73 at gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
GtkWidget *combo_box1, *check_save_add_dialog, *check_save_extract_dialog;
GtkWidget *allow_dir_extract_with_dnd, *confirm_deletion, *combo_box2;
GtkWidget *check_show_comment, *check_sort_filename_column, *check_show_iso_info,*show_location_bar;
- GtkWidget *combo_box3, *combo_box4, *check_save_geometry,*prefs_notebook;
+ GtkWidget *combo_box3, *combo_box4, *combo_box5, *check_save_geometry,*prefs_notebook;
GtkListStore *prefs_liststore;
GtkTooltips *tooltips;
} Prefs_dialog_data;
Modified: xarchiver/trunk/src/window.c
===================================================================
--- xarchiver/trunk/src/window.c 2007-07-16 21:25:51 UTC (rev 25921)
+++ xarchiver/trunk/src/window.c 2007-07-17 06:29:36 UTC (rev 25922)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006 Giuseppe Torelli - <colossus73 at gmail.com>
+ * Copyright (C) 2007 Giuseppe Torelli - <colossus73 at gmail.com>
* Copyright (C) 2006 Benedikt Meurer - <benny at xfce.org>
*
* This program is free software; you can redistribute it and/or modify
@@ -667,6 +667,7 @@
prefs_window = xa_create_prefs_dialog();
gtk_window_set_destroy_with_parent (GTK_WINDOW (prefs_window->dialog1) , TRUE);
}
+ gtk_widget_show_all(prefs_window->dialog1);
gtk_dialog_run ( GTK_DIALOG(prefs_window->dialog1) );
gtk_widget_hide (prefs_window->dialog1);
}
Modified: xarchiver/trunk/src/window.h
===================================================================
--- xarchiver/trunk/src/window.h 2007-07-16 21:25:51 UTC (rev 25921)
+++ xarchiver/trunk/src/window.h 2007-07-17 06:29:36 UTC (rev 25922)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005 Giuseppe Torelli - <colossus73 at gmail.com>
+ * Copyright (C) 2007 Giuseppe Torelli - <colossus73 at gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
More information about the Xfce4-commits
mailing list