diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2007-03-30 10:44:23 +0000 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2007-03-30 10:44:23 +0000 |
| commit | cfcb3fca3d3517d6e086c7780f362e272867385a (patch) | |
| tree | 6e365dadc92cab79268edbdce21a050fecd9c46d /src/write-mgr-file.c | |
| parent | eb7916d33c0e1ffc23c075c55e844f5556556c61 (diff) | |
Megapatch to port to telepathy-glib
Diffstat (limited to 'src/write-mgr-file.c')
| -rw-r--r-- | src/write-mgr-file.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/write-mgr-file.c b/src/write-mgr-file.c index 2bcf5675..77121f56 100644 --- a/src/write-mgr-file.c +++ b/src/write-mgr-file.c @@ -20,21 +20,17 @@ #include <stdio.h> -#include <dbus/dbus-glib.h> -#include <dbus/dbus-protocol.h> - -#include "telepathy-constants.h" #include "salut-connection-manager.h" static gchar * mgr_file_contents (const char *busname, const char *objpath, - const SalutProtocolSpec *protocols, + const TpCMProtocolSpec *protocols, GError **error) { GKeyFile *f = g_key_file_new(); - const SalutProtocolSpec *protocol; - const SalutParamSpec *row; + const TpCMProtocolSpec *protocol; + const TpCMParamSpec *row; g_key_file_set_string(f, "ConnectionManager", "Name", "Salut"); g_key_file_set_string(f, "ConnectionManager", "BusName", busname); @@ -89,8 +85,8 @@ main (void) { GError *error = NULL; - gchar *s = mgr_file_contents(SALUT_CONN_MGR_BUS_NAME, - SALUT_CONN_MGR_OBJECT_PATH, + gchar *s = mgr_file_contents(TP_CM_BUS_NAME_BASE "salut", + TP_CM_OBJECT_PATH_BASE "salut", salut_protocols, &error); if (!s) { |