From b815f556a924129f60de97bcdaf588e89244aa9d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 24 Aug 2007 10:47:40 +0000 Subject: 2007-08-24 Suman Manjunath Fix for bug #440807 svn path=/trunk/; revision=34096 --- plugins/bbdb/ChangeLog | 10 ++++++++++ plugins/bbdb/bbdb.c | 4 ++-- plugins/bbdb/gaimbuddies.c | 16 ++++++++-------- 3 files changed, 20 insertions(+), 10 deletions(-) (limited to 'plugins/bbdb') diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog index 9a051b2ae3..eec6a27361 100644 --- a/plugins/bbdb/ChangeLog +++ b/plugins/bbdb/ChangeLog @@ -1,3 +1,13 @@ +2007-08-24 Suman Manjunath + + ** Fix for bug #440807 + + * bbdb.c: (bbdb_page_factory): + * gaimbuddies.c: (bbdb_sync_buddy_list_check), + (bbdb_get_gaim_buddy_list), (get_buddy_icon_from_setting), + (parse_contact): + Sync now with Pidgin IM [previously Gaim IM]. + 2007-08-06 Sankar P * Committed on behalf of Diego Escalante Urrelo diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index 08b5a78c33..131e081f36 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -508,13 +508,13 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0); /* Enable Gaim Checkbox */ - check_gaim = gtk_check_button_new_with_mnemonic (_("Periodically synchronize contact information and images from gaim buddy list")); + check_gaim = gtk_check_button_new_with_mnemonic (_("Periodically synchronize contact information and images from Pidgin buddy list")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_gaim), gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE_GAIM, NULL)); g_signal_connect (GTK_TOGGLE_BUTTON (check_gaim), "toggled", G_CALLBACK (enable_gaim_toggled_cb), stuff); gtk_box_pack_start (GTK_BOX (inner_vbox), check_gaim, FALSE, FALSE, 0); stuff->check_gaim = check_gaim; - gaim_label = gtk_label_new (_("Select Address book for Gaim buddy list")); + gaim_label = gtk_label_new (_("Select Address book for Pidgin buddy list")); gtk_box_pack_start (GTK_BOX (inner_vbox), gaim_label, FALSE, FALSE, 0); /* Gaim Source Selection Option Menu */ diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index b77a058970..191b0a4926 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -85,7 +85,7 @@ bbdb_sync_buddy_list_check (void) gconf = gconf_client_get_default (); - blist_path = g_build_path ("/", getenv ("HOME"), ".gaim/blist.xml", NULL); + blist_path = g_build_path ("/", getenv ("HOME"), ".purple/blist.xml", NULL); if (stat (blist_path, &statbuf) < 0) { g_free (blist_path); g_object_unref (G_OBJECT (gconf)); @@ -299,18 +299,18 @@ bbdb_get_gaim_buddy_list (void) xmlNodePtr root, child, blist; GList *buddies = NULL; - blist_path = g_build_path ("/", getenv ("HOME"), ".gaim/blist.xml", NULL); + blist_path = g_build_path ("/", getenv ("HOME"), ".purple/blist.xml", NULL); buddy_xml = xmlParseFile (blist_path); g_free (blist_path); if (! buddy_xml) { - fprintf (stderr, "bbdb: Could not open Gaim buddy list.\n"); + fprintf (stderr, "bbdb: Could not open Pidgin buddy list.\n"); return NULL; } root = xmlDocGetRootElement (buddy_xml); - if (strcmp ((const char *)root->name, "gaim")) { - fprintf (stderr, "bbdb: Could not parse Gaim buddy list.\n"); + if (strcmp ((const char *)root->name, "purple")) { + fprintf (stderr, "bbdb: Could not parse Pidgin buddy list.\n"); xmlFreeDoc (buddy_xml); return NULL; } @@ -323,7 +323,7 @@ bbdb_get_gaim_buddy_list (void) } } if (blist == NULL) { - fprintf (stderr, "bbdb: Could not find 'blist' element in Gaim buddy list.\n"); + fprintf (stderr, "bbdb: Could not find 'blist' element in Pidgin buddy list.\n"); xmlFreeDoc (buddy_xml); return NULL; } @@ -375,7 +375,7 @@ get_buddy_icon_from_setting (xmlNodePtr setting) if (icon [0] != '/') { char *path; - path = g_build_path ("/", getenv ("HOME"), ".gaim/icons", icon, NULL); + path = g_build_path ("/", getenv ("HOME"), ".purple/icons", icon, NULL); g_free (icon); icon = path; } @@ -399,7 +399,7 @@ parse_contact (xmlNodePtr contact, GList **buddies) } if (buddy == NULL) { - fprintf (stderr, "bbdb: Could not find buddy in contact. Malformed Gaim buddy list file.\n"); + fprintf (stderr, "bbdb: Could not find buddy in contact. Malformed Pidgin buddy list file.\n"); return; } -- cgit v1.2.3