Hello community, here is the log from the commit of package gnome-utils checked in at Fri Jul 25 00:55:43 CEST 2008. -------- --- GNOME/gnome-utils/gnome-utils.changes 2008-07-01 16:41:19.000000000 +0200 +++ gnome-utils/gnome-utils.changes 2008-07-18 20:53:25.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 18 20:52:39 CEST 2008 - rodrigo@suse.de + +- Tag and upstream some patches. + +------------------------------------------------------------------- Old: ---- gnome-utils-179040-screenshot-uri.diff screen-shot-error-dlg.diff New: ---- gnome-utils-179040-screenshot-uri.patch gnome-utils-screen-shot-error-dlg.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-utils.spec ++++++ --- /var/tmp/diff_new_pack.f29538/_old 2008-07-25 00:53:17.000000000 +0200 +++ /var/tmp/diff_new_pack.f29538/_new 2008-07-25 00:53:17.000000000 +0200 @@ -18,14 +18,17 @@ Provides: gnome-utils2 Obsoletes: gnome-utils2 Version: 2.20.0.1 -Release: 119 +Release: 133 Summary: Basic Utilities for the GNOME 2.x Desktop Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-utils/2.16/%{name}-%{version}.tar.bz2 Source2: logviewer.png +# PATCH-FIX-OPENSUSE gnome-utils-logview-run-as-root.patch Patch15: gnome-utils-logview-run-as-root.patch -Patch18: screen-shot-error-dlg.diff +# PATCH-FIX-UPSTREAM gnome-utils-screen-shot-error-dlg.patch bgo543639 +Patch18: gnome-utils-screen-shot-error-dlg.patch +# PATCH-FIX-UPSTREAM gnome-utils-screenshot-abspath.patch bgo543641 Patch23: gnome-utils-screenshot-abspath.patch -Patch25: gnome-utils-179040-screenshot-uri.diff +Patch25: gnome-utils-179040-screenshot-uri.patch Patch26: gnome-utils-autobuild-warning.patch Patch27: baobab-desktop.patch Patch28: abuild-warnings.patch @@ -398,6 +401,8 @@ %{_datadir}/gtk-doc/html/gdict %changelog +* Fri Jul 18 2008 rodrigo@suse.de +- Tag and upstream some patches. * Tue Jul 01 2008 maw@suse.de - Fix up icon symlinks. * Wed Apr 23 2008 vuntz@suse.de ++++++ gnome-utils-179040-screenshot-uri.patch ++++++ --- gnome-utils-2.15.92/gnome-screenshot/screenshot-dialog.c +++ gnome-utils-2.15.92/gnome-screenshot/screenshot-dialog.c @@ -296,7 +296,7 @@ const gchar *file_name; gchar *uri, *file, *tmp; - folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog->save_widget)); + folder = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog->save_widget)); file_name = gtk_entry_get_text (GTK_ENTRY (dialog->filename_entry)); tmp = g_filename_from_utf8 (file_name, -1, NULL, NULL, NULL); @@ -312,7 +312,7 @@ char * screenshot_dialog_get_folder (ScreenshotDialog *dialog) { - return gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog->save_widget)); + return gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog->save_widget)); } void screenshot_dialog_set_busy (ScreenshotDialog *dialog, ++++++ gnome-utils-screen-shot-error-dlg.patch ++++++ --- gnome-screenshot/screenshot-xfer.c 10 Nov 2004 06:20:32 -0000 1.3 +++ gnome-screenshot/screenshot-xfer.c 15 Mar 2005 11:44:52 -0000 @@ -18,6 +18,7 @@ gboolean delete_target; guint timeout_id; gboolean canceled; + gchar *target_dir; } TransferInfo; static gboolean show_dialog_timeout (TransferInfo *transfer_info); @@ -148,6 +149,30 @@ } static gint +handle_access_error (GnomeVFSXferProgressInfo *progress_info, + TransferInfo *transfer_info) +{ + GtkWidget *dialog; + remove_timeout (transfer_info); + dialog = gtk_message_dialog_new (GTK_WINDOW (transfer_info_get_parent (transfer_info)), + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("Insufficient permissions to save the file in:\n%s"), + transfer_info->target_dir); + + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + if (transfer_info->progress_dialog) + { + gtk_widget_destroy (transfer_info->progress_dialog); + transfer_info->progress_dialog = NULL; + } + gtk_main_quit (); + return 1; +} + +static gint handle_transfer_vfs_error (GnomeVFSXferProgressInfo *progress_info, TransferInfo *transfer_info) { @@ -216,6 +241,8 @@ { TransferInfo *transfer_info = data; + if (progress_info->vfs_status == GNOME_VFS_ERROR_ACCESS_DENIED) + return handle_access_error (progress_info, transfer_info); switch (progress_info->status) { case GNOME_VFS_XFER_PROGRESS_STATUS_OK: @@ -259,6 +286,7 @@ transfer_info = g_new0 (TransferInfo, 1); transfer_info->parent_dialog = parent; + transfer_info->target_dir = g_strdup (gnome_vfs_uri_extract_dirname (target_uri)); add_timeout (transfer_info); result = gnome_vfs_async_xfer (&transfer_info->handle, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org