[Xfce4-commits] r24138 - in squeeze/trunk: libsqueeze src
Stephan Arts
stephan at xfce.org
Tue Dec 19 14:03:11 CET 2006
Author: stephan
Date: 2006-12-19 13:03:11 +0000 (Tue, 19 Dec 2006)
New Revision: 24138
Modified:
squeeze/trunk/libsqueeze/archive.c
squeeze/trunk/src/archive_store.c
squeeze/trunk/src/notebook.c
Log:
applied patch from peter de ridder <peter at xfce.org>
Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c 2006-12-19 12:42:29 UTC (rev 24137)
+++ squeeze/trunk/libsqueeze/archive.c 2006-12-19 13:03:11 UTC (rev 24138)
@@ -105,8 +105,16 @@
return strcmp(entry1->filename, entry2->filename);
}
-static gint lsq_archive_signals[3];
+enum
+{
+ LSQ_ARCHIVE_SIGNAL_STATUS_CHANGED = 0,
+ LSQ_ARCHIVE_SIGNAL_REFRESHED,
+ LSQ_ARCHIVE_SIGNAL_PATH_CHANGED,
+ LSQ_ARCHIVE_SIGNAL_COUNT
+};
+static gint lsq_archive_signals[LSQ_ARCHIVE_SIGNAL_COUNT];
+
GType
lsq_archive_get_type ()
{
@@ -140,7 +148,7 @@
object_class->finalize = lsq_archive_finalize;
- lsq_archive_signals[0] = g_signal_new("lsq_status_changed",
+ lsq_archive_signals[LSQ_ARCHIVE_SIGNAL_STATUS_CHANGED] = g_signal_new("lsq_status_changed",
G_TYPE_FROM_CLASS(archive_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
0,
@@ -151,7 +159,7 @@
0,
NULL);
- lsq_archive_signals[1] = g_signal_new("lsq_refreshed",
+ lsq_archive_signals[LSQ_ARCHIVE_SIGNAL_REFRESHED] = g_signal_new("lsq_refreshed",
G_TYPE_FROM_CLASS(archive_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
0,
@@ -162,7 +170,7 @@
0,
NULL);
- lsq_archive_signals[2] = g_signal_new("lsq_path_changed",
+ lsq_archive_signals[LSQ_ARCHIVE_SIGNAL_PATH_CHANGED] = g_signal_new("lsq_path_changed",
G_TYPE_FROM_CLASS(archive_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
0,
@@ -249,14 +257,14 @@
{
archive->old_status = archive->status;
archive->status = status;
- g_signal_emit(G_OBJECT(archive), lsq_archive_signals[0], 0, NULL);
+ g_signal_emit(G_OBJECT(archive), lsq_archive_signals[LSQ_ARCHIVE_SIGNAL_STATUS_CHANGED], 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, NULL);
+ g_signal_emit(G_OBJECT(archive), lsq_archive_signals[LSQ_ARCHIVE_SIGNAL_REFRESHED], 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, NULL);
+ g_signal_emit(G_OBJECT(archive), lsq_archive_signals[LSQ_ARCHIVE_SIGNAL_PATH_CHANGED], 0, _path, NULL);
g_strfreev(path);
g_free(_path);
}
Modified: squeeze/trunk/src/archive_store.c
===================================================================
--- squeeze/trunk/src/archive_store.c 2006-12-19 12:42:29 UTC (rev 24137)
+++ squeeze/trunk/src/archive_store.c 2006-12-19 13:03:11 UTC (rev 24138)
@@ -59,9 +59,9 @@
SQ_ARCHIVE_STORE_SIGNAL_PWD_CHANGED = 0,
SQ_ARCHIVE_STORE_SIGNAL_NEW_ARCHIVE,
SQ_ARCHIVE_STORE_SIGNAL_FILE_ACTIVATED,
- SQ_ARCHIVE_STORE_SIGNAL_NUMBER
+ SQ_ARCHIVE_STORE_SIGNAL_COUNT
};
-static gint sq_archive_store_signals[SQ_ARCHIVE_STORE_SIGNAL_NUMBER];
+static gint sq_archive_store_signals[SQ_ARCHIVE_STORE_SIGNAL_COUNT];
static void
sq_archive_store_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
Modified: squeeze/trunk/src/notebook.c
===================================================================
--- squeeze/trunk/src/notebook.c 2006-12-19 12:42:29 UTC (rev 24137)
+++ squeeze/trunk/src/notebook.c 2006-12-19 13:03:11 UTC (rev 24138)
@@ -63,8 +63,18 @@
SQ_NOTEBOOK_MULTI_TAB = 1
};
-static gint sq_notebook_signals[5];
+enum
+{
+ SQ_NOTEBOOK_SIGNAL_ARCHIVE_REMOVED = 0,
+ SQ_NOTEBOOK_SIGNAL_PAGE_UP,
+ SQ_NOTEBOOK_SIGNAL_PAGE_DOWN,
+ SQ_NOTEBOOK_SIGNAL_FILE_ACTIVATED,
+ SQ_NOTEBOOK_SIGNAL_ACTIVE_ARCHIVE_STATUS_CHANGED,
+ SQ_NOTEBOOK_SIGNAL_COUNT
+};
+static gint sq_notebook_signals[SQ_NOTEBOOK_SIGNAL_COUNT];
+
GType
sq_notebook_get_type ()
{
@@ -101,7 +111,7 @@
object_class->get_property = sq_notebook_get_property;
object_class->finalize = sq_notebook_finalize;
- sq_notebook_signals[0] = g_signal_new("archive-removed",
+ sq_notebook_signals[SQ_NOTEBOOK_SIGNAL_ARCHIVE_REMOVED] = g_signal_new("archive-removed",
G_TYPE_FROM_CLASS(notebook_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
0,
@@ -112,28 +122,28 @@
0,
NULL);
- sq_notebook_signals[1] = g_signal_new("page-up",
+ sq_notebook_signals[SQ_NOTEBOOK_SIGNAL_PAGE_UP] = g_signal_new("page-up",
G_TYPE_FROM_CLASS(notebook_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0,
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0, NULL);
- sq_notebook_signals[2] = g_signal_new("page-down",
+ sq_notebook_signals[SQ_NOTEBOOK_SIGNAL_PAGE_DOWN] = g_signal_new("page-down",
G_TYPE_FROM_CLASS(notebook_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0,
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0, NULL);
- sq_notebook_signals[3] = g_signal_new("file-activated",
+ sq_notebook_signals[SQ_NOTEBOOK_SIGNAL_FILE_ACTIVATED] = g_signal_new("file-activated",
G_TYPE_FROM_CLASS(notebook_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0,
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_STRING, NULL);
- sq_notebook_signals[4] = g_signal_new("active-archive-status-changed",
+ sq_notebook_signals[SQ_NOTEBOOK_SIGNAL_ACTIVE_ARCHIVE_STATUS_CHANGED] = g_signal_new("active-archive-status-changed",
G_TYPE_FROM_CLASS(notebook_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0,
NULL, NULL,
@@ -344,7 +354,7 @@
}
}
if(sq_notebook_is_active_archive(notebook, archive))
- g_signal_emit(G_OBJECT(notebook), sq_notebook_signals[4], 0, archive, NULL);
+ g_signal_emit(G_OBJECT(notebook), sq_notebook_signals[SQ_NOTEBOOK_SIGNAL_ACTIVE_ARCHIVE_STATUS_CHANGED], 0, archive, NULL);
}
static void
@@ -367,7 +377,7 @@
gint n = gtk_notebook_page_num(notebook, child);
gtk_notebook_remove_page(notebook, n);
- g_signal_emit(G_OBJECT(notebook), sq_notebook_signals[0], 0, NULL);
+ g_signal_emit(G_OBJECT(notebook), sq_notebook_signals[SQ_NOTEBOOK_SIGNAL_ARCHIVE_REMOVED], 0, NULL);
}
void
@@ -376,7 +386,7 @@
GtkNotebook *_notebook = GTK_NOTEBOOK(notebook);
gint n = gtk_notebook_get_current_page(_notebook);
gtk_notebook_remove_page(_notebook, n);
- g_signal_emit(G_OBJECT(notebook), sq_notebook_signals[0], 0, NULL);
+ g_signal_emit(G_OBJECT(notebook), sq_notebook_signals[SQ_NOTEBOOK_SIGNAL_ARCHIVE_REMOVED], 0, NULL);
}
void
@@ -479,7 +489,7 @@
{
gchar *pwd = sq_archive_store_get_pwd(store);
gchar *path = g_strconcat(pwd, filename, NULL);
- g_signal_emit(G_OBJECT(notebook), sq_notebook_signals[3], 0, path, NULL);
+ g_signal_emit(G_OBJECT(notebook), sq_notebook_signals[SQ_NOTEBOOK_SIGNAL_FILE_ACTIVATED], 0, path, NULL);
}
gboolean
More information about the Xfce4-commits
mailing list