aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog23
-rw-r--r--mail/component-factory.c1
-rw-r--r--mail/folder-browser-window.c1
-rw-r--r--mail/folder-info.c5
-rw-r--r--mail/mail-account-editor.c1
-rw-r--r--mail/mail-account-gui.c2
-rw-r--r--mail/mail-callbacks.c2
-rw-r--r--mail/mail-composer-prefs.c2
-rw-r--r--mail/mail-config.c10
-rw-r--r--mail/mail-local.c2
-rw-r--r--mail/message-tag-editor.c8
11 files changed, 35 insertions, 22 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 486db56bde..f1b864a934 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,26 @@
+2002-05-14 Christopher James Lahey <clahey@ximian.com>
+
+ * component-factory.c: Added #include "folder-info.h".
+
+ * folder-browser-window.c (folder_browser_window_new),
+ mail-account-editor.c (apply_changes), mail-account-gui.c
+ (mail_account_gui_save), message-tag-editor.c: Removed some unused
+ variables.
+
+ * folder-info.c: Added #include "folder-info.h". Removed static
+ declaration of evolution_folder_info_get_type.
+
+ * folder-info.c (destroy), mail-callbacks.c
+ (confirm_goto_next_folder, find_current_folder,
+ find_next_folder_r, find_next_folder,
+ do_evil_kludgy_goto_next_folder_hack), mail-composer-prefs.c
+ (sig_name_changed): Commented out these unused functions.
+
+ * mail-config.c (add_new_storage): Removed this unused function.
+
+ * mail-local.c (mlf_init): Fix the declaration of this function to
+ match the required signature.
+
2002-05-13 Christopher James Lahey <clahey@ximian.com>
* message-list.etspec: Added search="string" where appropriate.
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 094027fed2..24e76cf6f5 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -37,6 +37,7 @@
#include "evolution-shell-component.h"
#include "evolution-shell-component-dnd.h"
#include "folder-browser.h"
+#include "folder-info.h"
#include "mail.h"
#include "mail-config.h"
#include "mail-config-factory.h"
diff --git a/mail/folder-browser-window.c b/mail/folder-browser-window.c
index 11334fb590..e87a745811 100644
--- a/mail/folder-browser-window.c
+++ b/mail/folder-browser-window.c
@@ -100,7 +100,6 @@ folder_browser_window_new (FolderBrowser *fb)
FolderBrowserWindow *new;
BonoboUIContainer *uicont;
BonoboUIComponent *uic;
- CORBA_Environment ev;
g_return_val_if_fail (IS_FOLDER_BROWSER (fb), NULL);
diff --git a/mail/folder-info.c b/mail/folder-info.c
index 87ca367dac..bf4f11f227 100644
--- a/mail/folder-info.c
+++ b/mail/folder-info.c
@@ -10,6 +10,8 @@
#include <config.h>
#endif
+#include "folder-info.h"
+
#include "Mail.h"
#include <glib.h>
@@ -61,7 +63,6 @@ struct _folder_info_msg {
int unread;
};
-static GtkType evolution_folder_info_get_type (void);
gboolean ready;
static char *
@@ -168,6 +169,7 @@ impl_GNOME_Evolution_FolderInfo_getInfo (PortableServer_Servant servant,
mail_get_info (foldername, listener);
}
+#if 0
static void
destroy (GtkObject *object)
{
@@ -175,6 +177,7 @@ destroy (GtkObject *object)
bonobo_object_unref (BONOBO_OBJECT (info->pb));
}
+#endif
static void
evolution_folder_info_class_init (EvolutionFolderInfoClass *klass)
diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c
index fb112a930d..25b6ce3d8b 100644
--- a/mail/mail-account-editor.c
+++ b/mail/mail-account-editor.c
@@ -89,7 +89,6 @@ mail_account_editor_finalize (GtkObject *obj)
static gboolean
apply_changes (MailAccountEditor *editor)
{
- MailConfigAccount *account;
GtkWidget *incomplete;
int page = -1;
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index 463ca3d7f8..a3a6245133 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -1964,7 +1964,7 @@ mail_account_gui_save (MailAccountGui *gui)
const MailConfigAccount *old_account;
CamelProvider *provider = NULL;
CamelURL *source_url = NULL, *url;
- char *new_name, *string;
+ char *new_name;
gboolean old_enabled;
if (!mail_account_gui_identity_complete (gui, NULL) ||
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index a7c3adbb9f..7cc1dfbf4d 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -2362,6 +2362,7 @@ undelete_msg (GtkWidget *button, gpointer user_data)
}
+#if 0
static gboolean
confirm_goto_next_folder (FolderBrowser *fb)
{
@@ -2505,6 +2506,7 @@ do_evil_kludgy_goto_next_folder_hack (FolderBrowser *fb)
camel_store_free_folder_info (store, root);
}
+#endif
void
next_msg (GtkWidget *button, gpointer user_data)
diff --git a/mail/mail-composer-prefs.c b/mail/mail-composer-prefs.c
index 8b2491e5d6..c196d4635e 100644
--- a/mail/mail-composer-prefs.c
+++ b/mail/mail-composer-prefs.c
@@ -358,6 +358,7 @@ sig_fill_clist (GtkCList *clist)
gtk_clist_thaw (clist);
}
+#if 0
static void
sig_name_changed (GtkWidget *widget, MailComposerPrefs *prefs)
{
@@ -371,6 +372,7 @@ sig_name_changed (GtkWidget *widget, MailComposerPrefs *prefs)
sig_write_and_update_preview (prefs, sig);
}
+#endif
static void
sig_random_toggled (GtkWidget *widget, MailComposerPrefs *prefs)
diff --git a/mail/mail-config.c b/mail/mail-config.c
index a65b8f00b4..ecd0b8487a 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -2355,16 +2355,6 @@ mail_config_get_accounts (void)
return config->accounts;
}
-static void
-add_new_storage (const char *url, const char *name)
-{
- extern EvolutionShellClient *global_shell_client;
- GNOME_Evolution_Shell corba_shell;
-
- corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (global_shell_client));
- mail_load_storage_by_uri (corba_shell, url, name);
-}
-
void
mail_config_add_account (MailConfigAccount *account)
{
diff --git a/mail/mail-local.c b/mail/mail-local.c
index fcb8305ba1..5e1c4ee579 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -536,7 +536,7 @@ mlf_class_init (CamelObjectClass *camel_object_class)
}
static void
-mlf_init (CamelObject *obj)
+mlf_init (CamelObject *obj, CamelObjectClass *klass)
{
MailLocalFolder *mlf = MAIL_LOCAL_FOLDER (obj);
diff --git a/mail/message-tag-editor.c b/mail/message-tag-editor.c
index a806f78d09..506bd6b666 100644
--- a/mail/message-tag-editor.c
+++ b/mail/message-tag-editor.c
@@ -40,12 +40,6 @@ static void tag_set_value (MessageTagEditor *editor, const char *value);
static GnomeDialogClass *parent_class;
-enum {
- LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
GtkType
message_tag_editor_get_type (void)
{
@@ -100,7 +94,7 @@ message_tag_editor_init (MessageTagEditor *editor)
static void
message_tag_editor_finalise (GtkObject *obj)
{
- MessageTagEditor *editor = (MessageTagEditor *) obj;
+ /* MessageTagEditor *editor = (MessageTagEditor *) obj;*/
((GtkObjectClass *)(parent_class))->finalize (obj);
}