From e86a94310a715ec7c300145cbd58ef9ac93389b0 Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Sun, 1 Oct 2006 11:55:39 +0000 Subject: Remove duplicate include. Fix some compiler warnings. Cast away a compiler 2006-10-01 Kjartan Maraas * 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 --- addressbook/gui/widgets/e-addressbook-view.c | 9 +++++---- addressbook/gui/widgets/e-minicard.c | 2 +- addressbook/gui/widgets/eab-gui-util.c | 6 ++++-- 3 files changed, 10 insertions(+), 7 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 553085e2e8..4c36b1897d 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -171,19 +171,21 @@ enum { ESB_ANY, }; +#if 0 static ESearchBarItem addressbook_search_option_items[] = { { N_("Name begins with"), ESB_FULL_NAME, ESB_ITEMTYPE_RADIO }, { N_("Email begins with"), ESB_EMAIL, ESB_ITEMTYPE_RADIO }, { N_("Any field contains"), ESB_ANY, ESB_ITEMTYPE_RADIO }, - { NULL, -1, NULL } + { NULL, -1, 0 } }; +#endif static ESearchBarItem addressbook_search_items[] = { E_FILTERBAR_ADVANCED, - {NULL, 0, NULL}, + {NULL, 0, 0}, E_FILTERBAR_SAVE, E_FILTERBAR_EDIT, - {NULL, -1, NULL} + {NULL, -1, 0} }; GType @@ -1623,7 +1625,6 @@ generate_viewoption_menu (EABSearchBarItem *subitems) { GtkWidget *menu, *menu_item; gint i = 0; - GSList *l; menu = gtk_menu_new (); diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 5678eb116b..aa968ed263 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -838,7 +838,7 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, i GnomeCanvasItem *new_item; GnomeCanvasGroup *group; EMinicardField *minicard_field; - char *name; + const char *name; char *string; GList *l, *le; int count =0; diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index a38d17b3de..64685bf6ff 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -528,7 +528,7 @@ eab_contact_save (char *title, EContact *contact, GtkWindow *parent_window) gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (filesel), g_get_home_dir ()); gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (filesel), file); - gtk_file_chooser_set_local_only (filesel, FALSE); + gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (filesel), FALSE); info->filesel = filesel; info->vcard = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30); @@ -581,7 +581,7 @@ eab_contact_list_save (char *title, GList *list, GtkWindow *parent_window) GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_ACCEPT); - gtk_file_chooser_set_local_only (filesel, FALSE); + gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (filesel), FALSE); #else filesel = gtk_file_selection_new(title); #endif @@ -651,6 +651,7 @@ struct ContactCopyProcess_ { ContactCopyDone done_cb; }; +#if 0 static void contact_deleted_cb (EBook* book, EBookStatus status, gpointer user_data) { @@ -658,6 +659,7 @@ contact_deleted_cb (EBook* book, EBookStatus status, gpointer user_data) eab_error_dialog (_("Error removing contact"), status); } } +#endif static void do_delete (gpointer data, gpointer user_data) -- cgit