|
Matthias Clasen |
121513 |
From e62a19357e8e3866d7ca07fdd128d8163765a80a Mon Sep 17 00:00:00 2001
|
|
Matthias Clasen |
121513 |
From: Matthias Clasen <mclasen@redhat.com>
|
|
Matthias Clasen |
121513 |
Date: Mon, 5 Apr 2010 11:32:26 -0400
|
|
Matthias Clasen |
121513 |
Subject: [PATCH] Always emit changed signal when setting user photo
|
|
Matthias Clasen |
121513 |
|
|
Matthias Clasen |
121513 |
With the new copying approach, we can't rely on the path to change...
|
|
Matthias Clasen |
121513 |
---
|
|
Matthias Clasen |
121513 |
src/user.c | 14 +++++---------
|
|
Matthias Clasen |
121513 |
1 files changed, 5 insertions(+), 9 deletions(-)
|
|
Matthias Clasen |
121513 |
|
|
Matthias Clasen |
121513 |
diff --git a/src/user.c b/src/user.c
|
|
Matthias Clasen |
121513 |
index 0eb3232..72ecd22 100644
|
|
Matthias Clasen |
121513 |
--- a/src/user.c
|
|
Matthias Clasen |
121513 |
+++ b/src/user.c
|
|
Matthias Clasen |
121513 |
@@ -1353,18 +1353,14 @@ user_change_icon_file_authorized_cb (Daemon *daemon,
|
|
Matthias Clasen |
121513 |
filename = dest_path;
|
|
Matthias Clasen |
121513 |
}
|
|
Matthias Clasen |
121513 |
|
|
Matthias Clasen |
121513 |
- if (g_strcmp0 (user->icon_file, filename) != 0) {
|
|
Matthias Clasen |
121513 |
- g_free (user->icon_file);
|
|
Matthias Clasen |
121513 |
- user->icon_file = g_strdup (filename);
|
|
Matthias Clasen |
121513 |
-
|
|
Matthias Clasen |
121513 |
- save_extra_data (user);
|
|
Matthias Clasen |
121513 |
+ g_free (user->icon_file);
|
|
Matthias Clasen |
121513 |
+ user->icon_file = filename;
|
|
Matthias Clasen |
121513 |
|
|
Matthias Clasen |
121513 |
- g_signal_emit (user, signals[CHANGED], 0);
|
|
Matthias Clasen |
121513 |
+ save_extra_data (user);
|
|
Matthias Clasen |
121513 |
|
|
Matthias Clasen |
121513 |
- g_object_notify (G_OBJECT (user), "icon-file");
|
|
Matthias Clasen |
121513 |
- }
|
|
Matthias Clasen |
121513 |
+ g_signal_emit (user, signals[CHANGED], 0);
|
|
Matthias Clasen |
121513 |
|
|
Matthias Clasen |
121513 |
- g_free (filename);
|
|
Matthias Clasen |
121513 |
+ g_object_notify (G_OBJECT (user), "icon-file");
|
|
Matthias Clasen |
121513 |
|
|
Matthias Clasen |
121513 |
dbus_g_method_return (context);
|
|
Matthias Clasen |
121513 |
}
|
|
Matthias Clasen |
121513 |
--
|
|
Matthias Clasen |
121513 |
1.7.0.1
|
|
Matthias Clasen |
121513 |
|