diff options
author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-11 23:34:29 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-11 23:34:29 +0800 |
commit | c0a255eb90769638d57ae4122932f75c46e4e531 (patch) | |
tree | 5213694107a246763c25c0a089553dd7c8708b32 /shell/e-shell-nm.c | |
parent | 4c8aa5982c0132716f473873d0e1d7601df14607 (diff) | |
download | gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.gz gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.zst gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.zip |
Merge revisions 36016:36303 from trunk.
svn path=/branches/kill-bonobo/; revision=36307
Diffstat (limited to 'shell/e-shell-nm.c')
-rw-r--r-- | shell/e-shell-nm.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index 83bc8ac627..e03e009d13 100644 --- a/shell/e-shell-nm.c +++ b/shell/e-shell-nm.c @@ -47,7 +47,7 @@ reinit_dbus (EShell *shell) static DBusHandlerResult e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, - DBusMessage *message, void *user_data) + DBusMessage *message, void *user_data) { DBusError error; const gchar *object; @@ -131,3 +131,18 @@ exception: return FALSE; } + +gboolean +e_shell_dbus_initialise (EShellWindow *window) +{ + g_type_init (); + + return init_dbus (window); +} + +void +e_shell_dbus_dispose (EShellWindow *window) +{ + //FIXME + return; +} |