[Xfce4-commits] r24366 - in thunar/trunk: . thunar
Author: benny
Date: 2007-01-12 09:28:31 + (Fri, 12 Jan 2007)
New Revision: 24366
Modified:
thunar/trunk/ChangeLog
thunar/trunk/thunar/thunar-window.c
Log:
2007-01-12 Benedikt Meurer [EMAIL PROTECTED]
* thunar/thunar-window.c: Finally fix crash on platforms where
sizeof(GType) != sizeof(gint). Bug #2726.
Modified: thunar/trunk/ChangeLog
===
--- thunar/trunk/ChangeLog 2007-01-11 22:01:54 UTC (rev 24365)
+++ thunar/trunk/ChangeLog 2007-01-12 09:28:31 UTC (rev 24366)
@@ -1,3 +1,8 @@
+2007-01-12 Benedikt Meurer [EMAIL PROTECTED]
+
+ * thunar/thunar-window.c: Finally fix crash on platforms where
+ sizeof(GType) != sizeof(gint). Bug #2726.
+
2007-01-10 Benedikt Meurer [EMAIL PROTECTED]
* thunar/thunar-gdk-extensions.{c,h}: Add new helper function
Modified: thunar/trunk/thunar/thunar-window.c
===
--- thunar/trunk/thunar/thunar-window.c 2007-01-11 22:01:54 UTC (rev 24365)
+++ thunar/trunk/thunar/thunar-window.c 2007-01-12 09:28:31 UTC (rev 24366)
@@ -1,6 +1,6 @@
/* $Id$ */
/*-
- * Copyright (c) 2005-2006 Benedikt Meurer [EMAIL PROTECTED]
+ * Copyright (c) 2005-2007 Benedikt Meurer [EMAIL PROTECTED]
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -531,6 +531,56 @@
+static inline gint
+view_type2index (GType type)
+{
+ /* this necessary for platforms where sizeof(GType) != sizeof(gint),
+ * see http://bugzilla.xfce.org/show_bug.cgi?id=2726 for details.
+ */
+ if (sizeof (GType) == sizeof (gint))
+{
+ /* no need to map anything */
+ return (gint) type;
+}
+ else
+{
+ /* map from types to unique indices */
+ if (G_LIKELY (type == THUNAR_TYPE_COMPACT_VIEW))
+return 0;
+ else if (type == THUNAR_TYPE_DETAILS_VIEW)
+return 1;
+ else
+return 2;
+}
+}
+
+
+
+static inline GType
+view_index2type (gint index)
+{
+ /* this necessary for platforms where sizeof(GType) != sizeof(gint),
+ * see http://bugzilla.xfce.org/show_bug.cgi?id=2726 for details.
+ */
+ if (sizeof (GType) == sizeof (gint))
+{
+ /* no need to map anything */
+ return (GType) index;
+}
+ else
+{
+ /* map from indices to unique types */
+ switch (index)
+{
+case 0: return THUNAR_TYPE_COMPACT_VIEW;
+case 1: return THUNAR_TYPE_DETAILS_VIEW;
+default: return THUNAR_TYPE_ICON_VIEW;
+}
+}
+}
+
+
+
static void
thunar_window_init (ThunarWindow *window)
{
@@ -605,21 +655,21 @@
* add view options
*/
radio_action = gtk_radio_action_new (view-as-icons, _(View as _Icons),
_(Display folder content in an icon view),
- NULL, THUNAR_TYPE_ICON_VIEW);
+ NULL, view_type2index
(THUNAR_TYPE_ICON_VIEW));
gtk_action_group_add_action_with_accel (window-action_group, GTK_ACTION
(radio_action), control1);
gtk_radio_action_set_group (radio_action, NULL);
group = gtk_radio_action_get_group (radio_action);
g_object_unref (G_OBJECT (radio_action));
radio_action = gtk_radio_action_new (view-as-detailed-list, _(View as
_Detailed List), _(Display folder content in a detailed list view),
- NULL, THUNAR_TYPE_DETAILS_VIEW);
+ NULL, view_type2index
(THUNAR_TYPE_DETAILS_VIEW));
gtk_action_group_add_action_with_accel (window-action_group, GTK_ACTION
(radio_action), control2);
gtk_radio_action_set_group (radio_action, group);
group = gtk_radio_action_get_group (radio_action);
g_object_unref (G_OBJECT (radio_action));
radio_action = gtk_radio_action_new (view-as-compact-list, _(View as
_Compact List), _(Display folder content in a compact list view),
- NULL, THUNAR_TYPE_COMPACT_VIEW);
+ NULL, view_type2index
(THUNAR_TYPE_COMPACT_VIEW));
gtk_action_group_add_action_with_accel (window-action_group, GTK_ACTION
(radio_action), control3);
gtk_radio_action_set_group (radio_action, group);
group = gtk_radio_action_get_group (radio_action);
@@ -758,7 +808,7 @@
/* activate the selected view */
action = gtk_action_group_get_action (window-action_group, view-as-icons);
- exo_gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action),
g_type_is_a (type, THUNAR_TYPE_VIEW) ? type : THUNAR_TYPE_ICON_VIEW);
+ exo_gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action),
view_type2index (g_type_is_a (type, THUNAR_TYPE_VIEW) ? type :
THUNAR_TYPE_ICON_VIEW));
g_signal_connect (G_OBJECT (action), changed, G_CALLBACK
(thunar_window_action_view_changed), window);
thunar_window_action_view_changed (GTK_RADIO_ACTION
[Xfce4-commits] r24367 - thunar/trunk/po
Author: jari Date: 2007-01-12 10:02:09 + (Fri, 12 Jan 2007) New Revision: 24367 Modified: thunar/trunk/po/ChangeLog thunar/trunk/po/fi.po Log: Fixed a couple of typos in the Finnish translation. Modified: thunar/trunk/po/ChangeLog === --- thunar/trunk/po/ChangeLog 2007-01-12 09:28:31 UTC (rev 24366) +++ thunar/trunk/po/ChangeLog 2007-01-12 10:02:09 UTC (rev 24367) @@ -1,3 +1,7 @@ +2007-01-12 Jari Rahkonen [EMAIL PROTECTED] + + * fi.po: Fixed a couple of typos in the Finnish translation. + 2007-01-11 Maximilian Schleiss [EMAIL PROTECTED] * pl.po: Updated the Polish translation by Modified: thunar/trunk/po/fi.po === --- thunar/trunk/po/fi.po 2007-01-12 09:28:31 UTC (rev 24366) +++ thunar/trunk/po/fi.po 2007-01-12 10:02:09 UTC (rev 24367) @@ -7,8 +7,8 @@ msgstr Project-Id-Version: Thunar 0.5.0rc2\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2007-01-11 13:18+0100\n -PO-Revision-Date: 2007-01-11 12:42+0200\n +POT-Creation-Date: 2007-01-12 11:56+0200\n +PO-Revision-Date: 2007-01-12 12:01+0200\n Last-Translator: Jari Rahkonen [EMAIL PROTECTED]\n Language-Team: Finnish [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -515,7 +515,7 @@ tiedoston pysyvästi? msgstr[1] Haluatko todella poistaa valitut\n -tiedostot pysyvästi? +%u tiedostoa pysyvästi? #: ../thunar/thunar-application.c:1328 msgid If you delete a file, it is permanently lost. @@ -1311,7 +1311,7 @@ msgid _Location: msgstr _Sijainti: -#: ../thunar/thunar-location-entry.c:426 ../thunar/thunar-window.c:1307 +#: ../thunar/thunar-location-entry.c:426 ../thunar/thunar-window.c:1357 #, c-format msgid Failed to launch \%s\ msgstr Kohteen \%s\ suorittaminen epäonnistui @@ -1742,7 +1742,7 @@ and media (i.e. how cameras should be handled). msgstr a href=\volman-config:\Muokkaa/a irrotettavien asemien ja taltioiden\n -hallinnan asetuksia (esim. kameroiden käsittely)\n +hallinnan asetuksia (esim. kameroiden käsittely). #. tell the user that we failed to come up with the thunar-volman configuration dialog #: ../thunar/thunar-preferences-dialog.c:677 @@ -2501,54 +2501,54 @@ #. #. * add view options #. -#: ../thunar/thunar-window.c:607 +#: ../thunar/thunar-window.c:657 msgid View as _Icons msgstr Näytä _kuvakkeet -#: ../thunar/thunar-window.c:607 +#: ../thunar/thunar-window.c:657 msgid Display folder content in an icon view msgstr Näytä hakemiston sisältö kuvakenäkymässä -#: ../thunar/thunar-window.c:614 +#: ../thunar/thunar-window.c:664 msgid View as _Detailed List msgstr Näytä ti_edot -#: ../thunar/thunar-window.c:614 +#: ../thunar/thunar-window.c:664 msgid Display folder content in a detailed list view msgstr Näytä hakemiston sisältö yksityiskohtaisessa listanäkymässä -#: ../thunar/thunar-window.c:621 +#: ../thunar/thunar-window.c:671 msgid View as _Compact List msgstr Näytä ko_mpakti lista -#: ../thunar/thunar-window.c:621 +#: ../thunar/thunar-window.c:671 msgid Display folder content in a compact list view msgstr Näytä hakemiston sisältö kompaktissa listanäkymässä #. add the label with the root warning -#: ../thunar/thunar-window.c:683 +#: ../thunar/thunar-window.c:733 msgid Warning, you are using the root account, you may harm your system. msgstr Varoitus: Käytät pääkäyttäjätiliä, voit vahingoittaa järjestelmääsi. -#: ../thunar/thunar-window.c:1701 +#: ../thunar/thunar-window.c:1751 msgid Failed to open parent folder msgstr Ylähakemiston avaaminen epäonnistui #. display an error to the user -#: ../thunar/thunar-window.c:1727 +#: ../thunar/thunar-window.c:1777 msgid Failed to open the home folder msgstr Kotihakemiston avaaminen epäonnistui #. display the About Templates dialog -#: ../thunar/thunar-window.c:1789 +#: ../thunar/thunar-window.c:1839 msgid About Templates msgstr Tietoja asiakirjamalleista -#: ../thunar/thunar-window.c:1810 +#: ../thunar/thunar-window.c:1860 msgid All files in this folder will appear in the \Create Document\ menu. msgstr Kaikki tämän kansion tiedostot näkyvät \Luo asiakirja\ -valikossa. -#: ../thunar/thunar-window.c:1817 +#: ../thunar/thunar-window.c:1867 msgid If you frequently create certain kinds of documents, make a copy of one and put it in this folder. Thunar will add an entry for this document in the @@ -2564,20 +2564,20 @@ Tämän jälkeen voit valita kohteen \Luo asiakirja\ -valikosta, jolloin asiakirjasta luodaan kopio näkyvillä olevaan hakemistoon. -#: ../thunar/thunar-window.c:1829 +#: ../thunar/thunar-window.c:1879 msgid Do _not display this message again msgstr _Muista valinta -#: ../thunar/thunar-window.c:1842 +#: ../thunar/thunar-window.c:1892 msgid Failed to open the templates folder msgstr Mallihakemiston avaaminen epäonnistui #. display an error to the user -#: ../thunar/thunar-window.c:1871 +#: ../thunar/thunar-window.c:1921 msgid Failed to display the
[Xfce4-commits] r24368 - squeeze/trunk/src
Author: peter
Date: 2007-01-12 11:32:04 + (Fri, 12 Jan 2007)
New Revision: 24368
Modified:
squeeze/trunk/src/archive_store.c
squeeze/trunk/src/notebook.c
Log:
tree_view search uses the right column now
when a archive is opened, that tab gets active and the tree_view get focus
when closing tabs and only one tab is left the tab titles are hidden bug #2748
fix
Modified: squeeze/trunk/src/archive_store.c
===
--- squeeze/trunk/src/archive_store.c 2007-01-12 10:02:09 UTC (rev 24367)
+++ squeeze/trunk/src/archive_store.c 2007-01-12 11:32:04 UTC (rev 24368)
@@ -970,8 +970,10 @@
g_object_ref(G_OBJECT(store));
+ gint column = gtk_tree_view_get_search_column(store-treeview);
gtk_tree_view_set_model(store-treeview, NULL);
gtk_tree_view_set_model(store-treeview, GTK_TREE_MODEL(store));
+ gtk_tree_view_set_search_column(store-treeview, column);
g_object_unref(G_OBJECT(store));
}
Modified: squeeze/trunk/src/notebook.c
===
--- squeeze/trunk/src/notebook.c2007-01-12 10:02:09 UTC (rev 24367)
+++ squeeze/trunk/src/notebook.c2007-01-12 11:32:04 UTC (rev 24368)
@@ -456,7 +456,12 @@
gtk_container_add(GTK_CONTAINER(scroll_window), tree_view);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), scroll_window,
lbl_hbox);
+ gint page_nr = gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
scroll_window, lbl_hbox);
+ if(page_nr = 0)
+ {
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), page_nr);
+ gtk_widget_grab_focus(tree_view);
+ }
}
void
@@ -555,14 +560,14 @@
void
cb_notebook_archive_refreshed(LSQArchive *archive, GtkTreeView *treeview)
{
- sq_notebook_treeview_reset_columns(archive, treeview);
-
GtkTreeModel *archive_store = gtk_tree_view_get_model(treeview);
g_object_ref(archive_store);
gtk_tree_view_set_model(treeview, NULL);
sq_archive_store_set_archive(SQ_ARCHIVE_STORE(archive_store), archive);
gtk_tree_view_set_model(treeview, archive_store);
g_object_unref(archive_store);
+
+ sq_notebook_treeview_reset_columns(archive, treeview);
}
static void
@@ -572,10 +577,6 @@
GtkTreeViewColumn *column = NULL;
gint x = 0;
- GValue *value = g_new0(GValue, 1);
- value = g_value_init(value, G_TYPE_UINT);
- g_value_set_uint(value, GTK_ICON_SIZE_SMALL_TOOLBAR);
-
GList *columns = gtk_tree_view_get_columns(treeview);
gboolean show_only_filenames = FALSE;
@@ -589,7 +590,7 @@
column = gtk_tree_view_column_new();
renderer = gtk_cell_renderer_pixbuf_new();
- g_object_set_property(G_OBJECT(renderer), stock-size, value);
+ g_object_set(G_OBJECT(renderer), stock-size,
GTK_ICON_SIZE_SMALL_TOOLBAR, NULL);
gtk_tree_view_column_pack_start(column, renderer, FALSE);
gtk_tree_view_column_set_attributes(column, renderer, icon-name, 0,
NULL);
@@ -651,6 +652,10 @@
if(notebook-navigation_bar)
sq_navigation_bar_set_store(notebook-navigation_bar,
NULL);
}
+ if(gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook)) 1)
+ gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), TRUE);
+ else
+ gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
}
static void
@@ -717,7 +722,8 @@
{
GtkWidget *scrolledwindow = sq_notebook_get_active_child(notebook);
GtkTreeIter iter;
- GValue *value = g_new0(GValue, 1);
+ GValue value;
+ memset(value, 0, sizeof(GValue));
GSList *filenames = NULL;
GtkWidget *treeview = gtk_bin_get_child(GTK_BIN(scrolledwindow));
@@ -729,14 +735,11 @@
while(_rows)
{
gtk_tree_model_get_iter(store, iter, _rows-data);
- if(sq_archive_store_get_show_icons(SQ_ARCHIVE_STORE(store)))
- gtk_tree_model_get_value(store, iter, 1, value);
- else
- gtk_tree_model_get_value(store, iter, 0, value);
+ gtk_tree_model_get_value(store, iter, 1, value);
- filenames = g_slist_prepend(filenames, g_strconcat(pwd,
g_value_get_string(value), NULL));
+ filenames = g_slist_prepend(filenames, g_strconcat(pwd,
g_value_get_string(value), NULL));
- g_value_unset(value);
+ g_value_unset((GValue*)value);
_rows = _rows-next;
}
g_list_free(rows);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24369 - squeeze/trunk/libsqueeze
Author: peter
Date: 2007-01-12 12:10:52 + (Fri, 12 Jan 2007)
New Revision: 24369
Modified:
squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
squeeze/trunk/libsqueeze/archive-support-zip.c
Log:
bug #2751 quick fix
added around the archive filename
might need to add escape chars too
Modified: squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
===
--- squeeze/trunk/libsqueeze/archive-support-gnu-tar.c 2007-01-12 11:32:04 UTC
(rev 24368)
+++ squeeze/trunk/libsqueeze/archive-support-gnu-tar.c 2007-01-12 12:10:52 UTC
(rev 24369)
@@ -273,19 +273,19 @@
{
if(!g_strcasecmp(thunar_vfs_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,
NULL);
+ -cf \, archive-path,
\, NULL);
if(!g_strcasecmp(thunar_vfs_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,
NULL);
+ -Zcf \,
archive-path, \, NULL);
if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive-mime_info),
application/x-compressed-tar))
command =
g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive-support)-app_name,
- -zcf , archive-path,
NULL);
+ -zcf \,
archive-path, \, NULL);
if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive-mime_info),
application/x-bzip-compressed-tar))
command =
g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive-support)-app_name,
- -jcf , archive-path,
NULL);
+ -jcf \,
archive-path, \, NULL);
if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive-mime_info),
application/x-tzo))
command =
g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive-support)-app_name,
-
--use-compress-program=lzop -cf , archive-path, NULL);
+
--use-compress-program=lzop -cf \, archive-path, \, NULL);
if(command)
{
if(strlen(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive-support)-_add_mode))
@@ -308,7 +308,7 @@
{
if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive-mime_info),
application/x-tar))
{
- command =
g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive-support)-app_name, -rf ,
archive-path, , archive-files, NULL);
+ command =
g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive-support)-app_name, -rf \,
archive-path, \ , archive-files, NULL);
lsq_execute(command, archive, NULL, NULL, NULL,
NULL);
g_free(command);
return 0;
@@ -317,13 +317,13 @@
g_mkstemp(archive-tmp_file);
g_unlink(archive-tmp_file);
if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive-mime_info),
application/x-tarz))
- command = g_strconcat(uncompress -c ,
archive-path, NULL);
+ command = g_strconcat(uncompress -c \,
archive-path, \, NULL);
if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive-mime_info),
application/x-compressed-tar))
- command = g_strconcat(gunzip -c ,
archive-path, NULL);
+ command = g_strconcat(gunzip -c \,
archive-path, \, NULL);
if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive-mime_info),
application/x-bzip-compressed-tar))
- command = g_strconcat(bunzip2 -c ,
archive-path, NULL);
+ command = g_strconcat(bunzip2 -c \,
archive-path, \, NULL);
if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive-mime_info),
application/x-tzo))
- command = g_strconcat(lzop -dc ,
archive-path, NULL);
+ command = g_strconcat(lzop -dc \,
archive-path, \, NULL);
lsq_execute(command, archive,
lsq_archive_support_gnu_tar_decompress_watch, NULL,
[Xfce4-commits] r24370 - squeeze/trunk/src
Author: peter Date: 2007-01-12 13:51:30 + (Fri, 12 Jan 2007) New Revision: 24370 Modified: squeeze/trunk/src/notebook.c Log: reordable columns Modified: squeeze/trunk/src/notebook.c === --- squeeze/trunk/src/notebook.c2007-01-12 12:10:52 UTC (rev 24369) +++ squeeze/trunk/src/notebook.c2007-01-12 13:51:30 UTC (rev 24370) @@ -617,6 +617,7 @@ } gtk_tree_view_column_set_resizable(column, TRUE); gtk_tree_view_column_set_sort_column_id(column, x+1); + gtk_tree_view_column_set_reorderable(column, TRUE); gtk_tree_view_append_column(treeview, column); } } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24371 - in squeeze/trunk: libsqueeze src
Author: peter
Date: 2007-01-12 15:32:41 + (Fri, 12 Jan 2007)
New Revision: 24371
Modified:
squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
squeeze/trunk/libsqueeze/archive-support-zip.c
squeeze/trunk/src/preferences_dialog.c
Log:
bug #2751 fixed
the archive file is escaped
Modified: squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
===
--- squeeze/trunk/libsqueeze/archive-support-gnu-tar.c 2007-01-12 13:51:30 UTC
(rev 24370)
+++ squeeze/trunk/libsqueeze/archive-support-gnu-tar.c 2007-01-12 15:32:41 UTC
(rev 24371)
@@ -269,23 +269,24 @@
gchar *command = NULL;
archive-files = lsq_concat_filenames(filenames);
lsq_archive_set_status(archive, LSQ_ARCHIVESTATUS_ADD);
+ gchar *archive_path = g_shell_quote(archive-path);
if(!archive-file_info) /* FIXME */
{
if(!g_strcasecmp(thunar_vfs_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,
\, NULL);
+ -cf , archive_path,
NULL);
if(!g_strcasecmp(thunar_vfs_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, \, NULL);
+ -Zcf , archive_path,
NULL);
if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive-mime_info),
application/x-compressed-tar))
command =
g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive-support)-app_name,
- -zcf \,
archive-path, \, NULL);
+ -zcf , archive_path,
NULL);
if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive-mime_info),
application/x-bzip-compressed-tar))
command =
g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive-support)-app_name,
- -jcf \,
archive-path, \, NULL);
+ -jcf , archive_path,
NULL);
if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive-mime_info),
application/x-tzo))
command =
g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive-support)-app_name,
-
--use-compress-program=lzop -cf \, archive-path, \, NULL);
+
--use-compress-program=lzop -cf , archive_path, NULL);
if(command)
{
if(strlen(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive-support)-_add_mode))
@@ -308,31 +309,33 @@
{
if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive-mime_info),
application/x-tar))
{
- command =
g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive-support)-app_name, -rf \,
archive-path, \ , archive-files, NULL);
+ command =
g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive-support)-app_name, -rf ,
archive_path, , archive-files, NULL);
lsq_execute(command, archive, NULL, NULL, NULL,
NULL);
g_free(command);
+ g_free(archive_path);
return 0;
}
archive-tmp_file = g_strconcat(lsq_tmp_dir,
/squeeze-XX , NULL);
g_mkstemp(archive-tmp_file);
g_unlink(archive-tmp_file);
if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive-mime_info),
application/x-tarz))
- command = g_strconcat(uncompress -c \,
archive-path, \, NULL);
+ command = g_strconcat(uncompress -c ,
archive_path, NULL);
if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive-mime_info),
application/x-compressed-tar))
- command = g_strconcat(gunzip -c \,
archive-path, \, NULL);
+ command = g_strconcat(gunzip -c ,
archive_path, NULL);
if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive-mime_info),
application/x-bzip-compressed-tar))
- command = g_strconcat(bunzip2 -c \,
archive-path, \, NULL);
+ command =
[Xfce4-commits] r24373 - in xfwm4/trunk: src themes/daloa themes/mopti
Author: olivier
Date: 2007-01-12 17:43:36 + (Fri, 12 Jan 2007)
New Revision: 24373
Modified:
xfwm4/trunk/src/events.c
xfwm4/trunk/themes/daloa/Makefile.in
xfwm4/trunk/themes/mopti/Makefile.in
Log:
Use screen from xevent instead of client for keypress (Bug #2749)
Modified: xfwm4/trunk/src/events.c
===
--- xfwm4/trunk/src/events.c2007-01-12 16:25:27 UTC (rev 24372)
+++ xfwm4/trunk/src/events.c2007-01-12 17:43:36 UTC (rev 24373)
@@ -375,11 +375,18 @@
handleKeyPress (DisplayInfo *display_info, XKeyEvent * ev)
{
ScreenInfo *screen_info;
+ScreenInfo *ev_screen_info;
Client *c;
int key;
TRACE (entering handleKeyEvent);
+ev_screen_info = myDisplayGetScreenFromRoot (display_info, ev-root);
+if (!ev_screen_info)
+{
+return;
+}
+
c = clientGetFocus ();
if (c)
{
@@ -498,19 +505,13 @@
}
else
{
-screen_info = myDisplayGetScreenFromRoot (display_info, ev-root);
-if (!screen_info)
-{
-return;
-}
-
-key = getKeyPressed (screen_info, ev);
+key = getKeyPressed (ev_screen_info, ev);
switch (key)
{
case KEY_CYCLE_WINDOWS:
-if (screen_info-clients)
+if (ev_screen_info-clients)
{
-clientCycle (screen_info-clients-prev, (XEvent *) ev);
+clientCycle (ev_screen_info-clients-prev, (XEvent *) ev);
}
break;
case KEY_CLOSE_WINDOW:
@@ -523,35 +524,32 @@
break;
}
}
-/*
- Here we know that screen_info is defined, otherwise, we would
- already have returned...
- */
+
switch (key)
{
case KEY_NEXT_WORKSPACE:
-workspaceSwitch (screen_info, screen_info-current_ws + 1, NULL,
TRUE, ev-time);
+workspaceSwitch (ev_screen_info, ev_screen_info-current_ws + 1,
NULL, TRUE, ev-time);
break;
case KEY_PREV_WORKSPACE:
-workspaceSwitch (screen_info, screen_info-current_ws - 1, NULL,
TRUE, ev-time);
+workspaceSwitch (ev_screen_info, ev_screen_info-current_ws - 1,
NULL, TRUE, ev-time);
break;
case KEY_UP_WORKSPACE:
-workspaceMove(screen_info, -1, 0, NULL, ev-time);
+workspaceMove(ev_screen_info, -1, 0, NULL, ev-time);
break;
case KEY_DOWN_WORKSPACE:
-workspaceMove(screen_info, 1, 0, NULL, ev-time);
+workspaceMove(ev_screen_info, 1, 0, NULL, ev-time);
break;
case KEY_LEFT_WORKSPACE:
-workspaceMove(screen_info, 0, -1, NULL, ev-time);
+workspaceMove(ev_screen_info, 0, -1, NULL, ev-time);
break;
case KEY_RIGHT_WORKSPACE:
-workspaceMove(screen_info, 0, 1, NULL, ev-time);
+workspaceMove(ev_screen_info, 0, 1, NULL, ev-time);
break;
case KEY_ADD_WORKSPACE:
-workspaceSetCount (screen_info, screen_info-workspace_count + 1);
+workspaceSetCount (ev_screen_info, ev_screen_info-workspace_count
+ 1);
break;
case KEY_DEL_WORKSPACE:
-workspaceSetCount (screen_info, screen_info-workspace_count - 1);
+workspaceSetCount (ev_screen_info, ev_screen_info-workspace_count
- 1);
break;
case KEY_WORKSPACE_1:
case KEY_WORKSPACE_2:
@@ -565,13 +563,13 @@
case KEY_WORKSPACE_10:
case KEY_WORKSPACE_11:
case KEY_WORKSPACE_12:
-if (key - KEY_WORKSPACE_1 screen_info-workspace_count)
+if (key - KEY_WORKSPACE_1 ev_screen_info-workspace_count)
{
-workspaceSwitch (screen_info, key - KEY_WORKSPACE_1, NULL,
TRUE, ev-time);
+workspaceSwitch (ev_screen_info, key - KEY_WORKSPACE_1, NULL,
TRUE, ev-time);
}
break;
case KEY_SHOW_DESKTOP:
-toggle_show_desktop (screen_info);
+toggle_show_desktop (ev_screen_info);
break;
default:
break;
Modified: xfwm4/trunk/themes/daloa/Makefile.in
===
--- xfwm4/trunk/themes/daloa/Makefile.in2007-01-12 16:25:27 UTC (rev
24372)
+++ xfwm4/trunk/themes/daloa/Makefile.in2007-01-12 17:43:36 UTC (rev
24373)
@@ -97,7 +97,6 @@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
-GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
@@ -206,15 +205,18 @@
XFCE_MCS_MANAGER_VERSION = @XFCE_MCS_MANAGER_VERSION@
XGETTEXT = @XGETTEXT@
XGETTEXT_ARGS = @XGETTEXT_ARGS@
-XMKMF = @XMKMF@
XSYNC_LIBS = @XSYNC_LIBS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS =
[Xfce4-commits] r24374 - in squeeze/trunk: icons/scalable libsqueeze po src
Author: stephan
Date: 2007-01-12 18:13:37 + (Fri, 12 Jan 2007)
New Revision: 24374
Added:
squeeze/trunk/po/squeeze.pot
Modified:
squeeze/trunk/icons/scalable/Makefile.am
squeeze/trunk/libsqueeze/libsqueeze.c
squeeze/trunk/libsqueeze/libsqueeze.h
squeeze/trunk/po/cs.po
squeeze/trunk/po/fi.po
squeeze/trunk/po/nl.po
squeeze/trunk/src/new_dialog.c
squeeze/trunk/src/new_dialog.h
Log:
added Squeeze.pot to svn (why did i forget that?)
Modified: squeeze/trunk/icons/scalable/Makefile.am
===
--- squeeze/trunk/icons/scalable/Makefile.am2007-01-12 17:43:36 UTC (rev
24373)
+++ squeeze/trunk/icons/scalable/Makefile.am2007-01-12 18:13:37 UTC (rev
24374)
@@ -6,4 +6,3 @@
EXTRA_DIST = $(icons_DATA)
-
Modified: squeeze/trunk/libsqueeze/libsqueeze.c
===
--- squeeze/trunk/libsqueeze/libsqueeze.c 2007-01-12 17:43:36 UTC (rev
24373)
+++ squeeze/trunk/libsqueeze/libsqueeze.c 2007-01-12 18:13:37 UTC (rev
24374)
@@ -115,3 +115,29 @@
g_object_unref(archive);
}
+/**
+ * Some nice support functions should come for this
+ *
+ */
+GSList *
+lsq_get_supported_mime_types()
+{
+ GSList *mime_types_list = NULL;
+ LSQArchiveSupport *archive_support = NULL;
+ GSList *supported_mime_types_list = NULL;
+ GSList *archive_support_list = lsq_archive_support_list;
+
+ while(archive_support_list)
+ {
+ archive_support = archive_support_list-data;
+ supported_mime_types_list = archive_support-mime;
+ while(supported_mime_types_list)
+ {
+ mime_types_list = g_slist_prepend(mime_types_list,
supported_mime_types_list-data);
+
+ supported_mime_types_list =
g_slist_next(supported_mime_types_list);
+ }
+ archive_support_list = g_slist_next(archive_support_list);
+ }
+ return mime_types_list;
+}
Modified: squeeze/trunk/libsqueeze/libsqueeze.h
===
--- squeeze/trunk/libsqueeze/libsqueeze.h 2007-01-12 17:43:36 UTC (rev
24373)
+++ squeeze/trunk/libsqueeze/libsqueeze.h 2007-01-12 18:13:37 UTC (rev
24374)
@@ -78,6 +78,9 @@
void
lsq_convert_mime_to_icon_name(GtkIconTheme *icon_theme, GValue *value);
+GSList *
+lsq_get_supported_mime_types();
+
G_END_DECLS
#endif /* __LIBSQUEEZE_H__ */
Modified: squeeze/trunk/po/cs.po
===
--- squeeze/trunk/po/cs.po 2007-01-12 17:43:36 UTC (rev 24373)
+++ squeeze/trunk/po/cs.po 2007-01-12 18:13:37 UTC (rev 24374)
@@ -7,7 +7,7 @@
msgstr
Project-Id-Version: Squeeze 0.0.1-svn-r24156\n
Report-Msgid-Bugs-To: [EMAIL PROTECTED]
-POT-Creation-Date: 2006-12-21 19:57+0100\n
+POT-Creation-Date: 2007-01-12 18:08+0100\n
PO-Revision-Date: 2006-12-21 20:30+0100\n
Last-Translator: Michal Várady [EMAIL PROTECTED]\n
Language-Team: Czech [EMAIL PROTECTED]\n
@@ -16,143 +16,143 @@
Content-Transfer-Encoding: 8bit\n
Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n=2 n=4) ? 1 : 2;\n
-#: ../libsqueeze/archive.c:411
+#: ../libsqueeze/archive.c:438 ../src/preferences_dialog.c:283
msgid Filename
msgstr Název souboru
-#: ../libsqueeze/archive.c:414
+#: ../libsqueeze/archive.c:441
msgid Mime type
msgstr Typ MIME
-#: ../libsqueeze/archive.c:1301
+#: ../libsqueeze/archive.c:1347
msgid Initializing archive
msgstr Inicializuji archiv
-#: ../libsqueeze/archive.c:1304
+#: ../libsqueeze/archive.c:1350
msgid Refreshing archive contents
msgstr Znovu načítám obsah archivu
-#: ../libsqueeze/archive.c:1307
+#: ../libsqueeze/archive.c:1353
msgid Adding file(s) to archive
msgstr Přidávám soubor(y) z archivu
-#: ../libsqueeze/archive.c:1310
+#: ../libsqueeze/archive.c:1356
msgid Extracting file(s) from archive
msgstr Rozbaluji soubor(y) z archivu
-#: ../libsqueeze/archive.c:1313
+#: ../libsqueeze/archive.c:1359
msgid Removing file(s) from archive
msgstr Odebírám soubor(y) z archivu
-#: ../libsqueeze/archive.c:1316
+#: ../libsqueeze/archive.c:1362
msgid Done
msgstr Hotovo
-#: ../libsqueeze/archive.c:1319
+#: ../libsqueeze/archive.c:1365
msgid Performing an extended action
msgstr Provádí se rozšířená funkce
-#: ../libsqueeze/archive.c:1322
+#: ../libsqueeze/archive.c:1368
msgid Cancelled
msgstr Zrušeno
-#: ../libsqueeze/archive.c:1325
+#: ../libsqueeze/archive.c:1371
msgid Error
msgstr Chyba
-#: ../libsqueeze/archive-support-gnu-tar.c:155
-#: ../libsqueeze/archive-support-zip.c:138
+#: ../libsqueeze/archive-support-gnu-tar.c:156
+#: ../libsqueeze/archive-support-zip.c:137
msgid Overwrite existing files
msgstr Přepsat existující soubory
-#: ../libsqueeze/archive-support-gnu-tar.c:156
-#: ../libsqueeze/archive-support-zip.c:139
+#: ../libsqueeze/archive-support-gnu-tar.c:157
[Xfce4-commits] r24375 - in thunar/trunk: . thunar-vfs
Author: benny
Date: 2007-01-12 18:51:05 + (Fri, 12 Jan 2007)
New Revision: 24375
Modified:
thunar/trunk/ChangeLog
thunar/trunk/thunar-vfs/thunar-vfs-io-local-xfer.c
thunar/trunk/thunar-vfs/thunar-vfs-transfer-job.c
Log:
2007-01-12 Benedikt Meurer [EMAIL PROTECTED]
* thunar-vfs/thunar-vfs-io-local-xfer.c(tvilx_copy_regular): Drop
unused variable.
* thunar-vfs/thunar-vfs-transfer-job.c: Properly report errors if
copying a file fails for some reason. Also fix a memory leak that
wasn't detected previously.
Modified: thunar/trunk/ChangeLog
===
--- thunar/trunk/ChangeLog 2007-01-12 18:13:37 UTC (rev 24374)
+++ thunar/trunk/ChangeLog 2007-01-12 18:51:05 UTC (rev 24375)
@@ -1,5 +1,13 @@
2007-01-12 Benedikt Meurer [EMAIL PROTECTED]
+ * thunar-vfs/thunar-vfs-io-local-xfer.c(tvilx_copy_regular): Drop
+ unused variable.
+ * thunar-vfs/thunar-vfs-transfer-job.c: Properly report errors if
+ copying a file fails for some reason. Also fix a memory leak that
+ wasn't detected previously.
+
+2007-01-12 Benedikt Meurer [EMAIL PROTECTED]
+
* thunar/thunar-window.c: Finally fix crash on platforms where
sizeof(GType) != sizeof(gint). Bug #2726.
Modified: thunar/trunk/thunar-vfs/thunar-vfs-io-local-xfer.c
===
--- thunar/trunk/thunar-vfs/thunar-vfs-io-local-xfer.c 2007-01-12 18:13:37 UTC
(rev 24374)
+++ thunar/trunk/thunar-vfs/thunar-vfs-io-local-xfer.c 2007-01-12 18:51:05 UTC
(rev 24375)
@@ -1,6 +1,6 @@
/* $Id$ */
/*-
- * Copyright (c) 2005-2006 Benedikt Meurer [EMAIL PROTECTED]
+ * Copyright (c) 2005-2007 Benedikt Meurer [EMAIL PROTECTED]
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -154,7 +154,6 @@
gchar *display_name;
gchar *buffer;
gsize bufsize;
- gsize completed;
gint source_fd;
gint target_fd;
gint n, m, l;
@@ -258,7 +257,7 @@
buffer = g_new (gchar, bufsize);
/* copy the data from the source file to the target file */
- for (completed = 0; completed source_statb-st_size; )
+ for (;;)
{
/* read a chunk from the source file */
n = read (source_fd, buffer, bufsize);
Modified: thunar/trunk/thunar-vfs/thunar-vfs-transfer-job.c
===
--- thunar/trunk/thunar-vfs/thunar-vfs-transfer-job.c 2007-01-12 18:13:37 UTC
(rev 24374)
+++ thunar/trunk/thunar-vfs/thunar-vfs-transfer-job.c 2007-01-12 18:51:05 UTC
(rev 24375)
@@ -1,6 +1,6 @@
/* $Id$ */
/*-
- * Copyright (c) 2005-2006 Benedikt Meurer [EMAIL PROTECTED]
+ * Copyright (c) 2005-2007 Benedikt Meurer [EMAIL PROTECTED]
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -54,7 +54,8 @@
ThunarVfsTransferNode *transfer_node,
ThunarVfsPath *target_path,
ThunarVfsPath *target_parent_path,
- GList
**target_path_list_return);
+ GList
**target_path_list_return,
+ GError
**error);
static void thunar_vfs_transfer_node_free
(ThunarVfsTransferNode *transfer_node);
static gboolean thunar_vfs_transfer_node_collect
(ThunarVfsTransferNode *transfer_node,
ThunarVfsFileSize *total_size_return,
@@ -215,7 +216,7 @@
break;
/* copy the file for this node */
- thunar_vfs_transfer_job_node_copy (transfer_job, sp-data, tp-data,
NULL, new_files_list);
+ thunar_vfs_transfer_job_node_copy (transfer_job, sp-data, tp-data,
NULL, new_files_list, err);
}
}
@@ -331,7 +332,8 @@
ThunarVfsTransferNode *transfer_node,
ThunarVfsPath *target_path,
ThunarVfsPath *target_parent_path,
- GList
**target_path_list_return)
+ GList
**target_path_list_return,
+ GError **error)
{
ThunarVfsPath *target_path_return;
[Xfce4-commits] r24376 - squeeze/trunk
Author: stephan Date: 2007-01-12 19:38:31 + (Fri, 12 Jan 2007) New Revision: 24376 Modified: squeeze/trunk/squeeze.desktop.in squeeze/trunk/squeeze.tap Log: Applied patch from Bjoern Martensen [EMAIL PROTECTED], fixes bug 2747 Modified: squeeze/trunk/squeeze.desktop.in === --- squeeze/trunk/squeeze.desktop.in2007-01-12 18:51:05 UTC (rev 24375) +++ squeeze/trunk/squeeze.desktop.in2007-01-12 19:38:31 UTC (rev 24376) @@ -11,4 +11,4 @@ X-MultipleArgs=false Categories=GTK;Archiving;Utility; StartupNotify=true -MimeType=application/x-bzip-compressed-tar;application/x-tar;application/x-compressed-tar;application/x-tzo;application/x-tarz;application/x-zip;application/zip; +MimeType=application/x-bzip-compressed-tar;application/x-bzip2-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-tarz;application/x-tzo;application/x-zip;application/x-zip-compressed;application/zip; Modified: squeeze/trunk/squeeze.tap === --- squeeze/trunk/squeeze.tap 2007-01-12 18:51:05 UTC (rev 24375) +++ squeeze/trunk/squeeze.tap 2007-01-12 19:38:31 UTC (rev 24376) @@ -30,7 +30,7 @@ # check the action case $action in create) - exec squeeze --new $@ + exec squeeze --new=$@ ;; extract-here) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24378 - in squeeze/trunk: . src
Author: peter
Date: 2007-01-12 21:34:09 + (Fri, 12 Jan 2007)
New Revision: 24378
Modified:
squeeze/trunk/TODO
squeeze/trunk/src/archive_store.c
squeeze/trunk/src/notebook.c
Log:
segfault in sort fixed
TODO update
Modified: squeeze/trunk/TODO
===
--- squeeze/trunk/TODO 2007-01-12 20:06:11 UTC (rev 24377)
+++ squeeze/trunk/TODO 2007-01-12 21:34:09 UTC (rev 24378)
@@ -1,4 +1,27 @@
+---
+| ROAD MAP ROAD MAP |
+---
+0.1:
+ Save settings
+ Add settings to menu
+ Documentation
+ Website
+ A few support objects
+ Test custom action
+
+0.2:
+ Settings dialog
+ Bug fixes
+ More support objects
+ Improve custom action system
+
+0.3:
+ Review libsqueeze
+ Make support objects plugins
+
+---
+
Summary:
... a lot
Modified: squeeze/trunk/src/archive_store.c
===
--- squeeze/trunk/src/archive_store.c 2007-01-12 20:06:11 UTC (rev 24377)
+++ squeeze/trunk/src/archive_store.c 2007-01-12 21:34:09 UTC (rev 24378)
@@ -806,6 +806,16 @@
switch(lsq_archive_get_entry_property_type(archive, column))
{
case G_TYPE_STRING:
+ if(g_value_get_string(prop_a) == NULL)
+ {
+ retval = -1;
+ break;
+ }
+ if(g_value_get_string(prop_b) == NULL)
+ {
+ retval = 1;
+ break;
+ }
switch(store-props._sort_case_sensitive)
{
case 0: /* case insensitive */
Modified: squeeze/trunk/src/notebook.c
===
--- squeeze/trunk/src/notebook.c2007-01-12 20:06:11 UTC (rev 24377)
+++ squeeze/trunk/src/notebook.c2007-01-12 21:34:09 UTC (rev 24378)
@@ -598,6 +598,7 @@
gtk_tree_view_column_pack_start(column, renderer, TRUE);
gtk_tree_view_column_set_attributes(column, renderer, text,
LSQ_ARCHIVE_PROP_FILENAME + 1, NULL);
+ gtk_tree_view_column_set_resizable(column, TRUE);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_column_set_sort_column_id(column,
LSQ_ARCHIVE_PROP_FILENAME + 1);
gtk_tree_view_column_set_title(column,
lsq_archive_get_entry_property_name(archive, LSQ_ARCHIVE_PROP_FILENAME));
@@ -617,7 +618,6 @@
}
gtk_tree_view_column_set_resizable(column, TRUE);
gtk_tree_view_column_set_sort_column_id(column, x+1);
- gtk_tree_view_column_set_reorderable(column, TRUE);
gtk_tree_view_append_column(treeview, column);
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24379 - squeeze/trunk
Author: stephan Date: 2007-01-12 21:38:30 + (Fri, 12 Jan 2007) New Revision: 24379 Modified: squeeze/trunk/TODO Log: removed old data from TODO Modified: squeeze/trunk/TODO === --- squeeze/trunk/TODO 2007-01-12 21:34:09 UTC (rev 24378) +++ squeeze/trunk/TODO 2007-01-12 21:38:30 UTC (rev 24379) @@ -1,4 +1,3 @@ - --- | ROAD MAP ROAD MAP | --- @@ -21,83 +20,3 @@ Make support objects plugins --- - -Summary: - ... a lot - -Long Version: - -| IMPORTANT IMPORTANT | - - Make thunar-vfs dependency optional. - Make libxfce4-util dependency optional. - - Add Accelerators to Notebook - - Add Dialog - - New Dialog - - Open Dialog - - MenuBar - - Settings support - - DnD - - Non-default actions - - Comment library functions -(explain their purpose) - - Increase performance - - Implement multi-threading (for libarchive support) - - In archive store, on delete in parent dir of current entry, check if map still exists, if not move to the ancestor that still exists - - In treeview, when going to up dir, select the dir you came from - - When retrieving selected items from the treeview, forget the updir item - Add trailing '/' to folder filenames when getting it from treeview - - Add 'View' support, with internal optional internal or external viewer. - - Let Tab-labels change style on archive-status. - - Add progressbar to statusbar. - - Support CustomActionProperties (custom-actions which require additional arguments and configuration) Make them class actions insteadof instance actions structs - - An Archive should only be opened once - - Check to see if the [] and [] of the pathbar needs point in the other direction when TEXT_DIR_RTL is set - -temporary files abstract - - ... Complete TODO-file - -BUGS: - - Archive does not get freed properly. (mem usage keeps growing when opening and closing same archive) - - History inside the archive-store is bugged. This shows in archive_store_get_pwd. - - archive-store out-of-sync is buffer-flush... breaks on index 499800: 499800.0 / 300.0 (buffer-size) == 1666.0 remaining 199 items are not flushed - - entire buffer is emptied into array - - seems fixed, is a signed/unsigned conversion error. (is only a part of the problem) - -DONE: - - Fix navigation-bars to work with notebook - DONE - - Close Buttons - DONE - - Fix Command-line options - DONE - - Toggle navigationbar at runtime - DONE - - Save trailing folders for path_bar - DONE ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24380 - in squeeze/trunk: libsqueeze src
Author: peter
Date: 2007-01-12 23:32:33 + (Fri, 12 Jan 2007)
New Revision: 24380
Modified:
squeeze/trunk/libsqueeze/archive-support-zip.c
squeeze/trunk/libsqueeze/archive-support.c
squeeze/trunk/libsqueeze/archive-support.h
squeeze/trunk/src/widget_factory.c
Log:
made posible for zip integrity test to notify the user about the results
the integrity test has still to by run, though :)
Modified: squeeze/trunk/libsqueeze/archive-support-zip.c
===
--- squeeze/trunk/libsqueeze/archive-support-zip.c 2007-01-12 21:38:30 UTC
(rev 24379)
+++ squeeze/trunk/libsqueeze/archive-support-zip.c 2007-01-12 23:32:33 UTC
(rev 24380)
@@ -63,7 +63,7 @@
static gint lsq_archive_support_zip_remove(LSQArchive *, GSList *);
static gint lsq_archive_support_zip_refresh(LSQArchive *);
-static gboolean lsq_archive_support_zip_integrity_test(LSQArchiveSupport *,
LSQArchive *, gpointer);
+static gboolean lsq_archive_support_zip_integrity_test(LSQArchiveSupport *,
LSQArchive *, LSQCustomAction*, gpointer);
GType
lsq_archive_support_zip_get_type ()
@@ -496,13 +496,15 @@
}
static gboolean
-lsq_archive_support_zip_integrity_test(LSQArchiveSupport *support, LSQArchive
*archive, gpointer user_data)
+lsq_archive_support_zip_integrity_test(LSQArchiveSupport *support, LSQArchive
*archive, LSQCustomAction *action, gpointer user_data)
{
#ifdef DEBUG
g_debug(Custom action %s called, __FUNCTION__);
#endif /* DEBUG */
- return FALSE;
+ lsq_custom_action_notify(action, Integrity test completed);
+
+ return TRUE;
}
static void
Modified: squeeze/trunk/libsqueeze/archive-support.c
===
--- squeeze/trunk/libsqueeze/archive-support.c 2007-01-12 21:38:30 UTC (rev
24379)
+++ squeeze/trunk/libsqueeze/archive-support.c 2007-01-12 23:32:33 UTC (rev
24380)
@@ -351,5 +351,18 @@
}
/* set post-condition-callback */
action-post_func = post_func;
- action-func(action-support, archive, action-user_data);
+ action-func(action-support, archive, action, action-user_data);
}
+
+void
+lsq_custom_action_notify(LSQCustomAction *action, const gchar *message)
+{
+ action-notify_func(action-support-id, message, action-user_data);
+}
+
+void
+lsq_custom_action_set_notify_function(LSQCustomAction *action,
LSQCustomActionNotifyFunc func, gpointer user_data)
+{
+ action-notify_func = func;
+ action-notify_user_data = user_data;
+}
Modified: squeeze/trunk/libsqueeze/archive-support.h
===
--- squeeze/trunk/libsqueeze/archive-support.h 2007-01-12 21:38:30 UTC (rev
24379)
+++ squeeze/trunk/libsqueeze/archive-support.h 2007-01-12 23:32:33 UTC (rev
24380)
@@ -45,8 +45,9 @@
typedef struct _LSQArchiveSupport LSQArchiveSupport;
typedef gboolean (*LSQCustomActionPreFunc) (LSQCustomAction *);
-typedef gboolean (*LSQCustomActionFunc) (LSQArchiveSupport *support,
LSQArchive *, gpointer user_data);
+typedef gboolean (*LSQCustomActionFunc) (LSQArchiveSupport *support,
LSQArchive *, LSQCustomAction*, gpointer user_data);
typedef gboolean (*LSQCustomActionPostFunc) (LSQCustomAction *, gboolean);
+typedef gboolean (*LSQCustomActionNotifyFunc) (const gchar*, const gchar*,
gpointer);
struct _LSQCustomAction
{
@@ -56,6 +57,8 @@
gchar *icon;
LSQCustomActionFunc func;
LSQCustomActionPostFunc post_func;
+ LSQCustomActionNotifyFunc notify_func;
+ gpointer notify_user_data;
LSQArchiveSupport *support;
gpointer user_data;
};
@@ -126,6 +129,8 @@
const gchar* lsq_custom_action_get_blurb(LSQCustomAction*);
const gchar* lsq_custom_action_get_icon_name(LSQCustomAction*);
void lsq_custom_action_execute(LSQCustomAction*, LSQArchive *,
LSQCustomActionPreFunc, LSQCustomActionPostFunc);
+void lsq_custom_action_notify(LSQCustomAction*, const gchar*);
+void lsq_custom_action_set_notify_function(LSQCustomAction*,
LSQCustomActionNotifyFunc, gpointer);
G_END_DECLS
Modified: squeeze/trunk/src/widget_factory.c
===
--- squeeze/trunk/src/widget_factory.c 2007-01-12 21:38:30 UTC (rev 24379)
+++ squeeze/trunk/src/widget_factory.c 2007-01-12 23:32:33 UTC (rev 24380)
@@ -71,6 +71,9 @@
static void
cb_sq_widget_factory_action_triggered(GtkWidget *widget, gpointer user_data);
+static void
+sq_widget_factory_notify(const gchar *name, const gchar *message, gpointer
user_data);
+
GType
sq_widget_factory_get_type()
{
@@ -961,6 +964,7 @@
{
if(strncmp(menu, lsq_custom_action_get_name(action[i]), 4) ==
0)
{
+ lsq_custom_action_set_notify_function(action[i],
(LSQCustomActionNotifyFunc)sq_widget_factory_notify, NULL);
