[Xfce4-commits] r24003 - xarchiver/branches/xarchiver-psybsd/src

[Peter de Ridder]

Author: peter
Date: 2006-11-28 18:44:17 +0000 (Tue, 28 Nov 2006)
New Revision: 24003

Modified:
   xarchiver/branches/xarchiver-psybsd/src/archive_store.c
   xarchiver/branches/xarchiver-psybsd/src/main_window.c
   xarchiver/branches/xarchiver-psybsd/src/notebook.c
Log:
filename sort fix
notebookl show_icons fix



Modified: xarchiver/branches/xarchiver-psybsd/src/archive_store.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/archive_store.c     2006-11-28 
18:41:19 UTC (rev 24002)
+++ xarchiver/branches/xarchiver-psybsd/src/archive_store.c     2006-11-28 
18:44:17 UTC (rev 24003)
@@ -960,8 +960,9 @@
        guint prev_size = store->list_size;
        LXAArchive *archive = store->archive;
 
+       if(!store->navigation.present)
+               return;
 #ifdef DEBUG
-       g_return_if_fail(store->navigation.present);
        g_return_if_fail(store->navigation.present->data);
 #endif
 

Modified: xarchiver/branches/xarchiver-psybsd/src/main_window.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/main_window.c       2006-11-28 
18:41:19 UTC (rev 24002)
+++ xarchiver/branches/xarchiver-psybsd/src/main_window.c       2006-11-28 
18:44:17 UTC (rev 24003)
@@ -87,6 +87,8 @@
 
 static void cb_xa_main_close_window(GtkWidget *widget, gpointer userdata);
 
+static void cb_xa_main_preferences(GtkWidget *widget, gpointer userdata);
+
 static void
 cb_xa_main_window_notebook_page_switched(XANotebook *, GtkNotebookPage *, 
guint, gpointer);
 static void
@@ -312,6 +314,13 @@
                        gtk_widget_show(iter->data);
                }
 #endif
+
+               window->menubar.menu_item_settings = 
gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, window->accel_group);
+
+               g_signal_connect(G_OBJECT(window->menubar.menu_item_settings), 
"activate", G_CALLBACK(cb_xa_main_preferences), window);
+
+               gtk_container_add(GTK_CONTAINER(window->menubar.menu_view), 
window->menubar.menu_item_settings);
+
                gtk_widget_show_all(window->menubar.menu_view);
 
                gtk_menu_bar_append(GTK_MENU_BAR(window->menu_bar), 
window->menubar.menu_item_file);
@@ -715,6 +724,14 @@
 }
 
 static void
+cb_xa_main_preferences(GtkWidget *widget, gpointer userdata)
+{
+       GtkWidget *dialog = xa_preferences_dialog_new();
+
+       gtk_widget_show_all(dialog);
+}
+
+static void
 cb_xa_main_window_notebook_page_switched(XANotebook *notebook, GtkNotebookPage 
*page, guint page_nr, gpointer data)
 {
        LXAArchive *lp_archive;

Modified: xarchiver/branches/xarchiver-psybsd/src/notebook.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/notebook.c  2006-11-28 18:41:19 UTC 
(rev 24002)
+++ xarchiver/branches/xarchiver-psybsd/src/notebook.c  2006-11-28 18:44:17 UTC 
(rev 24003)
@@ -356,7 +356,6 @@
 {
        GtkCellRenderer *renderer = NULL;
        GtkTreeViewColumn *column = NULL;
-       GtkTreeModel *archive_store = gtk_tree_view_get_model(treeview);
        gint x = 0;
 
        GValue *value = g_new0(GValue, 1);
@@ -375,20 +374,17 @@
 
        column = gtk_tree_view_column_new();
 
-       if(XA_ARCHIVE_STORE(archive_store)->props._show_icons)
-       {
-               renderer = gtk_cell_renderer_pixbuf_new();
-               g_object_set_property(G_OBJECT(renderer), "stock-size", value);
-               gtk_tree_view_column_pack_start(column, renderer, FALSE);
-               gtk_tree_view_column_set_attributes(column, renderer, 
"icon-name", 0, NULL);
-       }
+       renderer = gtk_cell_renderer_pixbuf_new();
+       g_object_set_property(G_OBJECT(renderer), "stock-size", value);
+       gtk_tree_view_column_pack_start(column, renderer, FALSE);
+       gtk_tree_view_column_set_attributes(column, renderer, "icon-name", 0, 
NULL);
 
        renderer = gtk_cell_renderer_text_new();
        gtk_tree_view_column_pack_start(column, renderer, TRUE);
        gtk_tree_view_column_set_attributes(column, renderer, "text", 
LXA_ARCHIVE_PROP_FILENAME + 1, NULL);
 
        gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-       gtk_tree_view_column_set_sort_column_id(column, 
LXA_ARCHIVE_PROP_FILENAME);
+       gtk_tree_view_column_set_sort_column_id(column, 
LXA_ARCHIVE_PROP_FILENAME + 1);
        gtk_tree_view_column_set_title(column, 
lxa_archive_get_property_name(archive, LXA_ARCHIVE_PROP_FILENAME));
        gtk_tree_view_append_column(treeview, column);
 

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