rpms/accountsservice/devel 0001-Always-emit-changed-signal-when-setting-user-photo.patch, NONE, 1.1 accountsservice.spec, 1.6, 1.7

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/accountsservice/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18260

Modified Files:
	accountsservice.spec 
Added Files:
	0001-Always-emit-changed-signal-when-setting-user-photo.patch 
Log Message:
fix icon handling


0001-Always-emit-changed-signal-when-setting-user-photo.patch:
 user.c |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

--- NEW FILE 0001-Always-emit-changed-signal-when-setting-user-photo.patch ---
>From e62a19357e8e3866d7ca07fdd128d8163765a80a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen at redhat.com>
Date: Mon, 5 Apr 2010 11:32:26 -0400
Subject: [PATCH] Always emit changed signal when setting user photo

With the new copying approach, we can't rely on the path to change...
---
 src/user.c |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/user.c b/src/user.c
index 0eb3232..72ecd22 100644
--- a/src/user.c
+++ b/src/user.c
@@ -1353,18 +1353,14 @@ user_change_icon_file_authorized_cb (Daemon                *daemon,
                 filename = dest_path;
         }
 
-        if (g_strcmp0 (user->icon_file, filename) != 0) {
-                g_free (user->icon_file);
-                user->icon_file = g_strdup (filename);
-
-                save_extra_data (user);
+        g_free (user->icon_file);
+        user->icon_file = filename;
 
-                g_signal_emit (user, signals[CHANGED], 0);
+        save_extra_data (user);
 
-                g_object_notify (G_OBJECT (user), "icon-file");
-        }
+        g_signal_emit (user, signals[CHANGED], 0);
 
-        g_free (filename);
+        g_object_notify (G_OBJECT (user), "icon-file");
 
         dbus_g_method_return (context);
 }
-- 
1.7.0.1



Index: accountsservice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/accountsservice/devel/accountsservice.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- accountsservice.spec	30 Mar 2010 17:30:26 -0000	1.6
+++ accountsservice.spec	5 Apr 2010 15:45:06 -0000	1.7
@@ -1,7 +1,7 @@
 
 Name:           accountsservice
 Version:        0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        D-Bus interfaces for querying and manipulating user account information
 
 Group:          System Environment/Daemons
@@ -10,6 +10,8 @@ URL:            http://www.fedoraproject
 #VCS: git:git://git.freedesktop.org/accountsservice
 Source0:        http://mclasen.fedorapeople.org/accounts/accountsservice-0.6.tar.bz2
 
+# upstream fix
+Patch0:         0001-Always-emit-changed-signal-when-setting-user-photo.patch
 BuildRequires:  glib2-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  polkit-devel
@@ -26,6 +28,7 @@ of these interfaces, based on the userad
 
 %prep
 %setup -q
+%patch0 -p1 -b .icon-change
 
 %build
 %configure
@@ -56,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr  5 2010 Matthias Clasen <mclasen at redhat.com> 0.6-2
+- Always emit changed signal on icon change
+
 * Tue Mar 30 2010 Matthias Clasen <mclasen at redhat.com> 0.6-1
 - Update to 0.6