diff options
Diffstat (limited to 'plugins/bbdb')
| -rw-r--r-- | plugins/bbdb/ChangeLog | 8 | ||||
| -rw-r--r-- | plugins/bbdb/bbdb.c | 2 | ||||
| -rw-r--r-- | plugins/bbdb/gaimbuddies.c | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog index d4c93712af..bb17fd32c8 100644 --- a/plugins/bbdb/ChangeLog +++ b/plugins/bbdb/ChangeLog @@ -1,3 +1,11 @@ +2007-10-09 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #437579 + + * bbdb.c: + * gaimbuddies.c: + Fix various compiler warnings. Patch from Milan Crha. + 2007-09-27 Matthew Barnes <mbarnes@redhat.com> * bbdb.c (bbdb_page_factory): diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index 8a0d2924cb..17eb26f176 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -266,8 +266,6 @@ bbdb_open_addressbook (int type) char *uri; EBook *book = NULL; - gboolean enable; - gboolean status; GError *error = NULL; diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index 191b0a4926..09a2f1d6c6 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -241,11 +241,12 @@ bbdb_merge_buddy_to_contact (EBook *book, GaimBuddy *b, EContact *c) if (b->icon != NULL) { photo = e_contact_get (c, E_CONTACT_PHOTO); if (photo == NULL) { + gchar *contents = NULL; photo = g_new0 (EContactPhoto, 1); photo->type = E_CONTACT_PHOTO_TYPE_INLINED; - if (! g_file_get_contents (b->icon, (gchar **) &photo->data.inlined.data, &photo->data.inlined.length, &error)) { + if (! g_file_get_contents (b->icon, &contents, &photo->data.inlined.length, &error)) { g_warning ("bbdb: Could not read buddy icon: %s\n", error->message); g_error_free (error); for (l = ims; l != NULL; l = l->next) @@ -254,6 +255,7 @@ bbdb_merge_buddy_to_contact (EBook *book, GaimBuddy *b, EContact *c) return dirty; } + photo->data.inlined.data = (unsigned char *)contents; e_contact_set (c, E_CONTACT_PHOTO, (gpointer) photo); dirty = TRUE; } |