Hello community, here is the log from the commit of package gnome-volume-manager checked in at Fri Mar 21 03:07:44 CET 2008. -------- --- GNOME/gnome-volume-manager/gnome-volume-manager.changes 2008-03-13 18:26:44.000000000 +0100 +++ gnome-volume-manager/gnome-volume-manager.changes 2008-03-19 20:24:12.683115000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 19 19:21:18 CET 2008 - crivera@suse.de + +- Rediff and merge the patches that were disabled. This fixes + bnc #369366. + +------------------------------------------------------------------- Old: ---- gnome-volume-manager-printer-notify.patch gvm-check-printer-configured-property.patch New: ---- gvm-check-configured-properties.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-volume-manager.spec ++++++ --- /var/tmp/diff_new_pack.u13800/_old 2008-03-21 03:04:35.000000000 +0100 +++ /var/tmp/diff_new_pack.u13800/_new 2008-03-21 03:04:35.000000000 +0100 @@ -14,7 +14,7 @@ Name: gnome-volume-manager BuildRequires: fdupes gnutls-devel intltool libglade2-devel libgnomeprintui-devel libnotify-devel libwnck-devel nautilus-devel perl-XML-Parser update-desktop-files Version: 2.22.1 -Release: 23 +Release: 28 Url: http://www.gnome.org/ Group: System/GUI/GNOME License: GPL v2 or later @@ -23,15 +23,14 @@ Source1: gnome-cdda-handler Source2: cdda-url-handler.schemas Source3: add-unknown-printer -# PATCH-NEEDS-REBASE gvm-schema-defaults.patch +# PATCH-FEATURE-OPENSUSE gvm-schema-defaults.patch Patch0: gvm-schema-defaults.patch -# PATCH-NEEDS-REBASE suse-autorun.patch +# PATCH-FEATURE-OPENSUSE suse-autorun.patch Patch1: suse-autorun.patch +# PATCH-FEATURE-OPENSUSE 153241.patch Patch2: 153241.patch -# PATCH-NEEDS-REBASE gnome-volume-manager-printer-notify.patch -Patch3: gnome-volume-manager-printer-notify.patch -# PATCH-NEEDS-REBASE gvm-check-printer-configured-property.patc -Patch4: gvm-check-printer-configured-property.patch +# PATCH-FEATURE-OPENSUSE gvm-check-configured-properties.patch +Patch3: gvm-check-configured-properties.patch Recommends: control-center2 Requires: notification-daemon Requires: %{name}-lang = %{version} @@ -58,11 +57,10 @@ %lang_package %prep %setup -q -#%patch -#%patch1 +%patch -p1 +%patch1 -p1 %patch2 -#%patch3 -p1 -#%patch4 -p1 +%patch3 -p1 %build # FIXME: --disable-schemas-install is not implemented in gnome-volume-manager-2.21.1 @@ -110,6 +108,9 @@ %files lang -f %{name}.lang %changelog +* Wed Mar 19 2008 crivera@suse.de +- Rediff and merge the patches that were disabled. This fixes + bnc #369366. * Thu Mar 13 2008 sbrabec@suse.cz - Custom look'n'feel gconf keys moved to gconf2-branding-openSUSE. * Thu Mar 06 2008 maw@suse.de ++++++ gvm-check-configured-properties.patch ++++++ diff -ur /usr/src/packages/BUILD/gnome-volume-manager-2.22.1/src/manager.c ./src/manager.c --- /usr/src/packages/BUILD/gnome-volume-manager-2.22.1/src/manager.c 2008-03-19 12:49:19.000000000 -0400 +++ ./src/manager.c 2008-03-19 12:49:14.000000000 -0400 @@ -98,6 +98,7 @@ static void statfs_mount_info_remove (const char *udi); static void statfs_mount_info_free (statfs_mount_info *info); static gboolean gvm_statfs_check_space (const char *udi, statfs_mount_info *info, gpointer user_data); +static void show_printer_notification (const char *title, const char *message); #endif static gboolean gvm_dbus_init (void); @@ -2856,6 +2878,21 @@ static gboolean printer_device_added (const char *udi, const char *capability GNUC_UNUSED) { + if (libhal_device_get_property_bool (hal_ctx, udi, "printer.configured_existing", NULL)) + return TRUE; + + if (libhal_device_get_property_bool (hal_ctx, udi, "printer.configured", NULL)) { + char *display_name = libhal_device_get_property_string (hal_ctx, udi, + "printer.display_name", NULL); + gchar *msg = g_strdup_printf (_("%s has been configured."), display_name); +#ifdef ENABLE_NOTIFY + show_printer_notification (_("New Printer"), display_name); +#endif + libhal_free_string (display_name); + g_free (msg); + return TRUE; + } + if (config.autoprinter) { gvm_run_printer (udi); return TRUE; @@ -3194,6 +3231,17 @@ return TRUE; } +#if ENABLE_NOTIFY +static void +show_printer_notification (const char *title, const char *message) +{ + NotifyNotification *n; + n = notify_notification_new (title, message, "gnome-dev-printer", NULL); + notify_notification_show (n, NULL); + g_object_unref (n); +} +#endif + static DBusHandlerResult gvm_dbus_filter_function (DBusConnection *connection GNUC_UNUSED, DBusMessage *message, void *user_data GNUC_UNUSED) { ++++++ gvm-schema-defaults.patch ++++++ --- /var/tmp/diff_new_pack.u13800/_old 2008-03-21 03:04:35.000000000 +0100 +++ /var/tmp/diff_new_pack.u13800/_new 2008-03-21 03:04:35.000000000 +0100 @@ -1,6 +1,7 @@ ---- gnome-volume-manager.schemas.in 2006-03-10 11:59:17.000000000 -0500 -+++ novell.schemas.in 2006-04-04 13:55:09.000000000 -0400 -@@ -227,7 +227,7 @@ +diff -ur /usr/src/packages/BUILD/gnome-volume-manager-2.22.1/gnome-volume-manager.schemas.in ./gnome-volume-manager.schemas.in +--- /usr/src/packages/BUILD/gnome-volume-manager-2.22.1/gnome-volume-manager.schemas.in 2007-12-07 12:55:47.000000000 -0500 ++++ ./gnome-volume-manager.schemas.in 2008-03-19 12:42:48.000000000 -0400 +@@ -260,7 +260,7 @@ <key>/schemas/desktop/gnome/volume_manager/autoprinter_command</key> <applyto>/desktop/gnome/volume_manager/autoprinter_command</applyto> <type>string</type> @@ -9,7 +10,7 @@ <locale name="C"> <short>printer command</short> <long>Command to run when a printer is connected.</long> -@@ -250,7 +250,7 @@ +@@ -283,7 +283,7 @@ <key>/schemas/desktop/gnome/volume_manager/autoscanner_command</key> <applyto>/desktop/gnome/volume_manager/autoscanner_command</applyto> <type>string</type> ++++++ suse-autorun.patch ++++++ --- /var/tmp/diff_new_pack.u13800/_old 2008-03-21 03:04:35.000000000 +0100 +++ /var/tmp/diff_new_pack.u13800/_new 2008-03-21 03:04:35.000000000 +0100 @@ -1,79 +1,33 @@ -? 119900.patch -? 153241.patch -? 158750.patch -? 196281.patch -? 334540.patch -? 337839.patch -? 338323.patch -? INSTALL -? add-unknown-printer.sh -? autogen -? bnc-196281.patch -? depcomp -? foo -? gvm-schema-defaults.patch -? mount-opts-wildcard.patch -? novell.schemas.in -? releases -? suse-autorun.patch -? ui-string-changes.patch -? po/stamp-it -? src/TODO -? src/fmask.patch -? src/foo -? src/getopts -? src/getopts.c -? src/getopts.h -? src/mtab -? src/mtab.c -? src/mtab.h -? src/path -? src/path.c -Index: src/manager.c -=================================================================== -RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v -retrieving revision 1.154 -diff -u -r1.154 manager.c ---- src/manager.c 12 Oct 2006 19:43:28 -0000 1.154 -+++ src/manager.c 1 Nov 2006 16:54:01 -0000 -@@ -1289,6 +1289,31 @@ +diff -ur /usr/src/packages/BUILD/gnome-volume-manager-2.22.1/src/manager.c ./src/manager.c +--- /usr/src/packages/BUILD/gnome-volume-manager-2.22.1/src/manager.c 2008-03-19 12:49:19.000000000 -0400 ++++ ./src/manager.c 2008-03-19 12:49:14.000000000 -0400 +@@ -1686,8 +1687,29 @@ } if (config.autorun && config.autorun_path) { -+ if (TRUE) { -+ char *command, *path; -+ struct stat st; -+ -+ path = g_build_filename (mount_point, "setup.sh", NULL); -+ if (stat (path, &st) == 0 && S_ISREG (st.st_mode) && access (path, R_OK | X_OK) == 0) { -+ command = g_strdup_printf ("gnomesu %s", path); -+ gvm_run_command (command, NULL, NULL, NULL); -+ g_free (command); -+ g_free (path); -+ return; -+ } -+ ++ char *command, *path; + struct stat st; + ++ path = g_build_filename (mount_point, "setup.sh", NULL); ++ if (stat (path, &st) == 0 && S_ISREG (st.st_mode) && access (path, R_OK | X_OK) == 0) { ++ command = g_strdup_printf ("gnomesu %s", path); ++ gvm_run_command (command, NULL, NULL, NULL); ++ g_free (command); + g_free (path); -+ path = g_build_filename (mount_point, "media.1", "patches", NULL); -+ if (stat (path, &st) == 0 && S_ISDIR (st.st_mode) && access (path, R_OK | X_OK) == 0) { -+ command = "gnomesu /sbin/yast2 online_update .cd_default"; -+ gvm_run_command (command, NULL, NULL, NULL); -+ g_free (path); -+ return; -+ } -+ ++ return; ++ } ++ ++ g_free (path); ++ path = g_build_filename (mount_point, "media.1", "patches", NULL); ++ if (stat (path, &st) == 0 && S_ISDIR (st.st_mode) && access (path, R_OK | X_OK) == 0) { ++ command = "gnomesu /sbin/yast2 online_update .cd_default"; ++ gvm_run_command (command, NULL, NULL, NULL); + g_free (path); ++ return; + } + ++ g_free (path); ++ autopath = g_strsplit (config.autorun_path, ":", -1); for (i = 0; autopath[i]; i++) { -@@ -2917,7 +2942,7 @@ - - for (i = 0; i < num_volumes; i++) { - udi = volumes[i]; -- -+ - if (gvm_udi_is_subfs_mount (udi)) { - #ifdef ENABLE_NOTIFY - statfs_mount_info_add (udi); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org