diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/bbdb/ChangeLog | 8 | ||||
| -rw-r--r-- | plugins/bbdb/bbdb.c | 2 | ||||
| -rw-r--r-- | plugins/bbdb/gaimbuddies.c | 4 | ||||
| -rw-r--r-- | plugins/calendar-http/ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/calendar-http/calendar-http.c | 8 | ||||
| -rw-r--r-- | plugins/exchange-operations/ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/exchange-operations/exchange-user-dialog.c | 2 | ||||
| -rw-r--r-- | plugins/face/ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/face/face.c | 2 |
9 files changed, 38 insertions, 9 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; } diff --git a/plugins/calendar-http/ChangeLog b/plugins/calendar-http/ChangeLog index 839d2ca8fb..81f5f92245 100644 --- a/plugins/calendar-http/ChangeLog +++ b/plugins/calendar-http/ChangeLog @@ -1,3 +1,10 @@ +2007-10-09 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #437579 + + * calendar-http.c: + Fix various compiler warnings. Patch from Milan Crha. + 2007-07-25 Milan Crha <mcrha@redhat.com> ** Fix for bug #268162 diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c index bbf026ba83..cad85d972d 100644 --- a/plugins/calendar-http/calendar-http.c +++ b/plugins/calendar-http/calendar-http.c @@ -377,9 +377,9 @@ e_calendar_http_auth (EPlugin *epl, EConfigHookItemFactoryData *data) GtkWidget *entry, *parent; int row; ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; - ESource *source = t->source; EUri *uri; - char* uri_text; + char *uri_text; + const char *username; static GtkWidget *hidden = NULL; if (!hidden) @@ -408,11 +408,11 @@ e_calendar_http_auth (EPlugin *epl, EConfigHookItemFactoryData *data) gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row+1, GTK_FILL, GTK_SHRINK, 0, 0); - uri_text = e_source_get_property (t->source, "username"); + username = e_source_get_property (t->source, "username"); entry = gtk_entry_new (); gtk_widget_show (entry); - gtk_entry_set_text (GTK_ENTRY (entry), uri_text ? uri_text : ""); + gtk_entry_set_text (GTK_ENTRY (entry), username ? username : ""); gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (username_changed), t->source); diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index a9d05014d7..56d43fd1d7 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,10 @@ +2007-10-09 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #437579 + + * exchange-user-dialog.c: + Fix various compiler warnings. Patch from Milan Crha. + 2007-10-02 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #469657 diff --git a/plugins/exchange-operations/exchange-user-dialog.c b/plugins/exchange-operations/exchange-user-dialog.c index 75053af240..bd5da39a70 100644 --- a/plugins/exchange-operations/exchange-user-dialog.c +++ b/plugins/exchange-operations/exchange-user-dialog.c @@ -250,7 +250,7 @@ e2k_user_dialog_get_user_list (E2kUserDialog *dialog) return NULL; for (l = destinations; l; l = g_list_next (l)) { - char *mail; + const char *mail; destination = l->data; mail = e_destination_get_email (destination); diff --git a/plugins/face/ChangeLog b/plugins/face/ChangeLog index bdf008141e..2b47cac720 100644 --- a/plugins/face/ChangeLog +++ b/plugins/face/ChangeLog @@ -1,3 +1,10 @@ +2007-10-09 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #437579 + + * face.c: + Fix various compiler warnings. Patch from Milan Crha. + 2007-09-27 Matthew Barnes <mbarnes@redhat.com> * org-gnome-face-eplug.xml: diff --git a/plugins/face/face.c b/plugins/face/face.c index a747c3710a..2f9d1fb1c4 100644 --- a/plugins/face/face.c +++ b/plugins/face/face.c @@ -98,7 +98,7 @@ void org_gnome_composer_face (EPlugin * ep, EMMenuTargetWidget * t) d (printf ("\n\a Invalid Image Size. Please choose a 48*48 image\n\a")); e_error_run (NULL, "org.gnome.evolution.plugins.face:invalid-image-size", NULL, NULL); } else { - file_contents = g_base64_encode (file_contents, length); + file_contents = g_base64_encode ((guchar *) file_contents, length); g_file_set_contents (filename, file_contents, -1, &error); } } |