diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2006-10-01 19:55:39 +0800 |
|---|---|---|
| committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2006-10-01 19:55:39 +0800 |
| commit | e86a94310a715ec7c300145cbd58ef9ac93389b0 (patch) | |
| tree | aa3e481c6fc422dcc7200ad1ff0eab1e59ffedd4 /addressbook/gui/contact-editor | |
| parent | 8f0374166d477e9ee2d64ee7bfe75b537fb5382a (diff) | |
| download | gsoc2013-evolution-e86a94310a715ec7c300145cbd58ef9ac93389b0.tar gsoc2013-evolution-e86a94310a715ec7c300145cbd58ef9ac93389b0.tar.gz gsoc2013-evolution-e86a94310a715ec7c300145cbd58ef9ac93389b0.tar.bz2 gsoc2013-evolution-e86a94310a715ec7c300145cbd58ef9ac93389b0.tar.lz gsoc2013-evolution-e86a94310a715ec7c300145cbd58ef9ac93389b0.tar.xz gsoc2013-evolution-e86a94310a715ec7c300145cbd58ef9ac93389b0.tar.zst gsoc2013-evolution-e86a94310a715ec7c300145cbd58ef9ac93389b0.zip | |
Remove duplicate include. Fix some compiler warnings. Cast away a compiler
2006-10-01 Kjartan Maraas <kmaraas@gnome.org>
* gui/component/addressbook-component.c: Remove duplicate include.
* gui/contact-editor/e-contact-editor.c: (extract_simple_field):
Fix some compiler warnings.
* gui/contact-editor/e-contact-quick-add.c:
(build_quick_add_dialog): Cast away a compiler warning.
* gui/widgets/e-addressbook-view.c: (generate_viewoption_menu):
#if 0 out an unused array, fix 0 vs NULL initialization in some
other arrays and remove an unused GSList.
* gui/widgets/e-minicard.c: (add_email_field): Make a var const.
* gui/widgets/eab-gui-util.c: (eab_contact_save),
(eab_contact_list_save): Add some casts to fix compiler warnings
and #if 0 out an unused function.
* util/eab-book-util.c: (escape), (eab_contact_list_from_string):
Some GString fixes. All of this from bug #332101.
svn path=/trunk/; revision=32841
Diffstat (limited to 'addressbook/gui/contact-editor')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-quick-add.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index b40f780564..efd9b72503 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -2265,7 +2265,7 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) { if (editor->image_set && e_image_chooser_get_image_data (E_IMAGE_CHOOSER (widget), - &photo.data.inlined.data, &photo.data.inlined.length)) { + (char **)&photo.data.inlined.data, &photo.data.inlined.length)) { GdkPixbuf *pixbuf, *new; GdkPixbufLoader *loader = gdk_pixbuf_loader_new(); @@ -2294,7 +2294,7 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) new = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR); if (new) { g_free(photo.data.inlined.data); - gdk_pixbuf_save_to_buffer (new, &photo.data.inlined.data, &photo.data.inlined.length, "jpeg", NULL, "quality", "100", NULL); + gdk_pixbuf_save_to_buffer (new, (gchar **)&photo.data.inlined.data, &photo.data.inlined.length, "jpeg", NULL, "quality", "100", NULL); g_object_unref (new); } diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 07be81fd1d..c3b1d3f70e 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -325,7 +325,7 @@ build_quick_add_dialog (QuickAdd *qa) qa->book = NULL; } qa->book = book ; - source_selected(qa->option_menu, e_source_option_menu_peek_selected (qa->option_menu), qa); + source_selected(qa->option_menu, e_source_option_menu_peek_selected ((ESourceOptionMenu *)qa->option_menu), qa); g_signal_connect (qa->option_menu, "source_selected", G_CALLBACK (source_selected), qa); g_object_unref (source_list); |