Hello community, here is the log from the commit of package padevchooser checked in at Mon Apr 21 01:52:54 CEST 2008. -------- --- padevchooser/padevchooser.changes 2008-04-09 17:18:37.000000000 +0200 +++ padevchooser/padevchooser.changes 2008-04-18 17:01:13.377893000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 18 17:04:54 CEST 2008 - rodrigo@suse.de + +- Added padevchooser-no-symlinks.patch to correct wrong behavior + with autostart files changed by the user (bnc#373193) + +------------------------------------------------------------------- New: ---- padevchooser-no-symlinks.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ padevchooser.spec ++++++ --- /var/tmp/diff_new_pack.Z28198/_old 2008-04-21 01:50:01.000000000 +0200 +++ /var/tmp/diff_new_pack.Z28198/_new 2008-04-21 01:50:01.000000000 +0200 @@ -13,7 +13,7 @@ Name: padevchooser Version: 0.9.4 -Release: 48 +Release: 52 Summary: PulseAudio Device Chooser Group: Productivity/Multimedia/Sound/Utilities License: GPL v2 or later @@ -22,6 +22,8 @@ #Source0: http://0pointer.de/lennart/projects/padevchooser/padevchooser-%{version}.tar.gz Source1: padevchooser.png Patch: padevchooser-desktop-fix.diff +# PATCH-FIX-UPSTREAM padevchooser-no-symlinks.patch http://pulseaudio.org/ticket/279 rodrigo@novell.com +Patch1: padevchooser-no-symlinks.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ gtk2-devel libnotify-devel libpulse-devel BuildRequires: gconf2-devel libglade2-devel lynx update-desktop-files @@ -50,6 +52,7 @@ %prep %setup -q %patch +%patch1 -p1 %build %configure @@ -77,6 +80,9 @@ %{_sysconfdir}/xdg/autostart/padevchooser-autostart.desktop %changelog +* Fri Apr 18 2008 rodrigo@suse.de +- Added padevchooser-no-symlinks.patch to correct wrong behavior + with autostart files changed by the user (bnc#373193) * Wed Apr 09 2008 rodrigo@suse.de - Renamed autostart desktop file to pass rpmlint checks. - Use a valid category for suse_update_desktop_file ++++++ padevchooser-no-symlinks.patch ++++++ diff -upr padevchooser-0.9.4-orig//src/padevchooser.c padevchooser-0.9.4//src/padevchooser.c --- padevchooser-0.9.4-orig//src/padevchooser.c 2007-09-25 03:20:38.000000000 +0200 +++ padevchooser-0.9.4//src/padevchooser.c 2008-04-18 16:57:08.000000000 +0200 @@ -702,31 +702,54 @@ static void set_x11_props(void) { static void start_on_login_cb(GtkCheckButton *w) { gchar *c; + GnomeDesktopItem *ditem; + GError *error = NULL; - mkdir(g_get_user_config_dir(), 0777); c = g_build_filename(g_get_user_config_dir(), "autostart", NULL); - mkdir(c, 0777); + if (!g_file_test (c, G_FILE_TEST_IS_DIR)) { + g_mkdir_with_parents (c, 0777); + } g_free(c); - c = g_build_filename(g_get_user_config_dir(), "autostart", "padevchooser.desktop", NULL); + + ditem = gnome_desktop_item_new_from_file (DESKTOP_FILE, GNOME_DESKTOP_ITEM_LOAD_NO_TRANSLATIONS, &error); + if (!ditem) { + g_warning ("gnome_desktop_item_new_from_file() failed: %s", error->message); + g_error_free (error); + return; + } if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) { - if (symlink(DESKTOP_FILE, c) < 0 && errno != EEXIST) - g_warning("symlink() failed: %s", strerror(errno)); + gnome_desktop_item_set_boolean (ditem, "X-GNOME-Autostart-enabled", TRUE); } else { - if (unlink(c) < 0 && errno != ENOENT) - g_warning("unlink() failed: %s", strerror(errno)); + gnome_desktop_item_set_boolean (ditem, "X-GNOME-Autostart-enabled", FALSE); + } + + error = NULL; + c = g_strdup_printf ("file://%s/autostart/padevchooser.desktop", g_get_user_config_dir ()); + if (!gnome_desktop_item_save (ditem, c, TRUE, &error)) { + g_warning ("gnome_desktop_item_save() failed: %s", error->message); + g_error_free (error); } g_free(c); + gnome_desktop_item_unref (ditem); } static void init_start_on_login_check_button(GtkToggleButton *w) { - struct stat st; gchar *c; + GnomeDesktopItem *ditem; c = g_build_filename(g_get_user_config_dir(), "autostart", "padevchooser.desktop", NULL); - gtk_toggle_button_set_active(w, lstat(c, &st) >= 0); + + ditem = gnome_desktop_item_new_from_file (c, 0, NULL); + if (!ditem) { + ditem = gnome_desktop_item_new_from_file (DESKTOP_FILE, 0, NULL); + } + + gtk_toggle_button_set_active(w, gnome_desktop_item_get_boolean (ditem, "X-GNOME-Autostart-enabled")); + g_free(c); + gnome_desktop_item_unref (ditem); } static void check_button_cb(GtkCheckButton *w, const gchar *key) { Only in padevchooser-0.9.4//src: padevchooser.c~ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org