--- gnome-mount-0.8.orig/debian/rules +++ gnome-mount-0.8/debian/rules @@ -0,0 +1,16 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_CONFIGURE_EXTRA_FLAGS := --enable-nautilus-extension +DEB_DH_MAKESHLIBS_ARGS_ALL := -Xlibgnome-mount +DEB_DH_SHLIBDEPS_ARGS := -Xlibgnome-mount +DEB_INSTALL_DOCS_ALL := AUTHORS NEWS README +LDFLAGS += -Wl,--as-needed + +binary-install/gnome-mount:: + rm -f debian/gnome-mount/usr/lib/nautilus/extensions-*/libgnome-mount.la + rm -f debian/gnome-mount/usr/lib/nautilus/extensions-*/libgnome-mount.a --- gnome-mount-0.8.orig/debian/changelog +++ gnome-mount-0.8/debian/changelog @@ -0,0 +1,114 @@ +gnome-mount (0.8-2ubuntu1) karmic; urgency=low + + * Merge to Debian; remaining Ubuntu changes: + - debian/rules: Ignore libgnome-mount for dh_shlibdeps, so that + gnome-mount does not end up depending on half of Gnome just for the + nautilus extension. This keeps it suitable for XFCE. + - debian/control: Add dependency to policykit-gnome. + - Various patches, see their patch headers: + + 01_missing_include.patch + + 02_typos.patch + + 03_mount_point_configuration.patch + + 05_ignore_slash_label.patch + + 08_crypto_setup_error_dialog.patch + + 09_use_window_for_flushing.patch + + ubuntu-default-mount-options.patch + + -- Martin Pitt Tue, 28 Apr 2009 13:07:59 +0200 + +gnome-mount (0.8-2) unstable; urgency=low + + * Upload to unstable. + * debian/control + - Bump Standards-Version to 3.8.1. No further changes. + - Bump Build-Depends on debhelper to (>= 7). + * debian/compat + - Bump debhelper compat level to 7. + + -- Michael Biebl Tue, 07 Apr 2009 20:40:41 +0200 + +gnome-mount (0.8-1) experimental; urgency=low + + * New upstream release with support for the new nautilus extension API. + Closes: #480992, #475229 + * debian/control + - Add Build-Depends on pkg-config. + - Add Build-Depends on libglib2.0-dev (>= 2.15.0) for GIO/GVFS support. + - Add Build-Depends on libgconf2-dev. + - Bump Build-Depends on libnautilus-extension-dev to (>= 2.21.2). + - Remove Build-Depends on libeel2-dev and libgnomeui-dev. + - Add Suggests on ntfs-3g. gnome-mount uses ntfs-3g by default for NTFS + partitions. + * debian/copyright + - Update download location. + * debian/rules + - Cleanup *.{a,la} files in the new nautilus extensions directory. + + -- Michael Biebl Wed, 21 May 2008 00:32:31 +0200 + +gnome-mount (0.7-2) unstable; urgency=low + + * debian/control + - The Vcs-* fields are now officially supported, so remove the XS- prefix. + - Bump Standards-Version to 3.7.3. No further changes required. + - Use the "Homepage:" field to specify the upstream URL. + - Fix a few capitalization errors in the package description. + + -- Michael Biebl Fri, 11 Jan 2008 01:44:57 +0100 + +gnome-mount (0.7-1) unstable; urgency=low + + * New upstream release. + - Don't flood ~/.xsession-errors with debug messages. Closes: #443457 + * debian/control + - Add build dependency on autotools-dev for up-to-date config.{guess,sub} + files. + * debian/watch + - Updated to new download location. + + -- Michael Biebl Wed, 17 Oct 2007 18:23:05 +0200 + +gnome-mount (0.6-1) unstable; urgency=low + + * New upstream release. + * debian/patches/01-missing_includes.patch + - Removed. Fixed upstream. + + -- Michael Biebl Wed, 11 Apr 2007 01:11:08 +0200 + +gnome-mount (0.5-3) unstable; urgency=low + + * debian/control + - Add an explicit build dependency on libeel2-dev (>= 2.5.0). + - Add XS-Vcs-* fields. + - Replace Recommends: cryptsetup with Suggests. + * debian/rules + - Pass "-Wl,--as-needed" to LDFLAGS. + + -- Michael Biebl Fri, 27 Oct 2006 14:02:16 +0200 + +gnome-mount (0.5-2) unstable; urgency=low + + * debian/control + - Add Depends on hal and eject. + - Add a Recommends on cryptsetup for luks encrypted partitions. + - Update maintainer email address to biebl@debian.org. + * debian/patches/01-missing_includes.patch + - Added, fixes implicit pointer conversions. Closes: #393553 + + -- Michael Biebl Wed, 18 Oct 2006 18:37:45 +0200 + +gnome-mount (0.5-1) unstable; urgency=low + + * New upstream release. + * Added build dependency on libnotify-dev (>= 0.3.0). + * Tightened build dependency on libhal-storage-dev (>= 0.5.8.1). + + -- Michael Biebl Wed, 20 Sep 2006 00:59:21 +0200 + +gnome-mount (0.4-1) unstable; urgency=low + + * Initial release. Closes: #387208 + + -- Michael Biebl Wed, 13 Sep 2006 01:43:19 +0200 + --- gnome-mount-0.8.orig/debian/watch +++ gnome-mount-0.8/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://hal.freedesktop.org/releases/gnome-mount-(.*)\.tar\.gz --- gnome-mount-0.8.orig/debian/copyright +++ gnome-mount-0.8/debian/copyright @@ -0,0 +1,32 @@ +This package was debianized by Michael Biebl on +Tue, 15 Aug 2006 23:58:34 +0200. + +It was downloaded from http://hal.freedesktop.org/releases/ + +Upstream Author: + David Zeuthen + +Copyright: + Copyright (C) 2006 David Zeuthen, + +License: + + This package 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 Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2006, Michael Biebl and +is licensed under the GPL, see above. --- gnome-mount-0.8.orig/debian/compat +++ gnome-mount-0.8/debian/compat @@ -0,0 +1 @@ +7 --- gnome-mount-0.8.orig/debian/links +++ gnome-mount-0.8/debian/links @@ -0,0 +1,2 @@ +/usr/share/man/man1/gnome-mount.1.gz usr/share/man/man1/gnome-umount.1.gz +/usr/share/man/man1/gnome-mount.1.gz usr/share/man/man1/gnome-eject.1.gz --- gnome-mount-0.8.orig/debian/control +++ gnome-mount-0.8/debian/control @@ -0,0 +1,29 @@ +Source: gnome-mount +Section: gnome +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Michael Biebl +Build-Depends: cdbs, debhelper (>= 7), autotools-dev, pkg-config, libgnome-keyring-dev (>= 0.4), libdbus-1-dev (>= 0.60), libdbus-glib-1-dev (>= 0.60), libhal-storage-dev (>= 0.5.8.1), libgtk2.0-dev (>= 2.8.0), libglade2-dev, libxml-parser-perl, libnautilus-extension-dev (>= 2.21.2), libnotify-dev (>= 0.3.0), libglib2.0-dev (>= 2.15.0), libgconf2-dev +Standards-Version: 3.8.1 +Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/gnome-mount +Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/gnome-mount +Homepage: http://svn.gnome.org/viewvc/gnome-mount/trunk/ + +Package: gnome-mount +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, hal, eject, policykit-gnome +Suggests: cryptsetup, ntfs-3g +Enhances: nautilus +Description: wrapper for (un)mounting and ejecting storage devices + The gnome-mount package contains programs for mounting, unmounting and + ejecting storage devices. The goal for gnome-mount is to get the appropriate + GNOME software (such as gnome-volume-manager and GnomeVFS) to use his method + instead of invoking mount/umount/eject or direct HAL invoking methods. + . + All the gnome-mount programs utilize the methods on HAL and as such run + unprivileged. The rationale for gnome-mount is to have a centralized place (in + GConf) where settings (e.g. mount options and mount locations) are maintained. + . + A nautilus extension allows to easily change the mount options which can be + user, drive or volume specific. + --- gnome-mount-0.8.orig/debian/patches/ubuntu-default-mount-options.patch +++ gnome-mount-0.8/debian/patches/ubuntu-default-mount-options.patch @@ -0,0 +1,65 @@ +# Description: Change a few default mount options for compatibility to UTF8 and previous Ubuntu versions. +--- gnome-mount-0.8~svn20080225/gnome-mount.schemas.in 2007-08-01 02:49:20.000000000 +0200 ++++ gnome-mount-0.8~svn20080225.new/gnome-mount.schemas.in 2008-03-05 15:30:05.000000000 +0100 +@@ -6,7 +6,7 @@ + /system/storage/default_options/vfat/mount_options + list + string +- [shortname=lower,uid=] ++ [shortname=mixed,uid=,utf8,umask=077,exec,flush] + + Default mount options for vfat fs + A list of default mount options for volumes formatted with the vfat file system. +@@ -18,7 +18,7 @@ + /system/storage/default_options/iso9660/mount_options + list + string +- [uid=] ++ [uid=,utf8,exec] + + Default mount options for iso9660 fs + A list of default mount options for volumes formatted with the iso9660 file system. +@@ -30,7 +30,7 @@ + /system/storage/default_options/udf/mount_options + list + string +- [uid=] ++ [uid=,exec] + + Default mount options for udf fs + A list of default mount options for volumes formatted with the udf file system. +@@ -42,7 +42,7 @@ + /system/storage/default_options/ntfs/mount_options + list + string +- [umask=222] ++ [umask=222,utf8,exec] + + Default mount options for ntfs fs + A list of default mount options for volumes formatted with the ntfs file system. +@@ -64,13 +64,23 @@ + /system/storage/default_options/ntfs-3g/mount_options + list + string +- [locale=] ++ [locale=,exec] + + Default mount options for ntfs-3g fs + A list of default mount options for volumes formatted with the ntfs file system using ntfs-3g. + + + +- ++ ++ /schemas/system/storage/default_options/hfs/mount_options ++ /system/storage/default_options/hfs/mount_options ++ list ++ string ++ [uid=,] ++ ++ Default mount options for hfs fs ++ A list of default mount options for volumes formatted with the hfs file system. ++ ++ + + --- gnome-mount-0.8.orig/debian/patches/05_ignore_slash_label.patch +++ gnome-mount-0.8/debian/patches/05_ignore_slash_label.patch @@ -0,0 +1,13 @@ +# Description: If the label is a single '/', ignore it, so that it does not end up as /media/_ +# Ubuntu: https://launchpad.net/bugs/83323 +--- a/src/gnome-mount.c 2007-03-09 17:53:55.000000000 +0100 ++++ b/src/gnome-mount.c 2007-03-09 17:56:42.000000000 +0100 +@@ -1467,7 +1467,7 @@ + if (volume != NULL) { + const char *label; + label = libhal_volume_get_label (volume); +- if (label != NULL) { ++ if (label != NULL && strcmp(label, "/") != 0) { + int n; + + mount_point = g_strdup (label); --- gnome-mount-0.8.orig/debian/patches/01_missing_include.patch +++ gnome-mount-0.8/debian/patches/01_missing_include.patch @@ -0,0 +1,13 @@ +# Description: Add missing include to fix FTBFS +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=514946 + +--- gnome-mount-0.8~svn20080225/src/gnome-mount.c 2008-02-25 22:15:27.000000000 +0100 ++++ gnome-mount-0.8~svn20080225.new/src/gnome-mount.c 2008-03-05 15:29:30.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include + #include --- gnome-mount-0.8.orig/debian/patches/08_crypto_setup_error_dialog.patch +++ gnome-mount-0.8/debian/patches/08_crypto_setup_error_dialog.patch @@ -0,0 +1,53 @@ +# Description: If setup_crypto() fails with Crypto.SetupError, display an error dialog instead of failing silently. Special-case a missing /sbin/cryptsetup, suggest to install the package. +# Ubuntu: https://launchpad.net/bugs/78358, +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=426326 +--- a/src/gnome-mount.c ++++ b/src/gnome-mount.c +@@ -454,6 +454,39 @@ + } + } + ++static void ++show_error_dialog_setup_crypto (const char *udi, LibHalVolume *volume, LibHalDrive *drive, ++ const char *error_name, const char *error_detail) ++{ ++ GtkWidget *w; ++ ++ if (!opt_noui) { ++ w = gtk_message_dialog_new (NULL, ++ GTK_DIALOG_MODAL, ++ GTK_MESSAGE_ERROR, ++ GTK_BUTTONS_CLOSE, ++ _("Unable to set up crypto device")); ++ ++ if (strcmp (error_name, "org.freedesktop.Hal.Device.Volume.Crypto.SetupError") == 0 && ++ strstr (error_detail, "cryptsetup not found")) { ++ gtk_message_dialog_format_secondary_text ( ++ GTK_MESSAGE_DIALOG (w), ++ _("You need to install the cryptsetup package.")); ++ } else { ++ ++ /* copout fallback; show exception name */ ++ ++ gtk_message_dialog_format_secondary_markup ( ++ GTK_MESSAGE_DIALOG (w), ++ _("Error %s\n\n%s"), ++ error_name, error_detail); ++ } ++ ++ gtk_dialog_run (GTK_DIALOG (w)); ++ gtk_widget_unref (w); ++ } ++} ++ + + /** Integrate a dbus mainloop. + * +@@ -2268,6 +2301,7 @@ + if (strcmp (error.name, "org.freedesktop.Hal.Device.Volume.Crypto.SetupPasswordError") == 0) { + *password_error = TRUE; + } ++ show_error_dialog_setup_crypto(udi, volume, drive, error.name, error.message); + dbus_error_free (&error); + goto out; + } --- gnome-mount-0.8.orig/debian/patches/09_use_window_for_flushing.patch +++ gnome-mount-0.8/debian/patches/09_use_window_for_flushing.patch @@ -0,0 +1,192 @@ +# Description: Use an alert window for flushing instead of notifications. Ubuntu's notify-osd does not support infinite timeouts, thus we cannot use notifications. +# Ubuntu: https://launchpad.net/bugs/332600 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=573915 +--- gnome-mount-0.8/src/gnome-mount.c 2009-03-17 12:18:21.320203571 +0100 ++++ gnome-mount-0.8.new/src/gnome-mount.c 2009-03-17 12:37:13.208201193 +0100 +@@ -1583,16 +1583,115 @@ + + static guint unmount_cache_timeout_id = -1; + +-static NotifyNotification *unmount_note = NULL; ++static GtkWidget *unmount_flush_window = NULL; ++static GtkWidget *unmount_flush_label_top = NULL; ++static GtkWidget *unmount_flush_label_bottom = NULL; ++static GtkWidget *unmount_flush_progress = NULL; + + static gboolean unmount_note_is_eject = FALSE; + static char *unmount_note_drive_name = NULL; + ++static gboolean ++unmount_cache_progress_func (gpointer data) ++{ ++ if (!GTK_WIDGET_VISIBLE (unmount_flush_progress)) ++ return FALSE; ++ ++ gtk_progress_bar_pulse (unmount_flush_progress); ++ g_main_context_iteration (NULL, FALSE); ++ return TRUE; ++} ++ + static void +-unmount_note_close_func (NotifyNotification *note, gpointer user_data) ++create_unmount_flush_window () + { +- g_debug ("in unmount_note_close_func()"); +- unmount_note = NULL; ++ GtkWidget *vbox1, *vbox2; ++ GtkWidget *table1; ++ GtkWidget *icon; ++ gint win_width, win_height; ++ ++ unmount_flush_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); ++ gtk_window_set_title (GTK_WINDOW (unmount_flush_window), unmount_note_drive_name); ++ gtk_window_set_resizable (GTK_WINDOW (unmount_flush_window), FALSE); ++ gtk_window_set_focus_on_map (GTK_WINDOW (unmount_flush_window), FALSE); ++ gtk_window_set_icon_name (GTK_WINDOW (unmount_flush_window), "gnome-dev-harddisk"); ++ ++ gtk_window_set_position (GTK_WINDOW (unmount_flush_window), GTK_WIN_POS_CENTER_ALWAYS); ++ /* alternate implementation: make window appear in the lower right corner */ ++ /* ++ gtk_window_set_gravity (GTK_WINDOW (unmount_flush_window), GDK_GRAVITY_SOUTH_EAST); ++ gtk_window_move (GTK_WINDOW (unmount_flush_window), ++ gdk_screen_width(), gdk_screen_height()); ++ */ ++ ++ vbox1 = gtk_vbox_new (FALSE, 0); ++ gtk_container_add (GTK_CONTAINER (unmount_flush_window), vbox1); ++ ++ table1 = gtk_table_new (2, 3, FALSE); ++ gtk_box_pack_start (GTK_BOX (vbox1), table1, FALSE, FALSE, 0); ++ gtk_container_set_border_width (GTK_CONTAINER (table1), 12); ++ ++ vbox2 = gtk_vbox_new (FALSE, 0); ++ gtk_table_attach (GTK_TABLE (table1), vbox2, 2, 3, 0, 1, ++ (GtkAttachOptions) (GTK_FILL), ++ (GtkAttachOptions) (GTK_FILL), 0, 0); ++ ++ unmount_flush_label_top = gtk_label_new (_("Writing data to device")); ++ gtk_label_set_line_wrap (GTK_LABEL (unmount_flush_label_top), TRUE); ++ gtk_box_pack_start (GTK_BOX (vbox2), unmount_flush_label_top, FALSE, FALSE, 0); ++ gtk_misc_set_alignment (GTK_MISC (unmount_flush_label_top), 0, 0); ++ ++ unmount_flush_progress = gtk_progress_bar_new (); ++ gtk_box_pack_start (GTK_BOX (vbox2), unmount_flush_progress, FALSE, FALSE, 6); ++ ++ unmount_flush_label_bottom = gtk_label_new (_("To prevent data loss, wait until this has finished before disconnecting.")); ++ gtk_table_attach (GTK_TABLE (table1), unmount_flush_label_bottom, 2, 3, 1, 2, ++ (GtkAttachOptions) (GTK_FILL), ++ (GtkAttachOptions) (0), 0, 0); ++ gtk_label_set_line_wrap (GTK_LABEL (unmount_flush_label_bottom), TRUE); ++ gtk_misc_set_alignment (GTK_MISC (unmount_flush_label_bottom), 0, 0.5); ++ gtk_label_set_width_chars (GTK_LABEL (unmount_flush_label_bottom), 40); ++ ++ icon = gtk_image_new_from_icon_name ("gnome-dev-harddisk", /* TODO: use appropriate icon */ ++ GTK_ICON_SIZE_DIALOG); ++ ++ gtk_table_attach (GTK_TABLE (table1), icon, 0, 1, 0, 1, ++ (GtkAttachOptions) (0), ++ (GtkAttachOptions) (0), 0, 0); ++ gtk_misc_set_alignment (GTK_MISC (icon), 0, 0.5); ++ gtk_misc_set_padding (GTK_MISC (icon), 12, 12); ++ ++ gtk_widget_show_all (unmount_flush_window); ++ /* do not show a close button; gtk_window_set_deletable() doesn't work at least under compiz :-( */ ++ gdk_window_set_functions (unmount_flush_window->window, GDK_FUNC_MOVE|GDK_FUNC_MINIMIZE); ++ ++ /* prevent window from being auto-resized in finish_unmount_flush_window() */ ++ gtk_window_get_size (GTK_WINDOW (unmount_flush_window), &win_width, &win_height); ++ gtk_widget_set_size_request (unmount_flush_window, win_width, win_height); ++ gtk_window_resize (GTK_WINDOW (unmount_flush_window), win_width, win_height); ++ ++ /* timer for updating progress bar */ ++ g_timeout_add (100, unmount_cache_progress_func, NULL); ++} ++ ++static void ++finish_unmount_flush_window () ++{ ++ gchar* message; ++ int delay; ++ ++ message = g_strdup_printf (_("The device %s is now safe to remove."), ++ unmount_note_drive_name); ++ gtk_label_set_text(unmount_flush_label_top, message); ++ gtk_widget_hide (unmount_flush_label_bottom); ++ gtk_widget_hide (unmount_flush_progress); ++ ++ /* wait 4 seconds, then hide the dialog */ ++ for (delay = 40; delay; --delay) { ++ g_main_context_iteration (NULL, FALSE); ++ usleep(100000); ++ } ++ gtk_widget_hide(unmount_flush_window); + } + + static gboolean +@@ -1600,31 +1699,9 @@ + { + char *drive_name = data; + +-#ifdef ENABLE_NOTIFY +- if (!opt_noui) { +- char *summary; +- char *message; ++ if (!opt_noui) ++ create_unmount_flush_window(); + +- g_debug ("putting up Flushing Cache notification"); +- +- summary = _("Writing data to device"); +- message = g_strdup_printf (_("There is data that needs to be written to the device %s before it can be removed. Please do not remove the media or disconnect the drive."), unmount_note_drive_name); +- unmount_note = notify_notification_new (summary, +- message, +- "gnome-dev-harddisk", /* TODO: use appropriate icon */ +- NULL); +- if (unmount_note == NULL) { +- g_warning ("Cannot create note for unmount cache sync"); +- } else { +- notify_notification_set_timeout (unmount_note, NOTIFY_EXPIRES_NEVER); +- g_signal_connect (unmount_note, "closed", G_CALLBACK (unmount_note_close_func), NULL); +- notify_notification_show (unmount_note, NULL); +- +- } +- g_free (message); +- } +-#endif +- + return FALSE; + } + +@@ -1636,30 +1713,19 @@ + g_strchug (unmount_note_drive_name); + g_debug ("Setting up 750ms timer for Flushing Cache dialog"); + unmount_cache_timeout_id = g_timeout_add (750, unmount_cache_timeout_func, NULL); +- unmount_note = NULL; + } + + static void + unmount_cache_timeout_cancel (gboolean was_success) + { + g_source_remove (unmount_cache_timeout_id); +- if (unmount_note != NULL) { ++ if (unmount_flush_window != NULL) { + if (was_success) { + char *summary; + char *message; + + g_debug ("Updating Flushing Cache notification"); +- +- summary = _("Device is now safe to remove"); +- message = g_strdup_printf (_("The device %s is now safe to remove."), +- unmount_note_drive_name); +- notify_notification_update (unmount_note, +- summary, +- message, +- "gnome-dev-harddisk"); /* TODO: use appropriate icon */ +- g_free (message); +- notify_notification_set_timeout (unmount_note, NOTIFY_EXPIRES_DEFAULT); +- notify_notification_show (unmount_note, NULL); ++ finish_unmount_flush_window(); + } + } + } --- gnome-mount-0.8.orig/debian/patches/02_typos.patch +++ gnome-mount-0.8/debian/patches/02_typos.patch @@ -0,0 +1,406 @@ +# Description: Fix two typos in the glade file. +# Ubuntu: https://launchpad.net/bugs/266896 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=574032 +--- gnome-mount-0.8/po/ar.po 2008-02-25 19:10:56.000000000 +0100 ++++ gnome-mount-0.8.new/po/ar.po 2009-03-04 10:00:56.759643662 +0100 +@@ -492,8 +492,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "تؤثر إعدادات المشغل في كل الأجزاء المدرجة في\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/be@latin.po gnome-mount-0.8.new/po/be@latin.po +--- gnome-mount-0.8/po/be@latin.po 2007-10-11 19:41:33.000000000 +0200 ++++ gnome-mount-0.8.new/po/be@latin.po 2009-03-04 10:00:56.771620673 +0100 +@@ -515,8 +515,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "Źmieny dla pryvodu datyčać usich usunutych\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/be.po gnome-mount-0.8.new/po/be.po +--- gnome-mount-0.8/po/be.po 2007-08-01 02:49:20.000000000 +0200 ++++ gnome-mount-0.8.new/po/be.po 2009-03-04 10:00:56.779629024 +0100 +@@ -401,8 +401,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "Настаўленні прыстасавання уплываюць на ўсе\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/ca.po gnome-mount-0.8.new/po/ca.po +--- gnome-mount-0.8/po/ca.po 2007-08-01 02:49:20.000000000 +0200 ++++ gnome-mount-0.8.new/po/ca.po 2009-03-04 10:00:56.787640447 +0100 +@@ -516,8 +516,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "Les preferències per a una unitat afecten a tots els\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/da.po gnome-mount-0.8.new/po/da.po +--- gnome-mount-0.8/po/da.po 2007-08-01 02:49:20.000000000 +0200 ++++ gnome-mount-0.8.new/po/da.po 2009-03-04 10:00:56.799639878 +0100 +@@ -460,8 +460,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "Instillinger for et drev vedrører alle enheder der\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/dz.po gnome-mount-0.8.new/po/dz.po +--- gnome-mount-0.8/po/dz.po 2007-08-01 02:49:20.000000000 +0200 ++++ gnome-mount-0.8.new/po/dz.po 2009-03-04 10:00:56.811640985 +0100 +@@ -469,8 +469,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "འདྲེན་འཕྲུལ་སྒྲིག་སྟངས་ཀྱིས་ \n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/el.po gnome-mount-0.8.new/po/el.po +--- gnome-mount-0.8/po/el.po 2008-04-07 18:43:48.000000000 +0200 ++++ gnome-mount-0.8.new/po/el.po 2009-03-04 10:00:56.819638859 +0100 +@@ -531,8 +531,8 @@ + #: ../src/gnome-mount-properties.glade.h:18 + #, fuzzy + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + " Ρυθμίσεις για a όλα in για\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/en_GB.po gnome-mount-0.8.new/po/en_GB.po +--- gnome-mount-0.8/po/en_GB.po 2008-04-07 18:43:48.000000000 +0200 ++++ gnome-mount-0.8.new/po/en_GB.po 2009-03-04 10:00:56.827638689 +0100 +@@ -516,12 +516,12 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + + #: ../src/gnome-mount-properties-view.c:571 +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/es.po gnome-mount-0.8.new/po/es.po +--- gnome-mount-0.8/po/es.po 2008-04-16 20:17:10.000000000 +0200 ++++ gnome-mount-0.8.new/po/es.po 2009-03-04 10:00:56.835639567 +0100 +@@ -527,8 +527,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "La configuración de una unidad afecta a todos los\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/fi.po gnome-mount-0.8.new/po/fi.po +--- gnome-mount-0.8/po/fi.po 2008-04-07 18:43:48.000000000 +0200 ++++ gnome-mount-0.8.new/po/fi.po 2009-03-04 10:00:56.843639328 +0100 +@@ -510,8 +510,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "Aseman asetukset vaikuttavat kaikkiin asemaan laitettuihin\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/fr.po gnome-mount-0.8.new/po/fr.po +--- gnome-mount-0.8/po/fr.po 2007-08-31 03:26:11.000000000 +0200 ++++ gnome-mount-0.8.new/po/fr.po 2009-03-04 10:00:56.851638879 +0100 +@@ -522,8 +522,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "La configuration d'un lecteur affecte tous les sous-volumes " +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/hu.po gnome-mount-0.8.new/po/hu.po +--- gnome-mount-0.8/po/hu.po 2008-04-07 18:43:48.000000000 +0200 ++++ gnome-mount-0.8.new/po/hu.po 2009-03-04 10:00:56.863635238 +0100 +@@ -521,8 +521,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "Egy meghajtó beállításai minden kötetet érintenek\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/it.po gnome-mount-0.8.new/po/it.po +--- gnome-mount-0.8/po/it.po 2008-04-07 18:43:48.000000000 +0200 ++++ gnome-mount-0.8.new/po/it.po 2009-03-04 10:00:56.871638560 +0100 +@@ -537,8 +537,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "Le impostazioni per una unità hanno effetto su tutti i volumi\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/ja.po gnome-mount-0.8.new/po/ja.po +--- gnome-mount-0.8/po/ja.po 2007-08-01 02:49:20.000000000 +0200 ++++ gnome-mount-0.8.new/po/ja.po 2009-03-04 10:00:56.879639019 +0100 +@@ -512,8 +512,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "このドライブへの設定はドライブに挿入した\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/lv.po gnome-mount-0.8.new/po/lv.po +--- gnome-mount-0.8/po/lv.po 2007-08-01 02:49:20.000000000 +0200 ++++ gnome-mount-0.8.new/po/lv.po 2009-03-04 10:00:56.887638990 +0100 +@@ -508,8 +508,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + " Uzstādījumi priekš datu ierīces iespaido visus sējumus, kuri " +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/mk.po gnome-mount-0.8.new/po/mk.po +--- gnome-mount-0.8/po/mk.po 2007-08-01 02:49:20.000000000 +0200 ++++ gnome-mount-0.8.new/po/mk.po 2009-03-04 10:00:56.899638840 +0100 +@@ -378,12 +378,12 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + + #: ../src/gnome-mount-properties-view.c:524 +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/nb.po gnome-mount-0.8.new/po/nb.po +--- gnome-mount-0.8/po/nb.po 2007-08-01 02:49:20.000000000 +0200 ++++ gnome-mount-0.8.new/po/nb.po 2009-03-04 10:00:56.903639000 +0100 +@@ -364,8 +364,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/oc.po gnome-mount-0.8.new/po/oc.po +--- gnome-mount-0.8/po/oc.po 2008-04-07 18:43:48.000000000 +0200 ++++ gnome-mount-0.8.new/po/oc.po 2009-03-04 10:00:56.911638970 +0100 +@@ -494,8 +494,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/pa.po gnome-mount-0.8.new/po/pa.po +--- gnome-mount-0.8/po/pa.po 2008-02-25 19:10:56.000000000 +0100 ++++ gnome-mount-0.8.new/po/pa.po 2009-03-04 10:00:56.919639219 +0100 +@@ -485,8 +485,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/pl.po gnome-mount-0.8.new/po/pl.po +--- gnome-mount-0.8/po/pl.po 2007-10-11 19:41:33.000000000 +0200 ++++ gnome-mount-0.8.new/po/pl.po 2009-03-04 10:00:56.927639119 +0100 +@@ -510,8 +510,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "Ustawienia dla napędu dotyczą wszystkich wsuniętych\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/pt_BR.po gnome-mount-0.8.new/po/pt_BR.po +--- gnome-mount-0.8/po/pt_BR.po 2008-04-07 18:43:48.000000000 +0200 ++++ gnome-mount-0.8.new/po/pt_BR.po 2009-03-04 10:00:56.939639109 +0100 +@@ -525,8 +525,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "Configurações para uma unidade afetarão todos os volumes\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/pt.po gnome-mount-0.8.new/po/pt.po +--- gnome-mount-0.8/po/pt.po 2008-02-25 19:10:56.000000000 +0100 ++++ gnome-mount-0.8.new/po/pt.po 2009-03-04 10:00:56.947638938 +0100 +@@ -517,8 +517,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "Configurações para um dispositivo afectam todas as unidades\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/ru.po gnome-mount-0.8.new/po/ru.po +--- gnome-mount-0.8/po/ru.po 2007-08-01 02:49:20.000000000 +0200 ++++ gnome-mount-0.8.new/po/ru.po 2009-03-04 10:00:56.955639188 +0100 +@@ -504,8 +504,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "Изменения параметров привода влияют на все тома,\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/sv.po gnome-mount-0.8.new/po/sv.po +--- gnome-mount-0.8/po/sv.po 2008-04-07 18:43:48.000000000 +0200 ++++ gnome-mount-0.8.new/po/sv.po 2009-03-04 10:00:56.963639227 +0100 +@@ -477,8 +477,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "Inställningar för en enhet påverkar alla volymer som\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/vi.po gnome-mount-0.8.new/po/vi.po +--- gnome-mount-0.8/po/vi.po 2007-08-01 02:49:20.000000000 +0200 ++++ gnome-mount-0.8.new/po/vi.po 2009-03-04 10:00:56.971638847 +0100 +@@ -363,8 +363,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "Các thiết lập cho ổ đĩa tác động đến mọi khối\ngắn vào ổ đĩa đó. Có thể đặt riêng tham số cho từng khối bằng tab \"Khối\"." + +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/zh_HK.po gnome-mount-0.8.new/po/zh_HK.po +--- gnome-mount-0.8/po/zh_HK.po 2008-04-07 18:43:48.000000000 +0200 ++++ gnome-mount-0.8.new/po/zh_HK.po 2009-03-04 10:00:56.979639236 +0100 +@@ -473,8 +473,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "磁碟機的設定會影響磁碟機中所有的磁區。\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/po/zh_TW.po gnome-mount-0.8.new/po/zh_TW.po +--- gnome-mount-0.8/po/zh_TW.po 2008-04-07 18:43:48.000000000 +0200 ++++ gnome-mount-0.8.new/po/zh_TW.po 2009-03-04 10:00:56.987639136 +0100 +@@ -473,8 +473,8 @@ + + #: ../src/gnome-mount-properties.glade.h:18 + msgid "" +-"Settings for a drive affects all volumes inserted in\n" +-"the drive. This can be overriden for individual \n" ++"Settings for a drive affect all volumes inserted in\n" ++"the drive. This can be overridden for individual \n" + " volumes using the \"Volume\" tab." + msgstr "" + "磁碟機的設定會影響磁碟機中所有的磁區。\n" +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/src/gnome-mount-properties.glade gnome-mount-0.8.new/src/gnome-mount-properties.glade +--- gnome-mount-0.8/src/gnome-mount-properties.glade 2007-08-01 02:49:20.000000000 +0200 ++++ gnome-mount-0.8.new/src/gnome-mount-properties.glade 2009-03-04 09:59:53.733841432 +0100 +@@ -306,8 +306,8 @@ + + + +- <small><i>Settings for a drive affects all volumes inserted in +-the drive. This can be overriden for individual ++ <small><i>Settings for a drive affect all volumes inserted in ++the drive. This can be overridden for individual + volumes using the "Volume" tab.</i></small> + True + True --- gnome-mount-0.8.orig/debian/patches/03_mount_point_configuration.patch +++ gnome-mount-0.8/debian/patches/03_mount_point_configuration.patch @@ -0,0 +1,127 @@ +# Description: Point out that mount point is relative to /media, and replace '/' with '_' in configured mount point, to prevent the user from locking herself out of the device. +# Ubuntu: https://launchpad.net/bugs/107668 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=473492 +--- gnome-mount-0.8/src/gnome-mount-properties.glade 2009-03-30 15:45:17.816864048 +0200 ++++ gnome-mount-0.8.new/src/gnome-mount-properties.glade 2009-03-30 15:45:18.975885157 +0200 +@@ -270,16 +270,39 @@ + 2 + + +- +- +- True +- True +- +- +- 1 +- 2 +- +- ++ ++ ++ True ++ ++ ++ True ++ 0 ++ /media/ ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ ++ ++ True ++ True ++ 1 ++ 2 ++ ++ ++ ++ ++ 1 ++ 2 ++ ++ + + + True +@@ -623,14 +646,38 @@ + + + +- +- True +- True +- +- +- 1 +- 2 +- ++ ++ ++ True ++ ++ ++ True ++ 0 ++ /media/ ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ ++ ++ True ++ True ++ 1 ++ 2 ++ ++ ++ ++ ++ 1 ++ 2 ++ + + + +diff -Nur -x '*.orig' -x '*~' gnome-mount-0.8/src/gnome-mount-properties-view.c gnome-mount-0.8.new/src/gnome-mount-properties-view.c +--- gnome-mount-0.8/src/gnome-mount-properties-view.c 2009-03-30 15:45:04.000000000 +0200 ++++ gnome-mount-0.8.new/src/gnome-mount-properties-view.c 2009-03-30 15:45:48.585087286 +0200 +@@ -157,6 +157,7 @@ + GnomeMountPropertiesView *properties = GM_PROPERTIES_VIEW (user_data); + char *text; + char *key; ++ char *p; + GConfClient *gconf_client; + + if (properties->keydir == NULL) { +@@ -171,6 +172,13 @@ + if (text == NULL || strlen (text) == 0) { + gconf_client_unset (gconf_client, key, NULL); + } else if (text != NULL && strlen (text) > 0) { ++ /* replace / with _ to prevent the user from locking himself ++ * out of the device */ ++ for (p = text; *p; ++p) ++ if (*p == G_DIR_SEPARATOR) ++ *p='_'; ++ gtk_entry_set_text (GTK_ENTRY (editable), text); ++ + gconf_client_set_string (gconf_client, key, text, NULL); + } + g_free (text);