projects
/
livewp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
024b77e
)
removed unusable dbus code
author
Vlad
<vlad@gas.by>
Tue, 18 May 2010 09:32:43 +0000
(12:32 +0300)
committer
Vlad
<vlad@gas.by>
Tue, 18 May 2010 09:32:43 +0000
(12:32 +0300)
applet/src/livewp-dbus.c
patch
|
blob
|
history
diff --git
a/applet/src/livewp-dbus.c
b/applet/src/livewp-dbus.c
index
dd21287
..
ea4c06f
100644
(file)
--- a/
applet/src/livewp-dbus.c
+++ b/
applet/src/livewp-dbus.c
@@
-33,13
+33,8
@@
livewp_initialize_dbus(Animation_WallpaperPrivate *priv){
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);
-#endif
if (priv->dbus_conn_session){
filter_string =
if (priv->dbus_conn_session){
filter_string =
@@
-63,12
+58,6
@@
livewp_deinitialize_dbus(Animation_WallpaperPrivate *priv){
gchar *filter_string;
DBusError error;
gchar *filter_string;
DBusError error;
- if (priv->dbus_conn){
-#if defined APPLICATION
- dbus_connection_close(priv->dbus_conn);
- dbus_connection_unref(priv->dbus_conn);
-#endif
- }
if (priv->dbus_conn_session){
filter_string =
g_strdup_printf("type='signal', interface='%s'", LIVEWP_SIGNAL_INTERFACE);
if (priv->dbus_conn_session){
filter_string =
g_strdup_printf("type='signal', interface='%s'", LIVEWP_SIGNAL_INTERFACE);
@@
-129,10
+118,6
@@
get_livewp_signal_cb(DBusConnection *conn, DBusMessage *msg, Animation_Wallpaper
#endif
}
}
#endif
}
}
-#ifndef APPLICATION
-// if (dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_RELOAD_PLUGIN))
-// reload_livewp_plugin();
-#endif
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
/*******************************************************************************/
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
/*******************************************************************************/