From: Christoph Hohmann <reboot@gmx.ch>
Date: Fri, 22 Nov 2002 23:26:53 +0000 (+0000)
Subject: 0.8.5claws179
X-Git-Tag: rel_0_8_6~7
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=3b8c8998787f4ac43e05b7c36b2bdfc46d187b5a;ds=sidebyside

0.8.5claws179

* src/compose.c
* src/inc.c
* src/prefs_filtering.c
* src/summaryview.c
        more warning fixes
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e60dc12da..7ad0721f5 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2002-11-22 [christoph]	0.8.5claws179
+
+	* src/compose.c
+	* src/inc.c
+	* src/prefs_filtering.c
+	* src/summaryview.c
+		more warning fixes
+
 2002-11-22 [alfons]	0.8.5claws178
 
 	* src/summaryview.c
diff --git a/configure.in b/configure.in
index 6e974a731..17e0bf885 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws178
+EXTRA_VERSION=claws179
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/compose.c b/src/compose.c
index 8c076e3f7..d8e8a694c 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -4265,7 +4265,7 @@ static void compose_create_header_entry(Compose *compose)
 	GtkWidget *combo;
 	GtkWidget *entry;
 	GList *combo_list = NULL;
-	gchar **string, *header;
+	gchar **string, *header = NULL;
 	ComposeHeaderEntry *headerentry;
 	gboolean standard_header = FALSE;
 
@@ -4275,8 +4275,8 @@ static void compose_create_header_entry(Compose *compose)
 	combo = gtk_combo_new();
 	string = headers; 
 	while(*string != NULL) {
-	    combo_list = g_list_append(combo_list, (prefs_common.trans_hdr ? gettext(*string) : *string));
-	    string++;
+		combo_list = g_list_append(combo_list, (prefs_common.trans_hdr ? gettext(*string) : *string));
+	        string++;
 	}
 	gtk_combo_set_popdown_strings(GTK_COMBO(combo), combo_list);
 	g_list_free(combo_list);
@@ -4304,7 +4304,8 @@ static void compose_create_header_entry(Compose *compose)
 				break;
 		}								    
 	}
-	gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), header);
+	if (header)
+		gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), header);
 
 	/* Entry field */
 	entry = gtk_entry_new(); 
diff --git a/src/inc.c b/src/inc.c
index 42d1d042e..182d4682b 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -238,7 +238,7 @@ static gint inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
 	IncProgressDialog *inc_dialog;
 	IncSession *session;
 	gchar *text[3];
-	FolderItem *item;
+	FolderItem *item = NULL;
 	
 	if(mainwin && mainwin->summaryview)
 		item = mainwin->summaryview->folder_item;
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 67718c5c6..104cc7a44 100644
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -638,13 +638,13 @@ static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data)
 	gint prefixlen;
 	gint oldpathlen;
 	FolderItem *item;
-	
-	g_return_val_if_fail(old_path != NULL, FALSE);
-	g_return_val_if_fail(new_path != NULL, FALSE);
 
 	old_path = ((gchar **)data)[0];
 	new_path = ((gchar **)data)[1];
 
+	g_return_val_if_fail(old_path != NULL, FALSE);
+	g_return_val_if_fail(new_path != NULL, FALSE);
+
 	oldpathlen = strlen(old_path);
 	old_path_with_sep = g_strconcat(old_path,G_DIR_SEPARATOR_S,NULL);
 	if (node == NULL)
diff --git a/src/summaryview.c b/src/summaryview.c
index 7879d1fd6..95131b07a 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3287,7 +3287,7 @@ void summary_save_as(SummaryView *summaryview)
 	gchar *filename = NULL;
 	gchar *src, *dest;
 
-	AlertValue aval;
+	AlertValue aval = 0;
 
 	if (!summaryview->selected) return;
 	msginfo = gtk_ctree_node_get_row_data(ctree, summaryview->selected);
@@ -3303,7 +3303,8 @@ void summary_save_as(SummaryView *summaryview)
 		aval = alertpanel(_("Append or Overwrite"),
 				  _("Append or overwrite existing file?"),
 				  _("Append"), _("Overwrite"), _("Cancel"));
-		if (aval!=0 && aval!=1) return;
+		if (aval != 0 && aval != 1)
+			return;
 	}
 
 	src = procmsg_get_message_file(msginfo);