fixed gcc warning
authorVlad Vasiliev <vlad@toshiba2.oblgaz>
Fri, 30 Apr 2010 18:54:46 +0000 (21:54 +0300)
committerVlad Vasiliev <vlad@toshiba2.oblgaz>
Fri, 30 Apr 2010 18:54:46 +0000 (21:54 +0300)
applet/src/livewp-dbus.c

index b893b67..abfc557 100644 (file)
 /*******************************************************************************/
 void
 livewp_initialize_dbus(Animation_WallpaperPrivate *priv){
-    gchar   *tmp;
     gchar       *filter_string;
     DBusError   error;
 
-//    if(!priv->dbus_is_initialize){
-        dbus_error_init (&error);
-        /* Add D-BUS signal handler for 'status_changed' */
+    dbus_error_init (&error);
+    /* Add D-BUS signal handler for 'status_changed' */
 #if !defined APPLICATION
-        priv->dbus_conn = (DBusConnection *) osso_get_sys_dbus_connection(priv->osso);
-        priv->dbus_conn_session = (DBusConnection *) osso_get_dbus_connection(priv->osso);
+    priv->dbus_conn = (DBusConnection *) osso_get_sys_dbus_connection(priv->osso);
+    priv->dbus_conn_session = (DBusConnection *) osso_get_dbus_connection(priv->osso);
 #else
-        priv->dbus_conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
-        priv->dbus_conn_session = dbus_bus_get(DBUS_BUS_SESSION, NULL);
+    priv->dbus_conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
+    priv->dbus_conn_session = dbus_bus_get(DBUS_BUS_SESSION, NULL);
 #endif
 
-        if (priv->dbus_conn_session){
-            filter_string =
-                g_strdup_printf("type='signal', interface='%s'", LIVEWP_SIGNAL_INTERFACE);
-            dbus_bus_add_match(priv->dbus_conn_session, filter_string, &error);
-            if (dbus_error_is_set(&error)){
-                 fprintf(stderr,"dbus_bus_add_match failed: %s", error.message);
-                 dbus_error_free(&error);
-            }
-            g_free(filter_string);
-            /* add the callback */
-            dbus_connection_add_filter(priv->dbus_conn_session,
-                                       get_livewp_signal_cb,
-                                       priv, NULL);
+    if (priv->dbus_conn_session){
+        filter_string =
+            g_strdup_printf("type='signal', interface='%s'", LIVEWP_SIGNAL_INTERFACE);
+        dbus_bus_add_match(priv->dbus_conn_session, filter_string, &error);
+        if (dbus_error_is_set(&error)){
+             fprintf(stderr,"dbus_bus_add_match failed: %s", error.message);
+             dbus_error_free(&error);
         }
-
-  // }
-
+        g_free(filter_string);
+        /* add the callback */
+        dbus_connection_add_filter(priv->dbus_conn_session,
+                                   get_livewp_signal_cb,
+                                   priv, NULL);
+    }
 }
 /*******************************************************************************/
 void