[Galago-commits] r2708 - in trunk/eds-feed: . src
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Tue Apr 11 23:48:24 PDT 2006
Author: chipx86
Date: 2006-04-11 23:48:22 -0700 (Tue, 11 Apr 2006)
New Revision: 2708
Modified:
trunk/eds-feed/ChangeLog
trunk/eds-feed/src/main.c
Log:
Fix indentation.
Modified: trunk/eds-feed/ChangeLog
===================================================================
--- trunk/eds-feed/ChangeLog 2006-04-12 06:44:01 UTC (rev 2707)
+++ trunk/eds-feed/ChangeLog 2006-04-12 06:48:22 UTC (rev 2708)
@@ -1,3 +1,8 @@
+Tue Apr 11 23:48:06 PDT 2006 Christian Hammond <chipx86 at chipx86.com>
+
+ * src/main.c:
+ - Fix indentation.
+
Mon Feb 13 00:19:35 PST 2006 Christian Hammond <chipx86 at chipx86.com>
D debian:
Modified: trunk/eds-feed/src/main.c
===================================================================
--- trunk/eds-feed/src/main.c 2006-04-12 06:44:01 UTC (rev 2707)
+++ trunk/eds-feed/src/main.c 2006-04-12 06:48:22 UTC (rev 2708)
@@ -49,13 +49,16 @@
g_message("Adding account %s on %s",
username, galago_service_get_id(service));
- if (username && *username != '\0')
- account = galago_service_create_account(service, person, username);
+ if (username != NULL && *username != '\0')
+ {
+ account = galago_service_create_account(service, person,
+ username);
+ }
- g_free(username);
+ g_free(username);
- im_attr_list = g_list_delete_link (im_attr_list, im_attr_list);
- e_vcard_attribute_free(attr);
+ im_attr_list = g_list_delete_link(im_attr_list, im_attr_list);
+ e_vcard_attribute_free(attr);
}
}
@@ -75,17 +78,19 @@
username = e_vcard_attribute_get_value(attr);
- if (username && *username != '\0') {
- if (galago_person_get_account(person, service, username, FALSE))
- {
- g_message("Adding account %s on %s",
- username, galago_service_get_id(service));
+ if (username != NULL && *username != '\0')
+ {
+ if (galago_person_get_account(person, service, username, FALSE))
+ {
+ g_message("Adding account %s on %s",
+ username, galago_service_get_id(service));
- account = galago_service_create_account(service, person, username);
- }
- }
+ account = galago_service_create_account(service, person,
+ username);
+ }
+ }
- g_free(username);
+ g_free(username);
}
for (l = galago_person_get_accounts(person, FALSE);
@@ -94,7 +99,7 @@
{
gboolean found = FALSE;
const char *username1;
- char *username2;
+ char *username2;
l_next = l->next;
@@ -114,10 +119,10 @@
if (!strcmp(username1, username2))
found = TRUE;
- g_free(username2);
+ g_free(username2);
- if (found)
- break;
+ if (found)
+ break;
}
if (!found)
@@ -129,13 +134,13 @@
}
}
- while (im_attr_list)
- {
+ while (im_attr_list != NULL)
+ {
EVCardAttribute *attr = (EVCardAttribute *)im_attr_list->data;
- im_attr_list = g_list_delete_link (im_attr_list, im_attr_list);
- e_vcard_attribute_free(attr);
- }
+ im_attr_list = g_list_delete_link (im_attr_list, im_attr_list);
+ e_vcard_attribute_free(attr);
+ }
}
static void
@@ -333,9 +338,9 @@
loop = g_main_loop_new(NULL, FALSE);
- g_type_init ();
+ g_type_init ();
- if (!galago_init("eds-feed", TRUE))
+ if (!galago_init("eds-feed", GALAGO_INIT_FEED))
{
g_error("Unable to initialize Galago.");
exit(1);
More information about the galago-commits
mailing list