diff src/gaim-client.c @ 14035:8bda65b88e49

[gaim-migrate @ 16638] A bunch of small changes. Mostly remove "if not null" checks before calling g_free, g_list_free, g_slist_free and g_strdup. Also use g_list_foreach() to call g_free to free strings in an array. And some whitespace changes here and there. committer: Tailor Script <[e-mail]>

--- a/src/gaim-client.c	Sat Aug 05 05:42:28 2006 +0000
+++ b/src/gaim-client.c	Sat Aug 05 08:27:39 2006 +0000
@@ -10,69 +10,72 @@
 static DBusGConnection *bus;
 static DBusGProxy *gaim_proxy;
 
-static GList *garray_int_to_glist(GArray *array) {
-    GList *list = NULL;
-    int i;
+static GList *garray_int_to_glist(GArray *array)
+{
+	GList *list = NULL;
+	int i;
 
-    for(i = 0; i < array->len; i++) 
-	list = g_list_append(list, GINT_TO_POINTER(g_array_index(array,gint,i)));
+	for (i = 0; i < array->len; i++)
+		list = g_list_append(list, GINT_TO_POINTER(g_array_index(array,gint,i)));
 
-    g_array_free(array, TRUE);
-    return list;
+	g_array_free(array, TRUE);
+	return list;
 }
 
-static GSList *garray_int_to_gslist(GArray *array) {
-    GSList *list = NULL;
-    int i;
+static GSList *garray_int_to_gslist(GArray *array)
+{
+	GSList *list = NULL;
+	int i;
 
-    for(i = 0; i < array->len; i++) 
-	list = g_slist_append(list, GINT_TO_POINTER(g_array_index(array,gint,i)));
+	for (i = 0; i < array->len; i++)
+		list = g_slist_append(list, GINT_TO_POINTER(g_array_index(array,gint,i)));
 
-    g_array_free(array, TRUE);
-    return list;
+	g_array_free(array, TRUE);
+	return list;
 }
 
 #include "gaim-client-bindings.c"
 
-static void lose (const char *fmt, ...) G_GNUC_NORETURN G_GNUC_PRINTF (1, 2);
-static void lose_gerror (const char *prefix, GError *error) G_GNUC_NORETURN;
+static void lose(const char *fmt, ...) G_GNUC_NORETURN G_GNUC_PRINTF (1, 2);
+static void lose_gerror(const char *prefix, GError *error) G_GNUC_NORETURN;
 
 static void
-lose (const char *str, ...)
+lose(const char *str, ...)
 {
-  va_list args;
+	va_list args;
 
-  va_start (args, str);
+	va_start(args, str);
 
-  vfprintf (stderr, str, args);
-  fputc ('\n', stderr);
+	vfprintf(stderr, str, args);
+	fputc('\n', stderr);
 
-  va_end (args);
+	va_end(args);
 
-  exit (1);
+	exit(1);
 }
 
 static void
-lose_gerror (const char *prefix, GError *error) 
+lose_gerror(const char *prefix, GError *error)
 {
-  lose ("%s: %s", prefix, error->message);
+	lose("%s: %s", prefix, error->message);
 }
 
-void gaim_init(void) {
-  GError *error = NULL;
+void gaim_init(void)
+{
+	GError *error = NULL;
 
-  g_type_init ();
+	g_type_init ();
 
-  bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-  if (!bus) 
-    lose_gerror ("Couldn't connect to session bus", error);
+	bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+	if (!bus)
+		lose_gerror ("Couldn't connect to session bus", error);
 
-  gaim_proxy = dbus_g_proxy_new_for_name (bus,
-				    DBUS_SERVICE_GAIM,
-				    DBUS_PATH_GAIM,         
-				    DBUS_INTERFACE_GAIM);
+	gaim_proxy = dbus_g_proxy_new_for_name (bus,
+					DBUS_SERVICE_GAIM,
+					DBUS_PATH_GAIM,
+					DBUS_INTERFACE_GAIM);
 
-  if (!gaim_proxy)
-    lose_gerror ("Couldn't connect to the Gaim Service", error);
+	if (!gaim_proxy)
+		lose_gerror ("Couldn't connect to the Gaim Service", error);
 }