Hello community, here is the log from the commit of package libgnomeui checked in at Wed Jun 21 17:46:31 CEST 2006. -------- --- GNOME/libgnomeui/libgnomeui.changes 2006-04-13 05:27:44.000000000 +0200 +++ libgnomeui/libgnomeui.changes 2006-06-21 07:45:04.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Jun 21 07:44:30 CEST 2006 - federico@novell.com + +- Added libgnomeui-184875-gtkfilesystemgnomevfs-no-extra-slash.diff to + fix part of https://bugzilla.novell.com/show_bug.cgi?id=184875. + This makes GtkFileSystemGnomeVFS not append a "/" to the end of + certain URIs if they already have one. + +------------------------------------------------------------------- New: ---- libgnomeui-184875-gtkfilesystemgnomevfs-no-extra-slash.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgnomeui.spec ++++++ --- /var/tmp/diff_new_pack.w2a85j/_old 2006-06-21 17:46:16.000000000 +0200 +++ /var/tmp/diff_new_pack.w2a85j/_new 2006-06-21 17:46:16.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Requires: gnome-icon-theme shared-mime-info Version: 2.12.0 -Release: 21 +Release: 28 Summary: The GNOME User Interface Library Source: libgnomeui-%{version}.tar.bz2 Patch: libgnomeui-%{version}-free-of-static-mem.diff @@ -29,6 +29,7 @@ Patch4: libgnomeui-315549.patch Patch5: libgnomeui-potfiles.patch Patch6: libgnomeui-155010-filechooser-show-drives.diff +Patch7: libgnomeui-184875-gtkfilesystemgnomevfs-no-extra-slash.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -91,6 +92,7 @@ %patch3 -p1 %patch4 %patch6 -p1 +%patch7 -p1 gnome-patch-translation-update %build @@ -155,6 +157,11 @@ %{prefix}/share/gtk-doc/html/libgnomeui %changelog -n libgnomeui +* Wed Jun 21 2006 - federico@novell.com +- Added libgnomeui-184875-gtkfilesystemgnomevfs-no-extra-slash.diff to + fix part of https://bugzilla.novell.com/show_bug.cgi?id=184875. + This makes GtkFileSystemGnomeVFS not append a "/" to the end of + certain URIs if they already have one. * Thu Apr 13 2006 - federico@novell.com - Added libgnomeui-155010-filechooser-show-drives.diff to fix the libgnomeui part of ++++++ libgnomeui-184875-gtkfilesystemgnomevfs-no-extra-slash.diff ++++++ 2006-06-20 Federico Mena Quintero <federico@novell.com> * file-chooser/gtkfilesystemgnomevfs.c (gtk_file_system_gnome_vfs_parse): Don't append a '/' to the base URI if it already has one. Fixes part of https://bugzilla.novell.com/show_bug.cgi?id=184875. --- libgnomeui/file-chooser/gtkfilesystemgnomevfs.c.orig 2006-06-20 16:53:10.000000000 -0500 +++ libgnomeui/file-chooser/gtkfilesystemgnomevfs.c 2006-06-20 17:30:11.000000000 -0500 @@ -1595,7 +1595,8 @@ gtk_file_system_gnome_vfs_parse (GtkFile } else { - gchar *path_part, *path, *uri, *filesystem_path, *escaped, *base_dir; + gchar *path_part, *path, *uri, *filesystem_path, *escaped; + int len; if (last_slash == stripped) path_part = g_strdup ("/"); @@ -1627,12 +1628,24 @@ gtk_file_system_gnome_vfs_parse (GtkFile /* don't insert break here, read above comment */ #endif default: - escaped = gnome_vfs_escape_path_string (filesystem_path); - base_dir = g_strconcat (base_uri, "/", NULL); - uri = gnome_vfs_uri_make_full_from_relative (base_dir, escaped); - g_free (base_dir); + len = strlen (base_uri); + if (len != 0) + { + escaped = gnome_vfs_escape_path_string (filesystem_path); + + if (base_uri[len - 1] != '/') + { + char *base_dir; + + base_dir = g_strconcat (base_uri, "/", NULL); + uri = gnome_vfs_uri_make_full_from_relative (base_dir, escaped); + g_free (base_dir); + } + else + uri = gnome_vfs_uri_make_full_from_relative (base_uri, escaped); - g_free (escaped); + g_free (escaped); + } } g_free (filesystem_path); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org