From 374bd42f69aca2e132fd854c9619f3d7491f1f96 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 12 Jul 2009 23:33:07 -0400 Subject: Fix excessive whitespace. --- plugins/exchange-operations/exchange-account-setup.c | 5 ----- plugins/exchange-operations/exchange-config-listener.c | 6 ------ plugins/exchange-operations/exchange-contacts.c | 1 - plugins/exchange-operations/exchange-delegates-user.c | 4 ---- plugins/exchange-operations/exchange-delegates-user.h | 2 -- plugins/exchange-operations/exchange-delegates.c | 3 --- plugins/exchange-operations/exchange-folder-subscription.c | 2 -- plugins/exchange-operations/exchange-folder.c | 4 ---- plugins/exchange-operations/exchange-mail-send-options.c | 1 - plugins/exchange-operations/exchange-permissions-dialog.c | 9 --------- plugins/exchange-operations/exchange-send-options.h | 3 --- plugins/exchange-operations/exchange-user-dialog.c | 2 -- 12 files changed, 42 deletions(-) (limited to 'plugins/exchange-operations') diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index 46f4101bb9..296e44282c 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -80,7 +80,6 @@ CamelServiceAuthType camel_exchange_password_authtype = { TRUE }; - typedef struct { gboolean state; gchar *message; @@ -297,14 +296,12 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data) } g_signal_connect (radio_oof, "toggled", G_CALLBACK (toggled_state), NULL); - gtk_table_attach (tbl_oof_status, GTK_WIDGET (lbl_status), 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0); gtk_table_attach (tbl_oof_status, GTK_WIDGET (radio_iof), 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0); gtk_table_attach (tbl_oof_status, GTK_WIDGET (radio_oof), 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0); gtk_box_pack_start (GTK_BOX (vbox_oof), GTK_WIDGET (tbl_oof_status), FALSE, FALSE, 0); - scrwnd_oof = (GtkScrolledWindow*) g_object_new (GTK_TYPE_SCROLLED_WINDOW, "hscrollbar-policy", GTK_POLICY_AUTOMATIC, "vscrollbar-policy", GTK_POLICY_AUTOMATIC, "shadow-type", GTK_SHADOW_IN, NULL); gtk_box_pack_start (GTK_BOX (vbox_oof), GTK_WIDGET (scrwnd_oof), FALSE, FALSE, 0); txtview_oof = (GtkTextView*) g_object_new (GTK_TYPE_TEXT_VIEW, "justification", GTK_JUSTIFY_LEFT, "wrap-mode", GTK_WRAP_WORD, "editable", TRUE, NULL); @@ -510,7 +507,6 @@ owa_authenticate_user(GtkWidget *button, EConfig *config) camel_url_set_host (url, valid ? exchange_params->host : ""); - if (valid) camel_url_set_param (url, "save-passwd", remember_password? "true" : "false"); @@ -964,7 +960,6 @@ exchange_authtype_changed (GtkComboBox *dropdown, EConfig *config) camel_url_free(url_transport); } - GtkWidget * org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data) { diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c index 4e10acabdd..a45d9bc309 100644 --- a/plugins/exchange-operations/exchange-config-listener.c +++ b/plugins/exchange-operations/exchange-config-listener.c @@ -177,7 +177,6 @@ finalize (GObject *object) E2K_MAKE_TYPE (exchange_config_listener, ExchangeConfigListener, class_init, init, PARENT_TYPE) - #define EVOLUTION_URI_PREFIX "evolution:/" #define EVOLUTION_URI_PREFIX_LEN (sizeof (EVOLUTION_URI_PREFIX) - 1) @@ -251,7 +250,6 @@ add_defaults_for_account (ExchangeConfigListener *config_listener, } } - static gboolean is_active_exchange_account (EAccount *account) { @@ -355,7 +353,6 @@ add_account_esources (ExchangeAccount *account, g_object_unref (source); g_free (relative_uri); - } else if (folder->type == EXCHANGE_TASKS_FOLDER){ relative_uri = g_strdup (folder->uri + @@ -1281,7 +1278,6 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac } #endif - /** * exchange_camel_urls_is_equal * @@ -1331,7 +1327,6 @@ exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2) return TRUE; } - /** * remove_selected_non_offline_esources * @@ -1356,7 +1351,6 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gco const gchar *offline_mode=NULL; gchar *selected_gconf_key; - if (gconf_key && !strcmp (gconf_key, CONF_KEY_CAL)) { selected_gconf_key = g_strdup (CONF_KEY_SELECTED_CAL_SOURCES); } else if (gconf_key && !strcmp (gconf_key, CONF_KEY_TASKS)) { diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c index aec27f3f69..7fb9f858b6 100644 --- a/plugins/exchange-operations/exchange-contacts.c +++ b/plugins/exchange-operations/exchange-contacts.c @@ -51,7 +51,6 @@ enum { gboolean contacts_src_exists = FALSE; gchar *contacts_old_src_uri = NULL; - static GPtrArray *e_exchange_contacts_get_contacts (void); void e_exchange_contacts_pcontacts_on_change (GtkTreeView *treeview, ESource *source); GtkWidget *e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data); diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c index 085bce398b..bc8cb1e357 100644 --- a/plugins/exchange-operations/exchange-delegates-user.c +++ b/plugins/exchange-operations/exchange-delegates-user.c @@ -48,7 +48,6 @@ #include - #define EXCHANGE_DELEGATES_USER_CUSTOM -3 /* Can't use E2K_PERMISSIONS_ROLE_CUSTOM, because it's -1, which * means "end of list" to e_dialog_combo_box_get/set @@ -80,7 +79,6 @@ static const gchar *widget_names[] = { "calendar_perms_combobox", "task_perms_combobox", "inbox_perms_combobox", "contact_perms_combobox", }; - enum { EDITED, LAST_SIGNAL @@ -193,7 +191,6 @@ em_utils_delegates_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessag mail_send (); } - /** * exchange_delegates_user_edit: * @user: a delegate @@ -281,7 +278,6 @@ exchange_delegates_user_edit (ExchangeAccount *account, } } - /* The following piece of code is used to construct a mail message to be sent to a Delegate summarizing all the permissions set for him on the user's various folders. */ diff --git a/plugins/exchange-operations/exchange-delegates-user.h b/plugins/exchange-operations/exchange-delegates-user.h index deb5b04152..3d886d7262 100644 --- a/plugins/exchange-operations/exchange-delegates-user.h +++ b/plugins/exchange-operations/exchange-delegates-user.h @@ -76,8 +76,6 @@ ExchangeDelegatesUser *exchange_delegates_user_new_from_gc (E2kGlobalCatalog gboolean exchange_delegates_user_edit (ExchangeAccount *account, ExchangeDelegatesUser *user, GtkWidget *parent_window); - - G_END_DECLS #endif /* __EXCHANGE_DELEGATES_USER_H__ */ diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c index 5ecc02e0b1..7b466ead07 100644 --- a/plugins/exchange-operations/exchange-delegates.c +++ b/plugins/exchange-operations/exchange-delegates.c @@ -280,7 +280,6 @@ get_folder_security (ExchangeDelegates *delegates) return TRUE; } - static const gchar *delegation_props[] = { PR_DELEGATES_DISPLAY_NAMES, PR_DELEGATES_ENTRYIDS, @@ -603,7 +602,6 @@ remove_button_clicked_cb (GtkWidget *widget, gpointer data) g_object_unref (user); } - static gboolean proppatch_sd (E2kContext *ctx, ExchangeDelegatesFolder *folder) { @@ -887,7 +885,6 @@ delegates_destroy (ExchangeDelegates *delegates) g_free (delegates); } - static void dialog_response (GtkDialog *dialog, gint response, gpointer user_data) { diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c index f8772373cb..043d5797e4 100644 --- a/plugins/exchange-operations/exchange-folder-subscription.c +++ b/plugins/exchange-operations/exchange-folder-subscription.c @@ -25,7 +25,6 @@ #include "config.h" #endif - #include #include #include @@ -57,7 +56,6 @@ user_clicked (GtkWidget *button, ENameSelector *name_selector) gtk_widget_show (GTK_WIDGET (name_selector_dialog)); } - static GtkWidget * setup_name_selector (GladeXML *glade_xml, ENameSelector **name_selector_ret) { diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c index 959bdec8e5..7c9f1bff41 100644 --- a/plugins/exchange-operations/exchange-folder.c +++ b/plugins/exchange-operations/exchange-folder.c @@ -24,7 +24,6 @@ #include "config.h" #endif - #include #include #include @@ -62,7 +61,6 @@ static void exchange_get_folder (gchar *uri, CamelFolder *folder, gpointer data) #define CONF_KEY_SELECTED_CAL_SOURCES "/apps/evolution/calendar/display/selected_calendars" - static EPopupItem popup_inbox_items[] = { { E_POPUP_ITEM, (gchar *) "29.inbox_unsubscribe", (gchar *) N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; @@ -143,7 +141,6 @@ org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, gpointer /* To get the CamelStore/Folder */ mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_msg_unordered_push); - } static CamelFolderInfo * @@ -539,7 +536,6 @@ org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, gpointer data) unsubscribe_dialog_response (GTK_DIALOG (dialog), response, data); } - void org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, const gchar *fname) { diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c index 87f851a8c8..4cc582f25f 100644 --- a/plugins/exchange-operations/exchange-mail-send-options.c +++ b/plugins/exchange-operations/exchange-mail-send-options.c @@ -113,7 +113,6 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) dialog->options->delegate_address); } - else { e_msg_composer_remove_header (composer, "Sender"); e_msg_composer_add_header (composer, "From", sender_id); diff --git a/plugins/exchange-operations/exchange-permissions-dialog.c b/plugins/exchange-operations/exchange-permissions-dialog.c index 9456754377..d8182a6fe1 100644 --- a/plugins/exchange-operations/exchange-permissions-dialog.c +++ b/plugins/exchange-operations/exchange-permissions-dialog.c @@ -122,8 +122,6 @@ init (GObject *object) E2K_MAKE_TYPE (exchange_permissions_dialog, ExchangePermissionsDialog, class_init, init, PARENT_TYPE) - - static void get_widgets (ExchangePermissionsDialog *dialog, GladeXML *xml); static void setup_user_list (ExchangePermissionsDialog *dialog); @@ -300,7 +298,6 @@ dialog_response (ExchangePermissionsDialog *dialog, gint response, gtk_widget_destroy (GTK_WIDGET (dialog)); } - static void set_permissions (ExchangePermissionsDialog *dialog, guint32 perms) { @@ -313,7 +310,6 @@ set_permissions (ExchangePermissionsDialog *dialog, guint32 perms) dialog->priv->changed = TRUE; } - /* User list functions */ static void @@ -518,7 +514,6 @@ setup_user_list (ExchangePermissionsDialog *dialog) g_list_free (sids); } - /* Role option menu functions */ static void @@ -577,8 +572,6 @@ display_role (ExchangePermissionsDialog *dialog) gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->role_optionmenu), role); } - - /* Toggle buttons */ static void check_toggled (GtkToggleButton *toggle, gpointer user_data) @@ -691,8 +684,6 @@ display_permissions (ExchangePermissionsDialog *dialog) dialog->priv->frozen = FALSE; } - - static void get_widgets (ExchangePermissionsDialog *dialog, GladeXML *xml) { diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h index f41ac85371..131fee0954 100644 --- a/plugins/exchange-operations/exchange-send-options.h +++ b/plugins/exchange-operations/exchange-send-options.h @@ -26,8 +26,6 @@ #include - - #define EXCHANGE_TYPE_SENDOPTIONS_DIALOG (exchange_sendoptions_dialog_get_type ()) #define EXCHANGE_SENDOPTIONS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_SENDOPTIONS_DIALOG, ExchangeSendOptionsDialog)) #define EXCHANGE_SENDOPTIONS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EXCHANGE_TYPE_SENDOPTIONS_DIALOG, ExchangeSendOptionsDialogClass)) @@ -73,7 +71,6 @@ struct _ExchangeSendOptionsDialog { ExchangeSendOptionsDialogPrivate *priv; }; - struct _ExchangeSendOptionsDialogClass { GObjectClass parent_class; void (* esod_response) (ExchangeSendOptionsDialog *esd, gint status); diff --git a/plugins/exchange-operations/exchange-user-dialog.c b/plugins/exchange-operations/exchange-user-dialog.c index 3b7602f6e4..6cb20e682d 100644 --- a/plugins/exchange-operations/exchange-user-dialog.c +++ b/plugins/exchange-operations/exchange-user-dialog.c @@ -91,8 +91,6 @@ init (E2kUserDialog *dialog) E2K_MAKE_TYPE (e2k_user_dialog, E2kUserDialog, class_init, init, PARENT_TYPE) - - static void parent_window_destroyed (gpointer user_data, GObject *where_parent_window_was) { -- cgit v1.2.3