DBusMessageIter fsub, tsub;
char *sig;
dbus_message_iter_recurse(from, &fsub);
- dbus_message_iter_get_signature(&fsub);
+ sig = dbus_message_iter_get_signature(&fsub);
dbus_message_iter_open_container(to, type, sig, &tsub);
copy_message(&fsub, &tsub);
dbus_message_iter_close_container(to, &tsub);
e_dbus_fd_handler(void *data, Ecore_Fd_Handler *fd_handler)
{
E_DBus_Handler_Data *hd;
- DBusConnection *conn;
unsigned int condition = 0;
DEBUG(5, "fd handler (%ld)!\n", (long int)fd_handler);
hd->fd_handler = NULL;
return 0;
}
-
- conn = hd->cd->conn;
-
if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ)) condition |= DBUS_WATCH_READABLE;
if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE)) condition |= DBUS_WATCH_WRITABLE;
if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_ERROR)) condition |= DBUS_WATCH_ERROR;
static void
cb_watch_del(DBusWatch *watch, void *data)
{
- E_DBus_Connection *cd;
E_DBus_Handler_Data *hd;
- cd = data;
DEBUG(5, "cb_watch_del\n");
hd = (E_DBus_Handler_Data *)dbus_watch_get_data(watch);
#include "e_dbus_private.h"
#include "dbus/dbus.h"
-static int init = 0;
-
struct E_DBus_Signal_Handler
{
char *sender;
{
const char *unique_name = NULL;
struct cb_name_owner_data *d = data;
- E_DBus_Connection *conn;
E_DBus_Signal_Handler *sh;
- conn = d->conn;
sh = d->sh;
free(d);
}
else if (!strcmp(key, "desktop-entry"))
{
+ dbus_message_iter_get_basic(&variant, &s_val);
e_notification_hint_desktop_set(n, s_val);
}
else if (!strcmp(key, "sound-file"))