From faae84477af9ba732358930d7d6ba57f16c4a6df Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Wed, 24 Oct 2007 14:11:25 +0000 Subject: Warning fixes: - mixing code and declarations - NULL vs 0 vs FALSE/TRUE - 2007-10-23 Kjartan Maraas * gui/contact-editor/e-contact-editor-address.c: * gui/contact-editor/e-contact-editor-fullname.c: * gui/contact-editor/e-contact-editor-im.c: * gui/contact-editor/e-contact-editor.c: (save_contact), (app_delete_event_cb), (e_contact_editor_set_property), (e_contact_editor_create_date): * gui/contact-list-editor/e-contact-list-model.c: (e_contact_list_model_new): * gui/merging/eab-contact-merging.c: (mergeit), (response): * gui/widgets/e-minicard.c: (e_minicard_event), (add_field), (get_email_location), (add_email_field), (remodel), (e_minicard_reflow), (e_minicard_compare): * gui/widgets/eab-config.c: (eab_config_new): * gui/widgets/eab-gui-util.c: (eab_load_error_dialog), (file_exists), (save_it), (contact_added_cb), (eab_send_to_contact_and_email_num_list): * gui/widgets/eab-menu.c: (eab_menu_new): * gui/widgets/eab-popup.c: (eab_popup_new): * importers/evolution-csv-importer.c: (parseLine), (getNextCSVEntry): * printing/e-contact-print-style-editor.c: * printing/test-contact-print-style-editor.c: * printing/test-print.c: * util/eab-book-util.c: (eab_get_config_database): Warning fixes: - mixing code and declarations - NULL vs 0 vs FALSE/TRUE - mark code static - some coding style fixes - if vs ifdef - Remove some unused bits - ANSIfication of declarations svn path=/trunk/; revision=34421 --- addressbook/gui/contact-editor/e-contact-editor.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'addressbook/gui/contact-editor/e-contact-editor.c') diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 20a48a511d..d5dc2bae53 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -2980,7 +2980,9 @@ static void save_contact (EContactEditor *ce, gboolean should_close) { char *uid; - + const char *name_entry_string, *file_as_entry_string, *company_name_string; + GtkWidget *entry_fullname, *entry_file_as, *company_name; + if (!ce->target_book) return; @@ -2990,12 +2992,12 @@ save_contact (EContactEditor *ce, gboolean should_close) return; } - GtkWidget *entry_fullname = glade_xml_get_widget (ce->gui, "entry-fullname" ); - GtkWidget *entry_file_as = glade_xml_get_widget (ce->gui, "entry-file-as"); - GtkWidget *company_name = glade_xml_get_widget (ce->gui, "entry-company"); - const char *name_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_fullname)); - const char *file_as_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_file_as)); - const char *company_name_string = gtk_entry_get_text (GTK_ENTRY (company_name)); + entry_fullname = glade_xml_get_widget (ce->gui, "entry-fullname" ); + entry_file_as = glade_xml_get_widget (ce->gui, "entry-file-as"); + company_name = glade_xml_get_widget (ce->gui, "entry-company"); + name_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_fullname)); + file_as_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_file_as)); + company_name_string = gtk_entry_get_text (GTK_ENTRY (company_name)); if (strcmp (company_name_string , "")) { if (!strcmp (name_entry_string, "")) @@ -3388,7 +3390,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor) gtk_widget_show (e_contact_editor->app); } -void +static void e_contact_editor_dispose (GObject *object) { EContactEditor *e_contact_editor = E_CONTACT_EDITOR(object); -- cgit v1.2.3