From a538f3f3100dbdbae1ea172ae3b8344e650d529d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 16 May 2009 12:11:55 -0400 Subject: Fix several types of pedantic compiler warnings. --- plugins/attachment-reminder/attachment-reminder.c | 2 +- plugins/audio-inline/Makefile.am | 5 +++-- plugins/backup-restore/backup-restore.c | 2 +- plugins/email-custom-header/email-custom-header.c | 4 ++-- plugins/exchange-operations/exchange-account-setup.c | 2 +- plugins/groupwise-features/install-shared.c | 4 ++-- plugins/groupwise-features/share-folder-common.c | 2 +- plugins/groupwise-features/share-folder.c | 2 +- plugins/publish-calendar/publish-location.h | 10 +++------- plugins/publish-calendar/url-editor-dialog.h | 4 ++-- plugins/sa-junk-plugin/em-junk-filter.c | 9 --------- plugins/templates/templates.c | 2 +- plugins/tnef-attachments/Makefile.am | 3 +++ 13 files changed, 21 insertions(+), 30 deletions(-) (limited to 'plugins') diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index 8634ce4000..08c1956303 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -65,7 +65,7 @@ typedef struct { enum { CLUE_KEYWORD_COLUMN, - CLUE_N_COLUMNS, + CLUE_N_COLUMNS }; int e_plugin_lib_enable (EPluginLib *ep, int enable); diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am index 73e0b988d6..c17876d622 100644 --- a/plugins/audio-inline/Makefile.am +++ b/plugins/audio-inline/Makefile.am @@ -10,8 +10,9 @@ plugin_LTLIBRARIES = liborg-gnome-audio-inline.la liborg_gnome_audio_inline_la_SOURCES = audio-inline.c liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_audio_inline_la_LIBADD = \ - $(GSTREAMER_LIBS) \ +liborg_gnome_audio_inline_la_LIBADD = \ + $(top_builddir)/mail/libevolution-module-mail.la \ + $(GSTREAMER_LIBS) \ $(EVOLUTION_MAIL_LIBS) EXTRA_DIST = org-gnome-audio-inline.eplug.xml diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index 5d4a911c9a..f9745e8972 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -48,7 +48,7 @@ void backup_restore_abort (EPlugin *ep, EMConfigTargetAccount *target); typedef enum _br_flags { BR_OK = 1<<0, - BR_START = 1<<1, + BR_START = 1<<1 }br_flags; static void diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 38d41f8470..1e88303e50 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -55,7 +55,7 @@ typedef struct { enum { HEADER_KEY_COLUMN, HEADER_VALUE_COLUMN, - HEADER_N_COLUMNS, + HEADER_N_COLUMNS }; struct _EmailCustomHeaderOptionsDialogPrivate { @@ -350,7 +350,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) for (header_section_id = 0,label_row = 0,row = 0,column = 1; header_section_id < priv->email_custom_header_details->len; header_section_id++,row++,column++) { - // To create an empty label widget. Text will be added dynamically. + /* To create an empty label widget. Text will be added dynamically. */ priv->header_type_name_label = gtk_label_new (""); temp_header_ptr = &g_array_index(priv->email_custom_header_details, EmailCustomHeaderDetails,header_section_id); str = (temp_header_ptr->header_type_value)->str; diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index ae889247c8..ccfb6afb71 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -136,7 +136,7 @@ btn_chpass_clicked (GtkButton *button, gpointer data) /* "Cacel" button was hit */ return; } - //g_print ("Current password is \"%s\"\n", old_password); + /* g_print ("Current password is \"%s\"\n", old_password); */ result = exchange_account_set_password (account, old_password, new_password); if (result != EXCHANGE_ACCOUNT_CONNECT_SUCCESS) exchange_operations_report_error (account, result); diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index 2f60b34bff..bfe295447f 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -113,10 +113,10 @@ install_folder_response (EMFolderSelector *emfs, int response, gpointer *data) /*changes = camel_folder_change_info_new (); camel_folder_change_info_remove_uid (changes, (char *) item_id); camel_folder_summary_remove_uid (folder->summary, item_id);*/ - //camel_folder_delete_message (folder, item_id); + /* camel_folder_delete_message (folder, item_id); */ camel_folder_set_message_flags (folder, item_id, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED); camel_folder_summary_touch (folder->summary); - //camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes); + /* camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes); */ uri = camel_url_to_string (((CamelService *) store)->url, CAMEL_URL_HIDE_ALL); account = mail_config_get_account_by_source_url (uri); uri = account->source->url; diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 0b811d0787..3a850b2a55 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -94,7 +94,7 @@ refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store) if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE)) return; em_folder_tree_model_add_store (model, store, account->name); - //camel_object_unref (store); + /* camel_object_unref (store); */ } void diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index d16c205758..9b3062b1c3 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -181,7 +181,7 @@ free_all (ShareFolder *sf) sf->users_list = NULL; } - //e_gw_connection_free_container_list (sf->container_list); + /* e_gw_connection_free_container_list (sf->container_list); */ } diff --git a/plugins/publish-calendar/publish-location.h b/plugins/publish-calendar/publish-location.h index ec627d18ce..327cd986fd 100644 --- a/plugins/publish-calendar/publish-location.h +++ b/plugins/publish-calendar/publish-location.h @@ -31,29 +31,25 @@ G_BEGIN_DECLS enum publish_frequency { URI_PUBLISH_DAILY, URI_PUBLISH_WEEKLY, - URI_PUBLISH_MANUAL, - /* URI_PUBLISH_AUTO, */ + URI_PUBLISH_MANUAL }; static const int publish_frequency_type_map[] = { URI_PUBLISH_DAILY, URI_PUBLISH_WEEKLY, URI_PUBLISH_MANUAL, - /* URI_PUBLISH_AUTO, */ -1, }; enum publish_format { URI_PUBLISH_AS_ICAL, - URI_PUBLISH_AS_FB, - /* URI_PUBLISH_AS_HTML, */ + URI_PUBLISH_AS_FB }; static const int publish_format_type_mask[] = { URI_PUBLISH_AS_ICAL, URI_PUBLISH_AS_FB, - /* URI_PUBLISH_AS_HTML, */ - -1, + -1 }; enum FBDurationType { diff --git a/plugins/publish-calendar/url-editor-dialog.h b/plugins/publish-calendar/url-editor-dialog.h index 3a85fc895e..94a1a71f00 100644 --- a/plugins/publish-calendar/url-editor-dialog.h +++ b/plugins/publish-calendar/url-editor-dialog.h @@ -40,7 +40,7 @@ enum { URL_LIST_ENABLED_COLUMN, URL_LIST_LOCATION_COLUMN, URL_LIST_URL_COLUMN, - URL_LIST_N_COLUMNS, + URL_LIST_N_COLUMNS }; enum { @@ -50,7 +50,7 @@ enum { TYPE_SMB, TYPE_DAV, TYPE_DAVS, - TYPE_URI, + TYPE_URI }; typedef struct _UrlEditorDialog UrlEditorDialog; diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 5114e9b386..8a15ce98ac 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -59,7 +59,6 @@ static pthread_mutex_t em_junk_sa_preferred_socket_path_lock = PTHREAD_MUTEX_INI static pthread_mutex_t em_junk_sa_spamd_restart_lock = PTHREAD_MUTEX_INITIALIZER; int e_plugin_lib_enable (EPluginLib *ep, int enable); -//static const char *em_junk_sa_get_name (void); gboolean em_junk_sa_check_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target); @@ -104,14 +103,6 @@ static gboolean em_junk_sa_allow_tell_tested = FALSE; char *em_junk_sa_spamc_gconf_binary = NULL; char *em_junk_sa_spamd_gconf_binary = NULL; -#if 0 -static const char * -em_junk_sa_get_name (void) -{ - return _("SpamAssassin (built-in)"); -} -#endif - static int pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, int wait_for_termination, GByteArray *output_buffer, GError **error) { diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index eae87721c4..537b8822bc 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -60,7 +60,7 @@ typedef struct { enum { CLUE_KEYWORD_COLUMN, CLUE_VALUE_COLUMN, - CLUE_N_COLUMNS, + CLUE_N_COLUMNS }; typedef struct { diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am index f216d7f418..d473f15af0 100644 --- a/plugins/tnef-attachments/Makefile.am +++ b/plugins/tnef-attachments/Makefile.am @@ -13,6 +13,9 @@ plugin_LTLIBRARIES = liborg-gnome-tnef-attachments.la liborg_gnome_tnef_attachments_la_SOURCES = tnef-plugin.c liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_tnef_attachments_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/em-format/libemformat.la \ + $(EVOLUTION_MAIL_LIBS) \ -lytnef EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml -- cgit v1.2.3