[Xfce4-commits] r24136 - in squeeze/trunk: . libsqueeze src
Stephan Arts
stephan at xfce.org
Tue Dec 19 13:34:39 CET 2006
Author: stephan
Date: 2006-12-19 12:34:39 +0000 (Tue, 19 Dec 2006)
New Revision: 24136
Modified:
squeeze/trunk/configure.in.in
squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
squeeze/trunk/libsqueeze/archive.c
squeeze/trunk/src/main.c
squeeze/trunk/src/main_window.c
squeeze/trunk/src/notebook.c
squeeze/trunk/src/notebook.h
Log:
Fixed stuff (still doesn't really work)
Modified: squeeze/trunk/configure.in.in
===================================================================
--- squeeze/trunk/configure.in.in 2006-12-19 12:18:10 UTC (rev 24135)
+++ squeeze/trunk/configure.in.in 2006-12-19 12:34:39 UTC (rev 24136)
@@ -119,7 +119,6 @@
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.4.0])
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.4.0])
XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.4.0])
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.4.0])
XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.4.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99])
Modified: squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-gnu-tar.c 2006-12-19 12:18:10 UTC (rev 24135)
+++ squeeze/trunk/libsqueeze/archive-support-gnu-tar.c 2006-12-19 12:34:39 UTC (rev 24136)
@@ -273,8 +273,8 @@
if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tar"))
command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name,
" -cf ", archive->path,
- " --mode=", LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_add_mode,
- " ", archive->files, NULL);
+ " --mode='", LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_add_mode,
+ "' ", archive->files, NULL);
if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tarz"))
command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name,
" -Zcf ", archive->path,
Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c 2006-12-19 12:18:10 UTC (rev 24135)
+++ squeeze/trunk/libsqueeze/archive.c 2006-12-19 12:34:39 UTC (rev 24136)
@@ -41,18 +41,6 @@
#define LSQ_MIME_DIRECTORY "inode/directory"
#endif
-#ifdef LSQ_THREADSAFE
-#define LSQ_ARCHIVE_READ_LOCK(lock) g_static_rw_lock_reader_lock(lock)
-#define LSQ_ARCHIVE_READ_UNLOCK(lock) g_static_rw_lock_reader_unlock(lock)
-#define LSQ_ARCHIVE_WRITE_LOCK(lock) g_static_rw_lock_writer_lock(lock)
-#define LSQ_ARCHIVE_WRITE_UNLOCK(lock) g_static_rw_lock_writer_unlock(lock)
-#else
-#define LSQ_ARCHIVE_READ_LOCK(lock)
-#define LSQ_ARCHIVE_READ_UNLOCK(lock)
-#define LSQ_ARCHIVE_WRITE_LOCK(lock)
-#define LSQ_ARCHIVE_WRITE_UNLOCK(lock)
-#endif
-
struct _LSQEntry
{
gchar *filename;
@@ -252,7 +240,6 @@
void
lsq_archive_set_status(LSQArchive *archive, LSQArchiveStatus status)
{
- LSQ_ARCHIVE_WRITE_LOCK(&archive->rw_lock);
gchar **path = NULL;
gchar *_path = NULL;
@@ -262,20 +249,19 @@
{
archive->old_status = archive->status;
archive->status = status;
- g_signal_emit(G_OBJECT(archive), lsq_archive_signals[0], 0, archive);
+ g_signal_emit(G_OBJECT(archive), lsq_archive_signals[0], 0, NULL);
if((archive->old_status == LSQ_ARCHIVESTATUS_REFRESH) && (archive->status == LSQ_ARCHIVESTATUS_IDLE))
- g_signal_emit(G_OBJECT(archive), lsq_archive_signals[1], 0, archive);
+ g_signal_emit(G_OBJECT(archive), lsq_archive_signals[1], 0, NULL);
if((archive->old_status == LSQ_ARCHIVESTATUS_REMOVE) && (archive->files))
{
path = g_strsplit(archive->files, " ", 2);
_path = g_path_get_dirname(path[0]);
- g_signal_emit(G_OBJECT(archive), lsq_archive_signals[2], 0, archive, _path);
+ g_signal_emit(G_OBJECT(archive), lsq_archive_signals[2], 0, archive, _path, NULL);
g_strfreev(path);
g_free(_path);
}
}
}
- LSQ_ARCHIVE_WRITE_UNLOCK(&archive->rw_lock);
}
gint
@@ -292,7 +278,6 @@
LSQArchiveIter *
lsq_archive_add_file(LSQArchive *archive, const gchar *path)
{
- LSQ_ARCHIVE_WRITE_LOCK(&archive->rw_lock);
guint i = 0;
gchar **path_items = g_strsplit_set(path, "/\n", -1);
LSQArchiveIter *parent = (LSQArchiveIter*)archive->root_entry;
@@ -316,7 +301,6 @@
parent = child;
i++;
}
- LSQ_ARCHIVE_WRITE_UNLOCK(&archive->rw_lock);
return child;
}
@@ -378,7 +362,6 @@
GType
lsq_archive_get_property_type(LSQArchive *archive, guint i)
{
- LSQ_ARCHIVE_READ_LOCK(&archive->rw_lock);
#ifdef DEBUG /* n_property + 2, filename and MIME */
g_return_val_if_fail(i < (archive->n_property+LSQ_ARCHIVE_PROP_USER), G_TYPE_INVALID);
#endif
@@ -396,7 +379,6 @@
retval = archive->property_types[i - LSQ_ARCHIVE_PROP_USER];
break;
}
- LSQ_ARCHIVE_READ_UNLOCK(&archive->rw_lock);
return retval;
}
@@ -408,7 +390,6 @@
const gchar *
lsq_archive_get_property_name(LSQArchive *archive, guint i)
{
- LSQ_ARCHIVE_READ_LOCK(&archive->rw_lock);
#ifdef DEBUG /* n_property + 2, filename and MIME */
g_return_val_if_fail(i < (archive->n_property+LSQ_ARCHIVE_PROP_USER), NULL);
@@ -429,7 +410,6 @@
break;
}
- LSQ_ARCHIVE_READ_UNLOCK(&archive->rw_lock);
return retval;
}
@@ -441,7 +421,6 @@
void
lsq_archive_set_property_type(LSQArchive *archive, guint i, GType type, const gchar *name)
{
- LSQ_ARCHIVE_WRITE_LOCK(&archive->rw_lock);
#ifdef DEBUG
g_return_if_fail(i >= LSQ_ARCHIVE_PROP_USER);
@@ -454,7 +433,6 @@
g_free(names_iter[i-LSQ_ARCHIVE_PROP_USER]);
names_iter[i-LSQ_ARCHIVE_PROP_USER] = g_strdup(name);
- LSQ_ARCHIVE_WRITE_UNLOCK(&archive->rw_lock);
}
/*
@@ -465,7 +443,6 @@
void
lsq_archive_set_property_typesv(LSQArchive *archive, GType *types, const gchar **names)
{
- LSQ_ARCHIVE_WRITE_LOCK(&archive->rw_lock);
guint size = 0;
GType *type_iter = types;
const gchar **name_iter = names;
@@ -489,7 +466,6 @@
names_iter++;
name_iter++;
}
- LSQ_ARCHIVE_WRITE_UNLOCK(&archive->rw_lock);
}
guint
@@ -501,7 +477,6 @@
LSQArchiveIter *
lsq_archive_get_iter(LSQArchive *archive, const gchar *path)
{
- LSQ_ARCHIVE_READ_LOCK(&archive->rw_lock);
if(!path)
return (LSQArchiveIter *)archive->root_entry;
@@ -531,7 +506,6 @@
g_strfreev(buf);
- LSQ_ARCHIVE_READ_UNLOCK(&archive->rw_lock);
return entry;
}
@@ -925,7 +899,6 @@
void
lsq_archive_iter_set_prop_str(LSQArchive *archive, LSQArchiveIter *iter, guint i, const gchar *str_val)
{
- LSQ_ARCHIVE_WRITE_LOCK(&archive->rw_lock);
gpointer props_iter = NULL;
guint n;
@@ -969,7 +942,6 @@
break;
}
- LSQ_ARCHIVE_WRITE_UNLOCK(&archive->rw_lock);
}
/**
@@ -981,7 +953,6 @@
lsq_archive_iter_set_prop_uint(LSQArchive *archive, LSQArchiveIter *iter, guint i, guint int_val)
{
- LSQ_ARCHIVE_WRITE_LOCK(&archive->rw_lock);
#ifdef DEBUG
g_return_if_fail(i < (archive->n_property+LSQ_ARCHIVE_PROP_USER));
g_return_if_fail(i >= LSQ_ARCHIVE_PROP_USER);
@@ -1007,7 +978,6 @@
}
(*((guint *)props_iter)) = int_val;
- LSQ_ARCHIVE_WRITE_UNLOCK(&archive->rw_lock);
}
/**
@@ -1018,7 +988,6 @@
void
lsq_archive_iter_set_prop_uint64(LSQArchive *archive, LSQArchiveIter *iter, guint i, guint64 int64_val)
{
- LSQ_ARCHIVE_WRITE_LOCK(&archive->rw_lock);
#ifdef DEBUG
g_return_if_fail(i < (archive->n_property+LSQ_ARCHIVE_PROP_USER));
@@ -1045,7 +1014,6 @@
}
(*((guint64 *)props_iter)) = int64_val;
- LSQ_ARCHIVE_WRITE_UNLOCK(&archive->rw_lock);
}
/**
@@ -1056,7 +1024,6 @@
void
lsq_archive_iter_set_prop_value(LSQArchive *archive, LSQArchiveIter *iter, guint i, const GValue *value)
{
- LSQ_ARCHIVE_WRITE_LOCK(&archive->rw_lock);
switch(G_VALUE_TYPE(value))
{
case G_TYPE_STRING:
@@ -1069,7 +1036,6 @@
lsq_archive_iter_set_prop_uint64(archive, iter, i, g_value_get_uint64(value));
break;
}
- LSQ_ARCHIVE_WRITE_UNLOCK(&archive->rw_lock);
}
/**
@@ -1081,7 +1047,6 @@
lsq_archive_iter_set_props(LSQArchive *archive, LSQArchiveIter *iter, ...)
{
- LSQ_ARCHIVE_WRITE_LOCK(&archive->rw_lock);
gpointer props_iter = lsq_archive_entry_get_props(archive, (LSQEntry *)iter);
guint i;
@@ -1107,7 +1072,6 @@
break;
}
}
- LSQ_ARCHIVE_WRITE_UNLOCK(&archive->rw_lock);
va_end(ap);
@@ -1121,7 +1085,6 @@
void
lsq_archive_iter_set_propsv(LSQArchive *archive, LSQArchiveIter *iter, gconstpointer *props)
{
- LSQ_ARCHIVE_WRITE_LOCK(&archive->rw_lock);
gpointer props_iter = lsq_archive_entry_get_props(archive, (LSQEntry *)iter);
guint i;
@@ -1143,7 +1106,6 @@
break;
}
}
- LSQ_ARCHIVE_WRITE_UNLOCK(&archive->rw_lock);
}
@@ -1155,7 +1117,6 @@
gboolean
lsq_archive_iter_get_prop_value(const LSQArchive *archive, const LSQArchiveIter *iter, guint i, GValue *value)
{
- LSQ_ARCHIVE_READ_LOCK(&archive->rw_lock);
if(i>=LSQ_ARCHIVE_PROP_USER)
g_value_init(value, archive->property_types[i-LSQ_ARCHIVE_PROP_USER]);
@@ -1175,7 +1136,6 @@
break;
}
- LSQ_ARCHIVE_READ_UNLOCK(&archive->rw_lock);
return TRUE;
}
@@ -1350,7 +1310,7 @@
msg = N_("Performing an extended action");
break;
case LSQ_ARCHIVESTATUS_USERBREAK:
- msg = "USer did stuff";
+ msg = "User did stuff";
break;
case LSQ_ARCHIVESTATUS_ERROR:
msg = "error";
Modified: squeeze/trunk/src/main.c
===================================================================
--- squeeze/trunk/src/main.c 2006-12-19 12:18:10 UTC (rev 24135)
+++ squeeze/trunk/src/main.c 2006-12-19 12:34:39 UTC (rev 24136)
@@ -112,10 +112,6 @@
textdomain (GETTEXT_PACKAGE);
#endif
- g_thread_init(NULL);
- gdk_threads_init();
- gdk_threads_enter();
-
if(!gtk_init_with_args(&argc, &argv, _("[archive name]"), entries, PACKAGE, &cli_error))
{
if ( cli_error != NULL )
@@ -181,7 +177,6 @@
g_object_unref(sq_app);
gtk_main();
- gdk_threads_leave();
lsq_destroy();
return 0;
Modified: squeeze/trunk/src/main_window.c
===================================================================
--- squeeze/trunk/src/main_window.c 2006-12-19 12:18:10 UTC (rev 24135)
+++ squeeze/trunk/src/main_window.c 2006-12-19 12:34:39 UTC (rev 24136)
@@ -594,7 +594,7 @@
if(!lsq_new_archive(new_archive_path, TRUE, NULL, &archive))
{
support = lsq_get_support_for_mime(lsq_mime_info_get_name(archive->mime_info));
- sq_notebook_add_archive(SQ_NOTEBOOK(window->notebook), archive, support);
+ sq_notebook_add_archive(SQ_NOTEBOOK(window->notebook), archive, support, TRUE);
}
else
{
@@ -908,7 +908,7 @@
{
support = lsq_get_support_for_mime(lsq_mime_info_get_name(archive->mime_info));
if(replace < 0)
- sq_notebook_add_archive(SQ_NOTEBOOK(window->notebook), archive, support);
+ sq_notebook_add_archive(SQ_NOTEBOOK(window->notebook), archive, support, FALSE);
else
sq_notebook_page_set_archive(SQ_NOTEBOOK(window->notebook), archive, support, replace);
gtk_widget_set_sensitive(window->menubar.menu_item_close, TRUE);
Modified: squeeze/trunk/src/notebook.c
===================================================================
--- squeeze/trunk/src/notebook.c 2006-12-19 12:18:10 UTC (rev 24135)
+++ squeeze/trunk/src/notebook.c 2006-12-19 12:34:39 UTC (rev 24136)
@@ -253,7 +253,7 @@
}
void
-sq_notebook_add_archive(SQNotebook *notebook, LSQArchive *archive, LSQArchiveSupport *support)
+sq_notebook_add_archive(SQNotebook *notebook, LSQArchive *archive, LSQArchiveSupport *support, gboolean new_archive)
{
GtkWidget *lbl_hbox = gtk_hbox_new(FALSE, 0);
GtkWidget *label = gtk_label_new(lsq_archive_get_filename(archive));
@@ -294,7 +294,8 @@
sq_archive_store_set_support(SQ_ARCHIVE_STORE(tree_model), support);
- lsq_archive_support_refresh(support, archive);
+ if(new_archive == FALSE)
+ lsq_archive_support_refresh(support, archive);
sq_archive_store_connect_treeview(SQ_ARCHIVE_STORE(tree_model), GTK_TREE_VIEW(tree_view));
gtk_tree_view_set_model(GTK_TREE_VIEW(tree_view), tree_model);
@@ -329,9 +330,7 @@
default:
break;
}
- gdk_threads_enter();
gtk_dialog_run((GtkDialog *)dialog);
- gdk_threads_leave();
gtk_widget_destroy(dialog);
}
if(lsq_archive_get_status(archive) == LSQ_ARCHIVESTATUS_IDLE)
@@ -536,7 +535,7 @@
gtk_tree_view_set_model(GTK_TREE_VIEW(treeview), store);
}
else
- sq_notebook_add_archive(SQ_NOTEBOOK(notebook), archive, support);
+ sq_notebook_add_archive(SQ_NOTEBOOK(notebook), archive, support, FALSE);
}
GSList *
Modified: squeeze/trunk/src/notebook.h
===================================================================
--- squeeze/trunk/src/notebook.h 2006-12-19 12:18:10 UTC (rev 24135)
+++ squeeze/trunk/src/notebook.h 2006-12-19 12:34:39 UTC (rev 24136)
@@ -68,7 +68,7 @@
GType sq_notebook_get_type ();
void sq_notebook_set_navigation_bar(SQNotebook *, SQNavigationBar *);
-void sq_notebook_add_archive(SQNotebook *, LSQArchive *, LSQArchiveSupport *);
+void sq_notebook_add_archive(SQNotebook *, LSQArchive *, LSQArchiveSupport *, gboolean);
void sq_notebook_page_set_archive(SQNotebook *, LSQArchive *, LSQArchiveSupport *, gint n);
void sq_notebook_page_get_archive(SQNotebook *, LSQArchive **, LSQArchiveSupport **, gint n);
void sq_notebook_set_icon_theme(SQNotebook *, GtkIconTheme *);
More information about the Xfce4-commits
mailing list