Mercurial > pidgin

comparison libpurple/gaim-client.c @ 15822:32c366eeeb99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sed -ie 's/gaim/purple/g'
author Sean Egan <seanegan@gmail.com>
date Mon, 19 Mar 2007 07:01:17 +0000
parents 5fe8042783c1
children
comparison
equal deleted inserted replaced
15821:84b0f9b23ede 15822:32c366eeeb99
2 2
3 #include <dbus/dbus-glib.h> 3 #include <dbus/dbus-glib.h>
4 #include <stdio.h> 4 #include <stdio.h>
5 #include <stdlib.h> 5 #include <stdlib.h>
6 6
7 #include "dbus-gaim.h" 7 #include "dbus-purple.h"
8 #include "gaim-client-bindings.h" 8 #include "purple-client-bindings.h"
9 9
10 static DBusGConnection *bus; 10 static DBusGConnection *bus;
11 static DBusGProxy *gaim_proxy; 11 static DBusGProxy *purple_proxy;
12 12
13 static GList *garray_int_to_glist(GArray *array) 13 static GList *garray_int_to_glist(GArray *array)
14 { 14 {
15 GList *list = NULL; 15 GList *list = NULL;
16 int i; 16 int i;
32 32
33 g_array_free(array, TRUE); 33 g_array_free(array, TRUE);
34 return list; 34 return list;
35 } 35 }
36 36
37 #include "gaim-client-bindings.c" 37 #include "purple-client-bindings.c"
38 38
39 static void lose(const char *fmt, ...) G_GNUC_NORETURN G_GNUC_PRINTF (1, 2); 39 static void lose(const char *fmt, ...) G_GNUC_NORETURN G_GNUC_PRINTF (1, 2);
40 static void lose_gerror(const char *prefix, GError *error) G_GNUC_NORETURN; 40 static void lose_gerror(const char *prefix, GError *error) G_GNUC_NORETURN;
41 41
42 static void 42 static void
58 lose_gerror(const char *prefix, GError *error) 58 lose_gerror(const char *prefix, GError *error)
59 { 59 {
60 lose("%s: %s", prefix, error->message); 60 lose("%s: %s", prefix, error->message);
61 } 61 }
62 62
63 void gaim_init(void) 63 void purple_init(void)
64 { 64 {
65 GError *error = NULL; 65 GError *error = NULL;
66 66
67 g_type_init (); 67 g_type_init ();
68 68
69 bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error); 69 bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
70 if (!bus) 70 if (!bus)
71 lose_gerror ("Couldn't connect to session bus", error); 71 lose_gerror ("Couldn't connect to session bus", error);
72 72
73 gaim_proxy = dbus_g_proxy_new_for_name (bus, 73 purple_proxy = dbus_g_proxy_new_for_name (bus,
74 DBUS_SERVICE_GAIM, 74 DBUS_SERVICE_PURPLE,
75 DBUS_PATH_GAIM, 75 DBUS_PATH_PURPLE,
76 DBUS_INTERFACE_GAIM); 76 DBUS_INTERFACE_PURPLE);
77 77
78 if (!gaim_proxy) 78 if (!purple_proxy)
79 lose_gerror ("Couldn't connect to the Gaim Service", error); 79 lose_gerror ("Couldn't connect to the Purple Service", error);
80 } 80 }
81 81