diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2007-10-24 22:11:25 +0800 |
|---|---|---|
| committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2007-10-24 22:11:25 +0800 |
| commit | faae84477af9ba732358930d7d6ba57f16c4a6df (patch) | |
| tree | 236ae64f47381d5e713fcaf81a981944f1a5d150 /addressbook/gui/merging | |
| parent | a1fb36c15210deac4ca989703587060c549c6e51 (diff) | |
| download | gsoc2013-evolution-faae84477af9ba732358930d7d6ba57f16c4a6df.tar.gz gsoc2013-evolution-faae84477af9ba732358930d7d6ba57f16c4a6df.tar.zst gsoc2013-evolution-faae84477af9ba732358930d7d6ba57f16c4a6df.zip | |
Warning fixes: - mixing code and declarations - NULL vs 0 vs FALSE/TRUE -
2007-10-23 Kjartan Maraas <kmaraas@gnome.org>
* 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
Diffstat (limited to 'addressbook/gui/merging')
| -rw-r--r-- | addressbook/gui/merging/eab-contact-merging.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index 446868643c..a37f877fd8 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -185,7 +185,7 @@ mergeit (EContactMergingLookup *lookup) int num_of_email; GList *email_attr_list; int row = -1; - int value = 0; + int value = 0, result; dialog = (GtkDialog *)(gtk_dialog_new_with_buttons (_("Merge Contact"), NULL, GTK_DIALOG_NO_SEPARATOR, NULL)); gtk_container_border_width (GTK_CONTAINER(dialog), 5); @@ -332,7 +332,7 @@ mergeit (EContactMergingLookup *lookup) gtk_widget_show (scrolled_window); g_signal_connect (dialog, "map-event", G_CALLBACK (dialog_map), table); gtk_widget_show_all ((GtkWidget *)table); - gint result = gtk_dialog_run (dialog); + result = gtk_dialog_run (dialog); switch (result) { |