Commit 1343cfef authored by Paolo Bacchilega's avatar Paolo Bacchilega
Browse files

Ported to GSettings

The port basically works, there are only two remaining issues:

1) at start-up time two critical messages are printed when trying to
set a value but I couldn't find out why, the message is the following:
g_source_get_context: assertion `!SOURCE_DESTROYED (source)' failed

2) The Nautilus port to GSettings is required in order to connect to the
correct "single click policy" key.
parent c9748591
......@@ -10,10 +10,10 @@ AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADER([config.h])
GNOME_COMMON_INIT
AC_PROG_CC
AM_DISABLE_STATIC
AC_PROG_LIBTOOL
GLIB_GSETTINGS
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
......@@ -129,14 +129,6 @@ AM_CONDITIONAL(ENABLE_DEPRECATIONS, test "x$enable_deprecations" = xyes)
dnl ******************************
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
if test x"$GCONFTOOL" = xno; then
AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
fi
AM_GCONF_SOURCE_2
dnl ******************************
NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
AC_SUBST(NAUTILUS_EXTENSION_DIR)
......
@INTLTOOL_DESKTOP_RULE@
SUBDIRS = ui icons
desktopdir = $(datadir)/applications
desktop_in_in_files = file-roller.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
desktopdir = $(datadir)/applications
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
matchdir = $(datadir)/file-roller
match_DATA = packages.match
schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_DATA = file-roller.schemas
gsettings_SCHEMAS = org.gnome.file-roller.gschema.xml
@GSETTINGS_RULES@
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
install-data-local:
if GCONF_SCHEMAS_INSTALL
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
endif
install-data-hook: update-icon-cache
uninstall-hook: update-icon-cache
update-icon-cache:
install-data-hook: update-cache
uninstall-hook: update-cache
update-cache:
if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
$(gtk_update_icon_cache); \
......@@ -32,15 +25,13 @@ update-icon-cache:
echo "*** $(gtk_update_icon_cache)"; \
fi
EXTRA_DIST = \
$(desktop_in_in_files) \
$(desktop_in_files) \
$(desktop_DATA) \
packages.match.in \
packages.match \
$(schema_DATA)
$(gsettings_SCHEMAS)
DISTCLEANFILES = \
$(desktop_in_files) \
......
<?xml version="1.0"?>
<gconfschemafile>
<schemalist>
<schema>
<key>/schemas/apps/file-roller/listing/sort_method</key>
<applyto>/apps/file-roller/listing/sort_method</applyto>
<key>/schemas/apps/file-roller/listing/sort-method</key>
<applyto>/apps/file-roller/listing/sort-method</applyto>
<owner>file-roller</owner>
<type>string</type>
<default>name</default>
<locale name="C">
<short>How to sort files</short>
<long>What criteria must be used to arrange files. Possible values:
name, size, type, time, path.
</long>
<long>What criteria must be used to arrange files. Possible values: name, size, type, time, path.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/listing/sort_type</key>
<applyto>/apps/file-roller/listing/sort_type</applyto>
<key>/schemas/apps/file-roller/listing/sort-type</key>
<applyto>/apps/file-roller/listing/sort-type</applyto>
<owner>file-roller</owner>
<type>string</type>
<default>ascending</default>
<locale name="C">
<short>Sort type</short>
<long>Whether to sort in ascending or descending direction. Possible
values: ascending, descending.</long>
<long>Whether to sort in ascending or descending direction. Possible values: ascending, descending.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/listing/list_mode</key>
<applyto>/apps/file-roller/listing/list_mode</applyto>
<key>/schemas/apps/file-roller/listing/list-mode</key>
<applyto>/apps/file-roller/listing/list-mode</applyto>
<owner>file-roller</owner>
<type>string</type>
<default>as_folder</default>
<locale name="C">
<short>List Mode</short>
<long>Whether to view all files in the archive (all_files), or
view the archive as a folder (as_folder).</long>
<long>Whether to view all files in the archive (all_files), or view the archive as a folder (as_folder).</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/listing/show_type</key>
<applyto>/apps/file-roller/listing/show_type</applyto>
<key>/schemas/apps/file-roller/listing/show-type</key>
<applyto>/apps/file-roller/listing/show-type</applyto>
<owner>file-roller</owner>
<type>bool</type>
<default>true</default>
......@@ -52,10 +45,9 @@
<long>Display the Type column in the main window.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/listing/show_size</key>
<applyto>/apps/file-roller/listing/show_size</applyto>
<key>/schemas/apps/file-roller/listing/show-size</key>
<applyto>/apps/file-roller/listing/show-size</applyto>
<owner>file-roller</owner>
<type>bool</type>
<default>true</default>
......@@ -64,10 +56,9 @@
<long>Display the Size column in the main window.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/listing/show_time</key>
<applyto>/apps/file-roller/listing/show_time</applyto>
<key>/schemas/apps/file-roller/listing/show-time</key>
<applyto>/apps/file-roller/listing/show-time</applyto>
<owner>file-roller</owner>
<type>bool</type>
<default>true</default>
......@@ -76,10 +67,9 @@
<long>Display the Time column in the main window.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/listing/show_path</key>
<applyto>/apps/file-roller/listing/show_path</applyto>
<key>/schemas/apps/file-roller/listing/show-path</key>
<applyto>/apps/file-roller/listing/show-path</applyto>
<owner>file-roller</owner>
<type>bool</type>
<default>true</default>
......@@ -88,24 +78,20 @@
<long>Display the Path column in the main window.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/listing/use_mime_icons</key>
<applyto>/apps/file-roller/listing/use_mime_icons</applyto>
<key>/schemas/apps/file-roller/listing/use-mime-icons</key>
<applyto>/apps/file-roller/listing/use-mime-icons</applyto>
<owner>file-roller</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Use mime icons</short>
<long>if TRUE will display icons depending on the file type (slower),
otherwise will use always the same icon for all files (faster).
</long>
<long>if TRUE will display icons depending on the file type (slower), otherwise will use always the same icon for all files (faster).</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/listing/name_column_width</key>
<applyto>/apps/file-roller/listing/name_column_width</applyto>
<key>/schemas/apps/file-roller/listing/name-column-width</key>
<applyto>/apps/file-roller/listing/name-column-width</applyto>
<owner>file-roller</owner>
<type>int</type>
<default>250</default>
......@@ -114,10 +100,9 @@
<long>The default width ofthe name column the file list.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/ui/history_len</key>
<applyto>/apps/file-roller/ui/history_len</applyto>
<key>/schemas/apps/file-roller/ui/history-len</key>
<applyto>/apps/file-roller/ui/history-len</applyto>
<owner>file-roller</owner>
<type>int</type>
<default>5</default>
......@@ -126,49 +111,42 @@
<long>Max number of items in the Open Recents menu.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/ui/window_width</key>
<applyto>/apps/file-roller/ui/window_width</applyto>
<key>/schemas/apps/file-roller/ui/window-width</key>
<applyto>/apps/file-roller/ui/window-width</applyto>
<owner>file-roller</owner>
<type>int</type>
<default>600</default>
<locale name="C">
<short></short>
<long>
</long>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/ui/window_height</key>
<applyto>/apps/file-roller/ui/window_height</applyto>
<key>/schemas/apps/file-roller/ui/window-height</key>
<applyto>/apps/file-roller/ui/window-height</applyto>
<owner>file-roller</owner>
<type>int</type>
<default>480</default>
<locale name="C">
<short></short>
<long>
</long>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/ui/sidebar_width</key>
<applyto>/apps/file-roller/ui/sidebar_width</applyto>
<key>/schemas/apps/file-roller/ui/sidebar-width</key>
<applyto>/apps/file-roller/ui/sidebar-width</applyto>
<owner>file-roller</owner>
<type>int</type>
<default>200</default>
<locale name="C">
<short></short>
<long>
</long>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/ui/view_toolbar</key>
<applyto>/apps/file-roller/ui/view_toolbar</applyto>
<key>/schemas/apps/file-roller/ui/view-toolbar</key>
<applyto>/apps/file-roller/ui/view-toolbar</applyto>
<owner>file-roller</owner>
<type>bool</type>
<default>true</default>
......@@ -177,10 +155,9 @@
<long>Whether to display the toolbar.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/ui/view_statusbar</key>
<applyto>/apps/file-roller/ui/view_statusbar</applyto>
<key>/schemas/apps/file-roller/ui/view-statusbar</key>
<applyto>/apps/file-roller/ui/view-statusbar</applyto>
<owner>file-roller</owner>
<type>bool</type>
<default>true</default>
......@@ -189,10 +166,9 @@
<long>Whether to display the statusbar.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/ui/view_folders</key>
<applyto>/apps/file-roller/ui/view_folders</applyto>
<key>/schemas/apps/file-roller/ui/view-folders</key>
<applyto>/apps/file-roller/ui/view-folders</applyto>
<owner>file-roller</owner>
<type>bool</type>
<default>false</default>
......@@ -201,7 +177,6 @@
<long>Whether to display the folders pane.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/general/editors</key>
<applyto>/apps/file-roller/general/editors</applyto>
......@@ -211,27 +186,23 @@
<default>[]</default>
<locale name="C">
<short>Editors</short>
<long>List of applications entered in the Open file dialog and not
associated with the file type.</long>
<long>List of applications entered in the Open file dialog and not associated with the file type.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/general/compression_level</key>
<applyto>/apps/file-roller/general/compression_level</applyto>
<key>/schemas/apps/file-roller/general/compression-level</key>
<applyto>/apps/file-roller/general/compression-level</applyto>
<owner>file-roller</owner>
<type>string</type>
<default>normal</default>
<locale name="C">
<short>Compression level</short>
<long>Compression level used when adding files to an archive.
Possible values : very_fast, fast, normal, maximum.</long>
<long>Compression level used when adding files to an archive. Possible values : very_fast, fast, normal, maximum.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/general/encrypt_header</key>
<applyto>/apps/file-roller/general/encrypt_header</applyto>
<key>/schemas/apps/file-roller/general/encrypt-header</key>
<applyto>/apps/file-roller/general/encrypt-header</applyto>
<owner>file-roller</owner>
<type>bool</type>
<default>false</default>
......@@ -240,20 +211,17 @@
<long>Whether to encrypt the archive header. If the header is encrypted the password will be required to list the archive content as well.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/general/migrate_directories</key>
<applyto>/apps/file-roller/general/migrate_directories</applyto>
<key>/schemas/apps/file-roller/general/migrate-directories</key>
<applyto>/apps/file-roller/general/migrate-directories</applyto>
<owner>gthumb</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long>
</long>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/dialogs/extract/overwrite</key>
<applyto>/apps/file-roller/dialogs/extract/overwrite</applyto>
......@@ -265,10 +233,9 @@
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/dialogs/extract/skip_newer</key>
<applyto>/apps/file-roller/dialogs/extract/skip_newer</applyto>
<key>/schemas/apps/file-roller/dialogs/extract/skip-newer</key>
<applyto>/apps/file-roller/dialogs/extract/skip-newer</applyto>
<owner>file-roller</owner>
<type>bool</type>
<default>false</default>
......@@ -277,10 +244,9 @@
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/dialogs/extract/recreate_folders</key>
<applyto>/apps/file-roller/dialogs/extract/recreate_folders</applyto>
<key>/schemas/apps/file-roller/dialogs/extract/recreate-folders</key>
<applyto>/apps/file-roller/dialogs/extract/recreate-folders</applyto>
<owner>file-roller</owner>
<type>bool</type>
<default>true</default>
......@@ -289,10 +255,9 @@
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/dialogs/add/current_folder</key>
<applyto>/apps/file-roller/dialogs/add/current_folder</applyto>
<key>/schemas/apps/file-roller/dialogs/add/current-folder</key>
<applyto>/apps/file-roller/dialogs/add/current-folder</applyto>
<owner>file-roller</owner>
<type>string</type>
<default></default>
......@@ -301,7 +266,6 @@
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/dialogs/add/filename</key>
<applyto>/apps/file-roller/dialogs/add/filename</applyto>
......@@ -313,10 +277,9 @@
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/dialogs/add/include_files</key>
<applyto>/apps/file-roller/dialogs/add/include_files</applyto>
<key>/schemas/apps/file-roller/dialogs/add/include-files</key>
<applyto>/apps/file-roller/dialogs/add/include-files</applyto>
<owner>file-roller</owner>
<type>string</type>
<default></default>
......@@ -325,10 +288,9 @@
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/dialogs/add/exclude_files</key>
<applyto>/apps/file-roller/dialogs/add/exclude_files</applyto>
<key>/schemas/apps/file-roller/dialogs/add/exclude-files</key>
<applyto>/apps/file-roller/dialogs/add/exclude-files</applyto>
<owner>file-roller</owner>
<type>string</type>
<default></default>
......@@ -337,10 +299,9 @@
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/dialogs/add/exclude_folders</key>
<applyto>/apps/file-roller/dialogs/add/exclude_folders</applyto>
<key>/schemas/apps/file-roller/dialogs/add/exclude-folders</key>
<applyto>/apps/file-roller/dialogs/add/exclude-folders</applyto>
<owner>file-roller</owner>
<type>string</type>
<default></default>
......@@ -349,7 +310,6 @@
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/dialogs/extract/update</key>
<applyto>/apps/file-roller/dialogs/extract/update</applyto>
......@@ -361,7 +321,6 @@
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/dialogs/extract/recursive</key>
<applyto>/apps/file-roller/dialogs/extract/recursive</applyto>
......@@ -373,10 +332,9 @@
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/dialogs/extract/no_symlinks</key>
<applyto>/apps/file-roller/dialogs/extract/no_symlinks</applyto>
<key>/schemas/apps/file-roller/dialogs/extract/no-symlinks</key>
<applyto>/apps/file-roller/dialogs/extract/no-symlinks</applyto>
<owner>file-roller</owner>
<type>bool</type>
<default>false</default>
......@@ -385,10 +343,9 @@
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/dialogs/batch-add/default_extension</key>
<applyto>/apps/file-roller/dialogs/batch-add/default_extension</applyto>
<key>/schemas/apps/file-roller/dialogs/batch-add/default-extension</key>
<applyto>/apps/file-roller/dialogs/batch-add/default-extension</applyto>
<owner>file-roller</owner>
<type>string</type>
<default>.tar.gz</default>
......@@ -397,10 +354,9 @@
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/dialogs/batch-add/other_options</key>
<applyto>/apps/file-roller/dialogs/batch-add/other_options</applyto>
<key>/schemas/apps/file-roller/dialogs/batch-add/other-options</key>
<applyto>/apps/file-roller/dialogs/batch-add/other-options</applyto>
<owner>file-roller</owner>
<type>bool</type>
<default>false</default>
......@@ -409,10 +365,9 @@
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/file-roller/dialogs/batch-add/volume_size</key>
<applyto>/apps/file-roller/dialogs/batch-add/volume_size</applyto>
<key>/schemas/apps/file-roller/dialogs/batch-add/volume-size</key>
<applyto>/apps/file-roller/dialogs/batch-add/volume-size</applyto>
<owner>file-roller</owner>
<type>int</type>
<default>0</default>
......@@ -421,6 +376,5 @@
<long>The default size for volumes.</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>
<schemalist>
<enum id="org.gnome.file-roller.sort-method">
<value nick="name" value="0"/>
<value nick="size" value="1"/>
<value nick="type" value="2"/>
<value nick="time" value="3"/>
<value nick="path" value="4"/>
</enum>
<enum id="org.gnome.file-roller.sort-type">
<value nick="ascending" value="0"/>
<value nick="descending" value="1"/>
</enum>
<enum id="org.gnome.file-roller.list-mode">
<value nick="all-files" value="0"/>
<value nick="as-folder" value="1"/>
</enum>
<enum id="org.gnome.file-roller.compression-level">
<value nick="very-fast" value="0"/>
<value nick="fast" value="1"/>
<value nick="normal" value="2"/>
<value nick="maximum" value="3"/>
</enum>
<schema id="org.gnome.file-roller" path="/apps/file-roller/">
<child name="listing" schema="org.gnome.file-roller.listing"/>
<child name="ui" schema="org.gnome.file-roller.ui"/>
<child name="general" schema="org.gnome.file-roller.general"/>
<child name="dialogs" schema="org.gnome.file-roller.dialogs"/>
</schema>
<schema id="org.gnome.file-roller.listing" path="/apps/file-roller/listing/">
<key name="sort-method" enum="org.gnome.file-roller.sort-method">
<default>'name'</default>
<summary>How to sort files</summary>
<description>What criteria must be used to arrange files. Possible values: name, size, type, time, path.</description>
</key>
<key name="sort-type" enum="org.gnome.file-roller.sort-type">
<default>'ascending'</default>
<summary>Sort type</summary>
<description>Whether to sort in ascending or descending direction. Possible values: ascending, descending.</description>
</key>
<key name="list-mode" enum="org.gnome.file-roller.list-mode">
<default>'as-folder'</default>
<summary>List Mode</summary>
<description>Use "all-files" to view all the files in the archive in a single list, use "as-folder" to navigate the archive as a folder.</description>
</key>
<key name="show-type" type="b">
<default>true</default>
<summary>Display type</summary>
<description>Display the Type column in the main window.</description>
</key>
<key name="show-size" type="b">
<default>true</default>
<summary>Display size</summary>
<description>Display the Size column in the main window.</description>
</key>
<key name="show-time" type="b">
<default>true</default>
<summary>Display time</summary>
<description>Display the Time column in the main window.</description>
</key>
<key name="show-path" type="b">
<default>true</default>
<summary>Display path</summary>
<description>Display the Path column in the main window.</description>
</key>
<key name="use-mime-icons" type="b">
<default>true</default>
<summary>Use mime icons</summary>
<description>if TRUE will display icons depending on the file type (slower), otherwise will use always the same icon for all files (faster).</description>
</key>
<key name="name-column-width" type="i">
<default>250</default>
<summary>Name column width</summary>
<description>The default width ofthe name column the file list.</description>
</key>
</schema>
<schema id="org.gnome.file-roller.ui" path="/apps/file-roller/ui/">
<key name="history-len" type="i">
<default>5</default>
<summary>Max history length</summary>
<description>Max number of items in the Open Recents menu.</description>
</key>
<key name="window-width" type="i">
<default>600</default>
</key>
<key name="window-height" type="i">
<default>480</default>
</key>
<key name="sidebar-width" type="i">
<default>200</default>
</key>
<key name="view-toolbar" type="b">
<default>true</default>
<summary>View toolbar</summary>
<description>Whether to display the toolbar.</description>
</key>
<key name="view-statusbar" type="b">
<default>true</default>
<summary>View statusbar</summary>
<description>Whether to display the statusbar.</description>
</key>
<key name="view-folders" type="b">
<default>false</default>
<summary>View the folders pane</summary>
<description>Whether to display the folders pane.</description>
</key>
</schema>
<schema id="org.gnome.file-roller.general" path="/apps/file-roller/general/">
<key name="editors" type=