Use gtk_window_set_resizable() instead of gtk_window_set_policy().

2003-02-11  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-account-editor.c (construct): Use
	gtk_window_set_resizable() instead of gtk_window_set_policy().

	* mail-config.c: Fix a bunch of warnings.
	(mail_config_signature_write): Removed.

	* mail-callbacks.c: Removed unused variables.

svn path=/trunk/; revision=19885

6 files changed, 25 insertions, 35 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4494dc42d2..a5efb86469 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,13 @@
 2003-02-11  Jeffrey Stedfast  <fejj@ximian.com>
 
+	* mail-account-editor.c (construct): Use
+	gtk_window_set_resizable() instead of gtk_window_set_policy().
+
+	* mail-config.c: Fix a bunch of warnings.
+	(mail_config_signature_write): Removed.
+
+	* mail-callbacks.c: Removed unused variables.
+
 	* mail-accounts.c (mail_accounts_tab_class_init): Register a
 	destroy virtual method.
 	(mail_accounts_tab_destroy): Set mail_display->destroyed = TRUE.
diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c
index 49fdba2ff8..0183ddca1f 100644
--- a/mail/mail-account-editor.c
+++ b/mail/mail-account-editor.c
@@ -144,7 +144,7 @@ construct (MailAccountEditor *editor, EAccount *account, MailAccountsTab *dialog
 	
 	/* give our dialog an OK button and title */
 	gtk_window_set_title (GTK_WINDOW (editor), _("Evolution Account Editor"));
-	gtk_window_set_policy (GTK_WINDOW (editor), FALSE, TRUE, TRUE);
+	gtk_window_set_resizable (GTK_WINDOW (editor), TRUE);
 	gtk_window_set_modal (GTK_WINDOW (editor), FALSE);
 	gtk_dialog_add_buttons (GTK_DIALOG (editor),
 				GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c
index ac6f6d1fd2..154a092c13 100644
--- a/mail/mail-accounts.c
+++ b/mail/mail-accounts.c
@@ -112,7 +112,7 @@ mail_accounts_tab_destroy (GtkObject *obj)
 	
 	prefs->destroyed = TRUE;
 	
-	parent_class->destroy (obj);
+	GTK_OBJECT_CLASS (parent_class)->destroy (obj);
 }
 
 static void
@@ -271,7 +271,6 @@ account_default_clicked (GtkButton *button, gpointer user_data)
 	EAccount *account = NULL;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
-	int row;
 	
 	selection = gtk_tree_view_get_selection (prefs->table);
 	if (gtk_tree_selection_get_selected (selection, &model, &iter))
@@ -418,7 +417,6 @@ mail_accounts_treeview_new (char *widget_name, char *string1, char *string2, int
 	GtkTreeSelection *selection;
 	GtkCellRenderer *renderer;
 	GtkListStore *model;
-	char *titles[3];
 	
 	scrolled = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index c606301440..35501453fc 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -206,7 +206,6 @@ static gboolean
 check_send_configuration (FolderBrowser *fb)
 {
 	EAccount *account;
-	GtkWidget *dialog;
 	
 	if (!mail_config_is_configured ()) {
 		if (fb == NULL) {
@@ -279,7 +278,6 @@ static gboolean
 ask_confirm_for_empty_subject (EMsgComposer *composer)
 {
 	gboolean show_again, res;
-	GtkWidget *mbox, *check;
 	GConfClient *gconf;
 	
 	gconf = gconf_client_get_default ();
@@ -711,10 +709,9 @@ composer_save_draft_cb (EMsgComposer *composer, int quit, gpointer user_data)
 		mail_msg_wait (id);
 		
 		if (!folder) {
-			gboolean res;
-			if (!e_question((GtkWindow *)composer, GTK_RESPONSE_YES, NULL,
-					_("Unable to open the drafts folder for this account.\n"
-					  "Would you like to use the default drafts folder?")))
+			if (!e_question ((GtkWindow *) composer, GTK_RESPONSE_YES, NULL,
+					 _("Unable to open the drafts folder for this account.\n"
+					   "Would you like to use the default drafts folder?")))
 				return;
 			
 			folder = drafts_folder;
@@ -2306,7 +2303,6 @@ static gboolean
 are_you_sure (const char *msg, GPtrArray *uids, FolderBrowser *fb)
 {
 	GtkWidget *dialog;
-	char *buf;
 	int button, i;
 
 	dialog = gtk_message_dialog_new (FB_WINDOW (fb), GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -2373,7 +2369,6 @@ do_resend_messages (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, v
 }
 
 
-
 void
 resend_msg (GtkWidget *widget, gpointer user_data)
 {
@@ -2384,10 +2379,8 @@ resend_msg (GtkWidget *widget, gpointer user_data)
 		return;
 	
 	if (!folder_browser_is_sent (fb)) {
-		GtkWidget *dialog;
-
-		e_notice(FB_WINDOW(fb), GTK_MESSAGE_ERROR,
-			 _("You may only resend messages\nin the Sent folder."));
+		e_notice (FB_WINDOW (fb), GTK_MESSAGE_ERROR,
+			  _("You may only resend messages\nin the Sent folder."));
 		return;
 	}
 	
@@ -2403,6 +2396,7 @@ resend_msg (GtkWidget *widget, gpointer user_data)
 	mail_get_messages (fb->folder, uids, do_resend_messages, fb);
 }
 
+
 void
 search_msg (GtkWidget *widget, gpointer user_data)
 {
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 4415453729..86bfa2b175 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -243,7 +243,7 @@ signature_new_from_xml (char *in, int id)
 		cur = cur->next;
 	}
 	
-	xmlDocFree (doc);
+	xmlFreeDoc (doc);
 	
 	return sig;
 }
@@ -251,7 +251,6 @@ signature_new_from_xml (char *in, int id)
 static void
 config_read_signatures (void)
 {
-	MailConfigSignature *sig;
 	GSList *list, *l, *tail, *n;
 	int i = 0;
 	
@@ -383,8 +382,8 @@ static void
 config_cache_labels (void)
 {
 	GSList *labels, *list, *tail, *n;
-	char *buf, *name, *colour;
 	MailConfigLabel *label;
+	char *buf, *colour;
 	int num = 0;
 	
 	tail = labels = NULL;
@@ -515,8 +514,6 @@ mail_config_write_on_exit (void)
 {
 	EAccount *account;
 	EIterator *iter;
-	char *path, *p;
-	int i;
 	
 	if (config_write_timeout) {
 		g_source_remove (config_write_timeout);
@@ -971,7 +968,6 @@ mail_config_uri_renamed (GCompareFunc uri_cmp, const char *old, const char *new)
 	EAccount *account;
 	EIterator *iter;
 	int i, work = 0;
-	gpointer val;
 	char *oldname, *newname;
 	char *cachenames[] = { "config/hidestate-", 
 			       "config/et-expanded-", 
@@ -1488,22 +1484,16 @@ mail_config_signature_delete (MailConfigSignature *sig)
 }
 
 void
-mail_config_signature_write (MailConfigSignature *sig)
-{
-	config_write_signature (sig, sig->id);
-}
-
-void
 mail_config_signature_set_filename (MailConfigSignature *sig, const char *filename)
 {
-	gchar *old_filename = sig->filename;
-
+	char *old_filename = sig->filename;
+	
 	sig->filename = g_strdup (filename);
 	if (old_filename) {
 		delete_unused_signature_file (old_filename);
 		g_free (old_filename);
 	}
-	mail_config_signature_write (sig);
+	config_write_signatures ();
 }
 
 void
@@ -1511,8 +1501,9 @@ mail_config_signature_set_name (MailConfigSignature *sig, const char *name)
 {
 	g_free (sig->name);
 	sig->name = g_strdup (name);
-
-	mail_config_signature_write (sig);
+	
+	config_write_signatures ();
+	
 	mail_config_signature_emit_event (MAIL_CONFIG_SIG_EVENT_NAME_CHANGED, sig);
 }
 
@@ -1664,7 +1655,7 @@ mail_config_signature_set_html (MailConfigSignature *sig, gboolean html)
 {
 	if (sig->html != html) {
 		sig->html = html;
-		mail_config_signature_write (sig);
+		config_write_signatures ();
 		mail_config_signature_emit_event (MAIL_CONFIG_SIG_EVENT_HTML_CHANGED, sig);
 	}
 }
diff --git a/mail/mail-config.h b/mail/mail-config.h
index e66c729c80..cc617768e5 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -128,7 +128,6 @@ void mail_config_save_accounts (void);
 GSList *mail_config_get_signature_list (void);
 MailConfigSignature *mail_config_signature_add (gboolean html, const char *script);
 void mail_config_signature_delete       (MailConfigSignature *sig);
-void mail_config_signature_write        (MailConfigSignature *sig);
 void mail_config_signature_set_name     (MailConfigSignature *sig, const char *name);
 void mail_config_signature_set_html     (MailConfigSignature *sig, gboolean html);
 void mail_config_signature_set_filename (MailConfigSignature *sig, const char *filename);