fix icon handling

This commit is contained in:
Matthias Clasen 2010-04-05 15:45:06 +00:00
parent 53cdc88c4a
commit 1215136f07
2 changed files with 48 additions and 1 deletions

View File

@ -0,0 +1,41 @@
From e62a19357e8e3866d7ca07fdd128d8163765a80a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@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

View File

@ -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.org/wiki/Features/UserAccountDialog
#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 useradd, usermod and userdel commands.
%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@redhat.com> 0.6-2
- Always emit changed signal on icon change
* Tue Mar 30 2010 Matthias Clasen <mclasen@redhat.com> 0.6-1
- Update to 0.6