diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/addressbook/addressbook-config.c | 3 | ||||
-rw-r--r-- | modules/addressbook/e-book-shell-migrate.c | 2 | ||||
-rw-r--r-- | modules/addressbook/openldap-extract.h | 1 | ||||
-rw-r--r-- | modules/calendar/e-cal-shell-migrate.c | 1 | ||||
-rw-r--r-- | modules/calendar/e-memo-shell-migrate.c | 1 | ||||
-rw-r--r-- | modules/calendar/e-task-shell-migrate.c | 1 | ||||
-rw-r--r-- | modules/mail/e-mail-shell-migrate.c | 4 | ||||
-rw-r--r-- | modules/mail/e-mail-shell-settings.c | 1 | ||||
-rw-r--r-- | modules/mail/em-mailer-prefs.c | 4 | ||||
-rw-r--r-- | modules/mail/em-network-prefs.c | 2 |
10 files changed, 0 insertions, 20 deletions
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c index e663de03da..8c1c3376ec 100644 --- a/modules/addressbook/addressbook-config.c +++ b/modules/addressbook/addressbook-config.c @@ -627,7 +627,6 @@ eabc_general_name(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget * return w; } - static GtkWidget * eabc_general_offline(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { @@ -718,7 +717,6 @@ ssl_combobox_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) gtk_widget_set_tooltip_text (sdialog->ssl_combobox, ldap_get_ssl_tooltip (sdialog->ssl)); } - static GtkWidget * eabc_general_host(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { @@ -1241,7 +1239,6 @@ addressbook_config_edit_source (GtkWidget *parent, ESource *source) else sdialog->window = e_config_create_window((EConfig *)ec, NULL, _("New Address Book")); - /* forces initial validation */ if (!sdialog->original_source) e_config_target_changed((EConfig *)ec, E_CONFIG_TARGET_CHANGED_STATE); diff --git a/modules/addressbook/e-book-shell-migrate.c b/modules/addressbook/e-book-shell-migrate.c index fce6e0a634..c237f40d94 100644 --- a/modules/addressbook/e-book-shell-migrate.c +++ b/modules/addressbook/e-book-shell-migrate.c @@ -207,7 +207,6 @@ get_source_name (ESourceGroup *group, const gchar *path) conflict = check_for_conflict (group, s->str); - /* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */ if (conflict) starting_index -= 2; @@ -1223,7 +1222,6 @@ e_book_shell_backend_migrate (EShellBackend *shell_backend, if (personal_source) g_object_unref (personal_source); - migration_context_free (context); return TRUE; diff --git a/modules/addressbook/openldap-extract.h b/modules/addressbook/openldap-extract.h index 996bf370a8..2d8c34b242 100644 --- a/modules/addressbook/openldap-extract.h +++ b/modules/addressbook/openldap-extract.h @@ -97,7 +97,6 @@ typedef struct ldap_objectclass { gchar **oc_at_oids_may; /* OPTIONAL */ } LDAPObjectClass; - static void vfree(gpointer *vec) { diff --git a/modules/calendar/e-cal-shell-migrate.c b/modules/calendar/e-cal-shell-migrate.c index 9887a5332c..9f611f9944 100644 --- a/modules/calendar/e-cal-shell-migrate.c +++ b/modules/calendar/e-cal-shell-migrate.c @@ -231,7 +231,6 @@ get_source_name (ESourceGroup *group, const gchar *path) conflict = check_for_conflict (group, s->str); - /* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */ if (conflict) starting_index -= 2; diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c index d2e7df6d1b..20b9fea43e 100644 --- a/modules/calendar/e-memo-shell-migrate.c +++ b/modules/calendar/e-memo-shell-migrate.c @@ -153,7 +153,6 @@ add_gw_esource (ESourceList *source_list, const gchar *group_name, const gchar const gchar *poa_address; const gchar *offline_sync; - poa_address = url->host; if (!poa_address || strlen (poa_address) ==0) return; diff --git a/modules/calendar/e-task-shell-migrate.c b/modules/calendar/e-task-shell-migrate.c index ced54bafdf..2e7928fd14 100644 --- a/modules/calendar/e-task-shell-migrate.c +++ b/modules/calendar/e-task-shell-migrate.c @@ -197,7 +197,6 @@ get_source_name (ESourceGroup *group, const gchar *path) conflict = check_for_conflict (group, s->str); - /* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */ if (conflict) starting_index -= 2; diff --git a/modules/mail/e-mail-shell-migrate.c b/modules/mail/e-mail-shell-migrate.c index 2158580bf9..4bdb66d215 100644 --- a/modules/mail/e-mail-shell-migrate.c +++ b/modules/mail/e-mail-shell-migrate.c @@ -1089,7 +1089,6 @@ em_migrate_session_new (const gchar *path) return session; } - #endif /* !G_OS_WIN32 */ static GtkWidget *window; @@ -2941,13 +2940,11 @@ migrate_to_db (EShellBackend *shell_backend) i++; em_migrate_set_progress ( (double)i/(len+1)); - while (e_iterator_is_valid (iter)) { EAccount *account = (EAccount *) e_iterator_get (iter); EAccountService *service; const gchar *name; - service = account->source; name = account->name; em_migrate_set_progress ( (double)i/(len+1)); @@ -3091,7 +3088,6 @@ e_mail_shell_migrate (EShellBackend *shell_backend, #endif } - if (major < 2 || (major == 2 && minor < 22)) em_update_message_notify_settings_2_21 (); diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c index 7f73bf3f15..827d3bf5e7 100644 --- a/modules/mail/e-mail-shell-settings.c +++ b/modules/mail/e-mail-shell-settings.c @@ -408,7 +408,6 @@ e_mail_shell_settings_init (EShell *shell) shell_settings, "mail-use-custom-fonts", "/apps/evolution/mail/display/fonts/use_custom"); - /*** Composer Preferences ***/ e_shell_settings_install_property ( diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index 36afca41ae..d9ec9e751b 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -308,7 +308,6 @@ jh_remove_cb (GtkWidget *widget, gpointer user_data) } } - static GtkListStore * init_junk_tree (GtkWidget *label_tree, EMMailerPrefs *prefs) { @@ -544,7 +543,6 @@ custom_junk_button_toggled (GtkToggleButton *toggle, EMMailerPrefs *prefs) gtk_widget_set_sensitive ((GtkWidget *) prefs->junk_header_remove, FALSE); } - } static void @@ -667,7 +665,6 @@ http_images_changed (GtkWidget *widget, EMMailerPrefs *prefs) gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/load_http_images", when, NULL); } - static GtkWidget * emmp_widget_glade(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { @@ -1206,7 +1203,6 @@ em_mailer_prefs_new (EShell *shell) return GTK_WIDGET (new); } - static struct _EMMailerPrefsHeader * emmp_header_from_xmldoc (xmlDocPtr doc) { diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c index e530d4d076..4c05fca77d 100644 --- a/modules/mail/em-network-prefs.c +++ b/modules/mail/em-network-prefs.c @@ -66,10 +66,8 @@ static void em_network_prefs_init (EMNetworkPrefs *dialog); static void em_network_prefs_destroy (GtkObject *obj); static void em_network_prefs_finalise (GObject *obj); - static GtkVBoxClass *parent_class = NULL; - GType em_network_prefs_get_type (void) { |