empathy-call-window.c: update priv->sending_video *before* changing widget's state

[empathy.git] / libempathy-gtk / empathy-conf.c

diff --git a/libempathy-gtk/empathy-conf.c b/libempathy-gtk/empathy-conf.c
index 1ec3feeb4354e67255b7330b96e226acac8fd2b2..fae2c37db5805fa6c1ea6757e59829df15bd8656 100644 (file)
--- a/libempathy-gtk/empathy-conf.c
+++ b/libempathy-gtk/empathy-conf.c
@@ -26,17 +26,16 @@
 
 #include <gconf/gconf-client.h>
 
-#include <libempathy/empathy-debug.h>
-
+#include <libempathy/empathy-utils.h>
 #include "empathy-conf.h"
 
-#define DEBUG_DOMAIN "Config"
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include <libempathy/empathy-debug.h>
 
 #define EMPATHY_CONF_ROOT       "/apps/empathy"
 #define DESKTOP_INTERFACE_ROOT  "/desktop/gnome/interface"
 
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_CONF, EmpathyConfPriv))
-
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyConf)
 typedef struct {
        GConfClient *gconf_client;
 } EmpathyConfPriv;
@@ -68,10 +67,10 @@ empathy_conf_class_init (EmpathyConfClass *class)
 static void
 empathy_conf_init (EmpathyConf *conf)
 {
-       EmpathyConfPriv *priv;
-
-       priv = GET_PRIV (conf);
+       EmpathyConfPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (conf,
+               EMPATHY_TYPE_CONF, EmpathyConfPriv);
 
+       conf->priv = priv;
        priv->gconf_client = gconf_client_get_default ();
 
        gconf_client_add_dir (priv->gconf_client,
@@ -131,7 +130,7 @@ empathy_conf_set_int (EmpathyConf  *conf,
 
        g_return_val_if_fail (EMPATHY_IS_CONF (conf), FALSE);
 
-       empathy_debug (DEBUG_DOMAIN, "Setting int:'%s' to %d", key, value);
+       DEBUG ("Setting int:'%s' to %d", key, value);
 
        priv = GET_PRIV (conf);
 
@@ -177,8 +176,8 @@ empathy_conf_set_bool (EmpathyConf  *conf,
 
        g_return_val_if_fail (EMPATHY_IS_CONF (conf), FALSE);
 
-       empathy_debug (DEBUG_DOMAIN, "Setting bool:'%s' to %d ---> %s",
-                     key, value, value ? "true" : "false");
+       DEBUG ("Setting bool:'%s' to %d ---> %s", key, value,
+               value ? "true" : "false");
 
        priv = GET_PRIV (conf);
 
@@ -224,8 +223,7 @@ empathy_conf_set_string (EmpathyConf  *conf,
 
        g_return_val_if_fail (EMPATHY_IS_CONF (conf), FALSE);
 
-       empathy_debug (DEBUG_DOMAIN, "Setting string:'%s' to '%s'",
-                     key, value);
+       DEBUG ("Setting string:'%s' to '%s'", key, value);
 
        priv = GET_PRIV (conf);