[gnome-power-manager/gnome-2-32] Only connect the UpClient::device-added signal after the coldplug
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-power-manager/gnome-2-32] Only connect the UpClient::device-added signal after the coldplug
- Date: Tue, 31 Aug 2010 09:54:25 +0000 (UTC)
commit 124bf2484d5694c71fec69aeb46627ac4ad0f67a
Author: Richard Hughes <richard hughsie com>
Date: Tue Aug 31 10:47:11 2010 +0100
Only connect the UpClient::device-added signal after the coldplug
This avoids duplicated devices in gnome-power-statistics
src/gpm-statistics.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c
index 74ba6e8..7e8b288 100644
--- a/src/gpm-statistics.c
+++ b/src/gpm-statistics.c
@@ -1750,9 +1750,6 @@ main (int argc, char *argv[])
G_CALLBACK (gpm_stats_range_combo_changed), NULL);
client = up_client_new ();
- g_signal_connect (client, "device-added", G_CALLBACK (gpm_stats_device_added_cb), NULL);
- g_signal_connect (client, "device-removed", G_CALLBACK (gpm_stats_device_removed_cb), NULL);
- g_signal_connect (client, "device-changed", G_CALLBACK (gpm_stats_device_changed_cb), NULL);
wakeups = up_wakeups_new ();
g_signal_connect (wakeups, "data-changed", G_CALLBACK (gpm_stats_data_changed_cb), NULL);
@@ -1773,6 +1770,11 @@ main (int argc, char *argv[])
}
}
+ /* connect now the coldplug is done */
+ g_signal_connect (client, "device-added", G_CALLBACK (gpm_stats_device_added_cb), NULL);
+ g_signal_connect (client, "device-removed", G_CALLBACK (gpm_stats_device_removed_cb), NULL);
+ g_signal_connect (client, "device-changed", G_CALLBACK (gpm_stats_device_changed_cb), NULL);
+
/* set current device */
if (devices->len > 0) {
device = g_ptr_array_index (devices, 0);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]