[Xfce4-commits] r23399 - in xarchiver/branches/xarchiver-psybsd: libxarchiver src

[Stephan Arts]

Author: stephan
Date: 2006-10-13 12:39:28 +0000 (Fri, 13 Oct 2006)
New Revision: 23399

Removed:
   xarchiver/branches/xarchiver-psybsd/src/archive_tree_store.c
   xarchiver/branches/xarchiver-psybsd/src/archive_tree_store.h
Modified:
   xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-zip.c
   xarchiver/branches/xarchiver-psybsd/src/Makefile.am
   xarchiver/branches/xarchiver-psybsd/src/archive_store.c
   xarchiver/branches/xarchiver-psybsd/src/main_window.c
   xarchiver/branches/xarchiver-psybsd/src/settings.c
Log:
Removed compiler warnings



Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-zip.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-zip.c	2006-10-13 12:20:28 UTC (rev 23398)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-zip.c	2006-10-13 12:39:28 UTC (rev 23399)
@@ -357,6 +357,7 @@
 		lxa_execute(command, archive, NULL, NULL, lxa_archive_support_zip_refresh_parse_output, NULL);
 		g_free(command);
 	}
+	return 0;
 }
 
 gboolean

Modified: xarchiver/branches/xarchiver-psybsd/src/Makefile.am
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/Makefile.am	2006-10-13 12:20:28 UTC (rev 23398)
+++ xarchiver/branches/xarchiver-psybsd/src/Makefile.am	2006-10-13 12:39:28 UTC (rev 23399)
@@ -7,7 +7,6 @@
 	tool_bar.c tool_bar.h \
 	settings.c settings.h \
 	archive_store.c archive_store.h \
-	archive_tree_store.c archive_tree_store.h \
 	preferences_dialog.c preferences_dialog.h \
 	new_dialog.c new_dialog.h \
 	add_dialog.c add_dialog.h \

Modified: xarchiver/branches/xarchiver-psybsd/src/archive_store.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/archive_store.c	2006-10-13 12:20:28 UTC (rev 23398)
+++ xarchiver/branches/xarchiver-psybsd/src/archive_store.c	2006-10-13 12:39:28 UTC (rev 23399)
@@ -454,7 +454,6 @@
 	LXAEntry *entry = ((LXAEntry *)iter->user_data);
 	gpointer props_iter = entry->props;
 	gint i = 0;
-	const gchar *icon_name = NULL;
 
 	if(column == -2)
 	{
@@ -747,8 +746,7 @@
 
 	column -= 2;
 
-	if(column < -1)
-		return;
+	g_return_val_if_fail(column > -2, 0);
 
 	if(column == -1)
 		switch(store->props._sort_case_sensitive)
@@ -802,6 +800,8 @@
 		case G_TYPE_UINT:
 			return (*((guint*)props_a)) - (*((guint*)props_b));
 	}
+
+	g_return_val_if_reached(0);
 }
 
 static void
@@ -897,8 +897,6 @@
 xa_archive_store_new(LXAArchive *archive, gboolean show_icons, gboolean show_up_dir, GtkIconTheme *icon_theme)
 {
 	XAArchiveStore *tree_model;
-	GType *column_types;
-	gint x;
 
 	tree_model = g_object_new(XA_TYPE_ARCHIVE_STORE, NULL);
 

Deleted: xarchiver/branches/xarchiver-psybsd/src/archive_tree_store.c

Deleted: xarchiver/branches/xarchiver-psybsd/src/archive_tree_store.h

Modified: xarchiver/branches/xarchiver-psybsd/src/main_window.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/main_window.c	2006-10-13 12:20:28 UTC (rev 23398)
+++ xarchiver/branches/xarchiver-psybsd/src/main_window.c	2006-10-13 12:39:28 UTC (rev 23399)
@@ -29,7 +29,6 @@
 #include <gettext.h>
 
 #include "archive_store.h"
-#include "archive_tree_store.h"
 #include "navigation_bar.h"
 #include "tool_bar.h"
 #include "main_window.h"
@@ -52,8 +51,7 @@
 xa_main_window_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void
 xa_main_window_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void
-cb_xa_main_window_style_set(XAMainWindow *window, gpointer userdata);
+
 gboolean
 xa_main_window_add_item(LXAEntry *entry, gpointer data);
 void 
@@ -490,7 +488,6 @@
 void
 cb_xa_main_add_to_archive(GtkWidget *widget, gpointer userdata)
 {
-	XAMainWindow *window = XA_MAIN_WINDOW(userdata);
 }
 
 void
@@ -698,7 +695,6 @@
 {
 	GtkCellRenderer *renderer = NULL;
 	GtkTreeViewColumn *column = NULL;
-	GtkTreeModel *liststore = window->treemodel;
 	LXAArchive *archive = window->lp_xa_archive;
 	gint x = 0;
 
@@ -753,11 +749,8 @@
 void
 xa_main_window_set_contents(XAMainWindow *main_window, LXAArchive *archive)
 {
-	guint i = 0;
 	GtkTreeModel *liststore = main_window->treemodel;
 	g_object_ref(liststore);
-	GtkTreeIter iter;
-	GValue *tmp_value;
 
 	gtk_tree_view_set_model(GTK_TREE_VIEW(main_window->treeview), NULL);
 

Modified: xarchiver/branches/xarchiver-psybsd/src/settings.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/settings.c	2006-10-13 12:20:28 UTC (rev 23398)
+++ xarchiver/branches/xarchiver-psybsd/src/settings.c	2006-10-13 12:39:28 UTC (rev 23399)
@@ -78,5 +78,6 @@
 gboolean
 xa_settings_load(XASettings *settings)
 {
-	
+//	gint fd = g_open(settings->config_file, O_RDONLY, 0);
+	return FALSE;
 }