[Xfce4-commits] r25143 - in squeeze/trunk: . icons icons/16x16 icons/48x48 libsqueeze src
Stephan Arts
stephan at xfce.org
Fri Mar 9 23:03:40 CET 2007
Author: stephan
Date: 2007-03-09 22:03:40 +0000 (Fri, 09 Mar 2007)
New Revision: 25143
Added:
squeeze/trunk/icons/16x16/
squeeze/trunk/icons/16x16/Makefile.am
squeeze/trunk/icons/16x16/squeeze.png
Modified:
squeeze/trunk/configure.in.in
squeeze/trunk/icons/48x48/squeeze.png
squeeze/trunk/icons/Makefile.am
squeeze/trunk/libsqueeze/archive-command.c
squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
squeeze/trunk/libsqueeze/archive-support-rar.c
squeeze/trunk/libsqueeze/archive-support.c
squeeze/trunk/libsqueeze/archive.c
squeeze/trunk/src/archive_store.c
squeeze/trunk/src/notebook.c
Log:
add 16x16 icon and fix file-activated icon
Modified: squeeze/trunk/configure.in.in
===================================================================
--- squeeze/trunk/configure.in.in 2007-03-09 20:46:14 UTC (rev 25142)
+++ squeeze/trunk/configure.in.in 2007-03-09 22:03:40 UTC (rev 25143)
@@ -165,6 +165,7 @@
src/Makefile
libsqueeze/Makefile
icons/Makefile
+icons/16x16/Makefile
icons/48x48/Makefile
icons/scalable/Makefile
pixmaps/Makefile
Added: squeeze/trunk/icons/16x16/Makefile.am
===================================================================
--- squeeze/trunk/icons/16x16/Makefile.am (rev 0)
+++ squeeze/trunk/icons/16x16/Makefile.am 2007-03-09 22:03:40 UTC (rev 25143)
@@ -0,0 +1,9 @@
+
+# Inspired by Makefile.am from the Thunar file-manager
+
+iconsdir = $(datadir)/icons/hicolor/16x16/apps
+icons_DATA = squeeze.png
+
+
+EXTRA_DIST = $(icons_DATA)
+
Added: squeeze/trunk/icons/16x16/squeeze.png
===================================================================
(Binary files differ)
Property changes on: squeeze/trunk/icons/16x16/squeeze.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: squeeze/trunk/icons/48x48/squeeze.png
===================================================================
(Binary files differ)
Modified: squeeze/trunk/icons/Makefile.am
===================================================================
--- squeeze/trunk/icons/Makefile.am 2007-03-09 20:46:14 UTC (rev 25142)
+++ squeeze/trunk/icons/Makefile.am 2007-03-09 22:03:40 UTC (rev 25143)
@@ -1,7 +1,7 @@
# Inspired by Makefile.am from the Thunar file-manager
-SUBDIRS = 48x48 scalable
+SUBDIRS = 16x16 48x48 scalable
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
Modified: squeeze/trunk/libsqueeze/archive-command.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-command.c 2007-03-09 20:46:14 UTC (rev 25142)
+++ squeeze/trunk/libsqueeze/archive-command.c 2007-03-09 22:03:40 UTC (rev 25143)
@@ -103,21 +103,14 @@
lsq_archive_command_dispose(GObject *object)
{
LSQArchiveCommand *archive_command = LSQ_ARCHIVE_COMMAND(object);
- LSQArchiveCommand *next_archive_command = NULL;
if(archive_command->archive)
{
lsq_archive_dequeue_command(archive_command->archive, archive_command);
- next_archive_command = lsq_archive_get_front_command(archive_command->archive);
if(archive_command->refresh)
lsq_archive_refreshed(archive_command->archive);
lsq_archive_command_terminated(archive_command->archive, archive_command->error);
archive_command->archive = NULL;
- if(next_archive_command)
- {
- lsq_archive_command_run(next_archive_command);
- g_object_unref(next_archive_command);
- }
}
}
@@ -158,7 +151,6 @@
LSQArchiveCommand *archive_command;
archive_command = g_object_new(lsq_archive_command_get_type(), NULL);
-
archive_command->command = g_strdup(command);
archive_command->safe = safe;
archive_command->refresh = refresh;
@@ -221,7 +213,6 @@
return FALSE;
}
- g_object_ref(archive_command);
g_child_watch_add(archive_command->child_pid, lsq_archive_command_child_watch_func, archive_command);
if(archive_command->parse_stdout != NULL)
Modified: squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-gnu-tar.c 2007-03-09 20:46:14 UTC (rev 25142)
+++ squeeze/trunk/libsqueeze/archive-support-gnu-tar.c 2007-03-09 22:03:40 UTC (rev 25143)
@@ -295,6 +295,7 @@
g_object_set_data(G_OBJECT(archive_command), "files", g_strdup(files));
g_object_set_data(G_OBJECT(archive_command), "options", g_strdup(options));
lsq_archive_enqueue_command(archive, archive_command);
+ g_object_unref(archive_command);
g_free(command_skeleton);
}
else
@@ -315,6 +316,7 @@
g_mkstemp(tmp_file);
g_object_set_data(G_OBJECT(archive_command), LSQ_ARCHIVE_TEMP_FILE, tmp_file);
lsq_archive_enqueue_command(archive, archive_command);
+ g_object_unref(archive_command);
g_free(command_skeleton);
}
@@ -325,6 +327,7 @@
g_object_set_data(G_OBJECT(archive_command), "files", g_strdup(files));
g_object_set_data(G_OBJECT(archive_command), "options", g_strdup(options));
lsq_archive_enqueue_command(archive, archive_command);
+ g_object_unref(archive_command);
g_free(command_skeleton);
command_skeleton = NULL;
@@ -344,6 +347,7 @@
g_object_set_data(G_OBJECT(archive_command), "archive", g_strdup(tmp_file));
g_object_set_data(G_OBJECT(archive_command), LSQ_ARCHIVE_TEMP_FILE, g_strdup(tmp_file));
lsq_archive_enqueue_command(archive, archive_command);
+ g_object_unref(archive_command);
g_free(command_skeleton);
}
}
@@ -441,6 +445,7 @@
g_mkstemp(tmp_file);
g_object_set_data(G_OBJECT(archive_command), LSQ_ARCHIVE_TEMP_FILE, tmp_file);
lsq_archive_enqueue_command(archive, archive_command);
+ g_object_unref(archive_command);
g_free(command_skeleton);
}
@@ -451,6 +456,7 @@
g_object_set_data(G_OBJECT(archive_command), "files", g_strdup(files));
g_object_set_data(G_OBJECT(archive_command), "options", g_strdup(options));
lsq_archive_enqueue_command(archive, archive_command);
+ g_object_unref(archive_command);
g_free(command_skeleton);
command_skeleton = NULL;
@@ -470,6 +476,7 @@
g_object_set_data(G_OBJECT(archive_command), "archive", g_strdup(tmp_file));
g_object_set_data(G_OBJECT(archive_command), LSQ_ARCHIVE_TEMP_FILE, g_strdup(tmp_file));
lsq_archive_enqueue_command(archive, archive_command);
+ g_object_unref(archive_command);
g_free(command_skeleton);
}
g_free(files);
Modified: squeeze/trunk/libsqueeze/archive-support-rar.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-rar.c 2007-03-09 20:46:14 UTC (rev 25142)
+++ squeeze/trunk/libsqueeze/archive-support-rar.c 2007-03-09 22:03:40 UTC (rev 25143)
@@ -262,8 +262,8 @@
archive_command = lsq_archive_command_new("", "rar %3$s a %1$s %2$s", FALSE, TRUE);
g_object_set_data(G_OBJECT(archive_command), "files", g_strdup(files));
lsq_archive_enqueue_command(archive, archive_command);
+ g_object_unref(archive_command);
g_free(files);
- g_object_unref(archive_command);
}
}
return 0;
Modified: squeeze/trunk/libsqueeze/archive-support.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support.c 2007-03-09 20:46:14 UTC (rev 25142)
+++ squeeze/trunk/libsqueeze/archive-support.c 2007-03-09 22:03:40 UTC (rev 25143)
@@ -246,7 +246,7 @@
return support->refresh(archive);
}
else
- g_critical("VIEW NOT IMPLEMENTED BY SUPPORT OBJECT '%s'", support->id);
+ g_critical("REFRESH NOT IMPLEMENTED BY SUPPORT OBJECT '%s'", support->id);
return -1;
}
Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c 2007-03-09 20:46:14 UTC (rev 25142)
+++ squeeze/trunk/libsqueeze/archive.c 2007-03-09 22:03:40 UTC (rev 25143)
@@ -440,6 +440,7 @@
void
lsq_archive_enqueue_command(LSQArchive *archive, LSQArchiveCommand *command)
{
+ g_object_ref(command);
archive->command_queue = g_slist_append(archive->command_queue, command);
command->archive = archive;
if(archive->command_queue->data == command)
@@ -451,6 +452,11 @@
{
g_return_if_fail(archive->command_queue->data == command);
archive->command_queue = g_slist_remove(archive->command_queue, command);
+ LSQArchiveCommand *next_command = lsq_archive_get_front_command(archive);
+ if(next_command)
+ {
+ lsq_archive_command_run(next_command);
+ }
}
LSQArchiveCommand *
Modified: squeeze/trunk/src/archive_store.c
===================================================================
--- squeeze/trunk/src/archive_store.c 2007-03-09 20:46:14 UTC (rev 25142)
+++ squeeze/trunk/src/archive_store.c 2007-03-09 22:03:40 UTC (rev 25143)
@@ -304,7 +304,7 @@
0,
NULL);
- sq_archive_store_signals[SQ_ARCHIVE_STORE_SIGNAL_FILE_ACTIVATED] = g_signal_new("sq-file-activated",
+ sq_archive_store_signals[SQ_ARCHIVE_STORE_SIGNAL_FILE_ACTIVATED] = g_signal_new("file-activated",
G_TYPE_FROM_CLASS(as_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
0,
Modified: squeeze/trunk/src/notebook.c
===================================================================
--- squeeze/trunk/src/notebook.c 2007-03-09 20:46:14 UTC (rev 25142)
+++ squeeze/trunk/src/notebook.c 2007-03-09 22:03:40 UTC (rev 25143)
@@ -523,7 +523,7 @@
g_signal_connect(G_OBJECT(archive), "refreshed", G_CALLBACK(cb_notebook_archive_refreshed), tree_view);
g_signal_connect(G_OBJECT(close_button), "clicked", G_CALLBACK(cb_notebook_close_archive), scroll_window);
- g_signal_connect(G_OBJECT(tree_model), "sq_file_activated", G_CALLBACK(cb_notebook_file_activated), notebook);
+ g_signal_connect(G_OBJECT(tree_model), "file-activated", G_CALLBACK(cb_notebook_file_activated), notebook);
sq_archive_store_set_support(SQ_ARCHIVE_STORE(tree_model), support);
@@ -706,9 +706,7 @@
static void
cb_notebook_file_activated(SQArchiveStore *store, gchar *filename, SQNotebook *notebook)
{
- //gchar *pwd = sq_archive_store_get_pwd(store);
- //gchar *path = g_strconcat(pwd, filename, NULL);
- //g_signal_emit(G_OBJECT(notebook), sq_notebook_signals[SQ_NOTEBOOK_SIGNAL_FILE_ACTIVATED], 0, path, NULL);
+ g_signal_emit(G_OBJECT(notebook), sq_notebook_signals[SQ_NOTEBOOK_SIGNAL_FILE_ACTIVATED], 0, filename, NULL);
}
gboolean
More information about the Xfce4-commits
mailing list