[maemo-commits] [maemo-commits] r13284 - in projects/haf/trunk/clipboard-manager: . debian

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2007-08-20 14:09:03 +0300 (Mon, 20 Aug 2007)
New Revision: 13284

Modified:
   projects/haf/trunk/clipboard-manager/ChangeLog
   projects/haf/trunk/clipboard-manager/debian/changelog
   projects/haf/trunk/clipboard-manager/gconf2xsettings.c
Log:
Sync GConf to XSettings on startup

Modified: projects/haf/trunk/clipboard-manager/ChangeLog
===================================================================
--- projects/haf/trunk/clipboard-manager/ChangeLog	2007-08-20 10:19:36 UTC (rev 13283)
+++ projects/haf/trunk/clipboard-manager/ChangeLog	2007-08-20 11:09:03 UTC (rev 13284)
@@ -1,3 +1,9 @@
+2007-08-20  Gabriel Schulhof  <gabriel.schulhof at nokia.com>
+
+	Release 0.6.7
+
+	- Sync GConf to XSettings on startup
+
 2007-05-22  Gabriel Schulhof  <gabriel.schulhof at nokia.com>
 
 	- Added default gconf2xsettings keys file

Modified: projects/haf/trunk/clipboard-manager/debian/changelog
===================================================================
--- projects/haf/trunk/clipboard-manager/debian/changelog	2007-08-20 10:19:36 UTC (rev 13283)
+++ projects/haf/trunk/clipboard-manager/debian/changelog	2007-08-20 11:09:03 UTC (rev 13284)
@@ -1,3 +1,9 @@
+clipboard-manager (0.6.7-1) sardine; urgency=low
+
+  * Sync GConf to XSettings on startup
+
+ -- Johan Bilien <johan.bilien at nokia.com>  Mon, 20 Aug 2007 14:07:23 +0300
+
 clipboard-manager (0.6.6-1) sardine; urgency=low
 
   * Add the X connection to the list of fds to poll. Fixes: NB#61616

Modified: projects/haf/trunk/clipboard-manager/gconf2xsettings.c
===================================================================
--- projects/haf/trunk/clipboard-manager/gconf2xsettings.c	2007-08-20 10:19:36 UTC (rev 13283)
+++ projects/haf/trunk/clipboard-manager/gconf2xsettings.c	2007-08-20 11:09:03 UTC (rev 13284)
@@ -1,4 +1,5 @@
 #include <X11/Xlib.h>
+#include <stdlib.h>
 #include <string.h>
 #include <gconf/gconf-client.h>
 #include <glib.h>
@@ -22,6 +23,8 @@
   {
   XSettingsResult result = XSETTINGS_FAILED ;
 
+  g_print ("*** gconf_key_value_changed: Modifying XSettings key %s\n", params->xsettings_key) ;
+
   if (entry->value != NULL)
     switch (entry->value->type)
       {
@@ -53,16 +56,32 @@
 
 static void ht_gconf_keys_add_notify (char *gconf_key, char *xsettings_key, HT_GCONF_KEYS_ADD_NOTIFY_PARAMS *params)
   {
+  guint id = 0;
   GError *error = NULL ;
   GCONF_KEY_VALUE_CHANGED_PARAMS *cb_params = NULL ;
 
+  g_print("ht_gconf_keys_add_notify: Entering\n");
+
   if (NULL == (cb_params = g_malloc0 (sizeof (GCONF_KEY_VALUE_CHANGED_PARAMS)))) return ;
 
   cb_params->xsettings_key = xsettings_key ;
   cb_params->xsettings_manager = params->xsettings_manager ;
 
-  gconf_client_notify_add (params->gconf_client, gconf_key, (GConfClientNotifyFunc)gconf_key_value_changed, cb_params, (GDestroyNotify)g_free, &error) ;
+  if ((id = gconf_client_notify_add (params->gconf_client, gconf_key, (GConfClientNotifyFunc)gconf_key_value_changed, cb_params, (GDestroyNotify)g_free, &error)) != 0)
+    {
+    GConfEntry *entry = NULL;
 
+    g_print("ht_gconf_keys_add_notify: getenv(\"LC_MESSAGES\") = %s\n", getenv("LC_MESSAGES"));
+
+    if ((entry = gconf_client_get_entry(params->gconf_client, gconf_key, getenv("LC_MESSAGES"), TRUE, NULL)) != NULL)
+      {
+      g_print("ht_gconf_keys_add_notify: Calling gconf_key_value_changed\n");
+      gconf_key_value_changed (params->gconf_client, id, entry, cb_params) ;
+      }
+    else
+      g_print("ht_gconf_keys_add_notify: Not calling gconf_key_value_changed, because I couldn't get the entry\n");
+    }
+
   if (NULL != error)
     {
     g_warning ("ht_gconf_keys_add_notify: Adding notify: %s --> %s failed: %s\n", gconf_key, xsettings_key, error->message) ;