[netspeed/unstable] Properly retrieve applet gconf settings path
- From: Jörgen Scheibengruber <mfcn src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [netspeed/unstable] Properly retrieve applet gconf settings path
- Date: Mon, 28 Jun 2010 22:36:34 +0000 (UTC)
commit f8dac7e213e75c1c5910ea314b4eb2b52520b372
Author: Jörgen Scheibengruber <mfcn gmx de>
Date: Tue Jun 29 01:36:06 2010 +0300
Properly retrieve applet gconf settings path
src/netspeed.c | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/src/netspeed.c b/src/netspeed.c
index d9da02e..5558173 100644
--- a/src/netspeed.c
+++ b/src/netspeed.c
@@ -627,7 +627,6 @@ static gboolean
netspeed_factory (PanelApplet *applet, const gchar *iid, gpointer data)
{
NetspeedPrivate *priv;
- char* dummy_key, *dummy;
char* gconf_path;
char* device;
static const BonoboUIVerb netspeed_applet_menu_verbs[] = {
@@ -650,18 +649,9 @@ netspeed_factory (PanelApplet *applet, const gchar *iid, gpointer data)
netspeed_applet_menu_verbs,
applet);
- dummy_key = panel_applet_gconf_get_full_key (applet, "dummy");
- dummy = dummy_key ? strstr (dummy_key, "dummy") : NULL;
- if (dummy) {
- dummy[0] = 0;
- gconf_path = dummy_key;
- priv->settings = settings_new_with_gconf_path (gconf_path);
- } else {
- gconf_path = NULL;
- g_warning ("Could not figure out gconf-path from dummy-key %s", dummy_key);
- priv->settings = settings_new ();
- }
- g_free (dummy_key);
+ gconf_path = panel_applet_get_preferences_key (applet);
+ priv->settings = settings_new_with_gconf_path (gconf_path);
+ g_free (gconf_path);
g_object_get (priv->settings, "device", &device, NULL);
get_device_info(device, &priv->stuff->devinfo);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]