2007-04-24 [wwp] 2.9.1cvs22
authorTristan Chabredier <wwp@claws-mail.org>
Tue, 24 Apr 2007 16:24:21 +0000 (16:24 +0000)
committerTristan Chabredier <wwp@claws-mail.org>
Tue, 24 Apr 2007 16:24:21 +0000 (16:24 +0000)
* src/compose.c
Fix few compiler warnings.

ChangeLog
PATCHSETS
configure.ac
src/compose.c

index b368f6f..4b4b5f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-24 [wwp]       2.9.1cvs22
+
+       * src/compose.c
+               Fix few compiler warnings.
+
 2007-04-24 [paul]      2.9.1cvs21
 
        * src/Makefile.am
index 1b449d5..43a4738 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.96.2.169 -r 1.96.2.170 src/textview.c;  cvs diff -u -r 1.12.2.18 -r 1.12.2.19 src/textview.h;  ) > 2.9.1cvs19.patchset
 ( cvs diff -u -r 1.4.2.49 -r 1.4.2.50 src/gtk/about.c;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/pixmaps/active.xpm;  cvs diff -u -r 1.1.16.1 -r 1.1.16.2 src/pixmaps/checkbox_off.xpm;  cvs diff -u -r 1.1.16.1 -r 1.1.16.2 src/pixmaps/checkbox_on.xpm;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/pixmaps/inactive.xpm;  ) > 2.9.1cvs20.patchset
 ( cvs diff -u -r 1.155.2.62 -r 1.155.2.63 src/Makefile.am;  cvs diff -u -r 1.25.2.37 -r 1.25.2.38 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.26 -r 1.18.2.27 src/stock_pixmap.h;  ) > 2.9.1cvs21.patchset
+( cvs diff -u -r 1.382.2.373 -r 1.382.2.374 src/compose.c;  ) > 2.9.1cvs22.patchset
index 4ee457c..a6a8212 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=21
+EXTRA_VERSION=22
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index f288636..c5831da 100644 (file)
@@ -340,7 +340,7 @@ static void compose_undo_state_changed              (UndoMain       *undostruct,
                                                 gpointer        data);
 
 static void compose_create_header_entry        (Compose *compose);
-static void compose_add_header_entry   (Compose *compose, gchar *header, gchar *text);
+static void compose_add_header_entry   (Compose *compose, const gchar *header, gchar *text);
 static void compose_remove_header_entries(Compose *compose);
 
 static void compose_update_priority_menu_item(Compose * compose);
@@ -2105,7 +2105,7 @@ GList *compose_get_compose_list(void)
 void compose_entry_append(Compose *compose, const gchar *address,
                          ComposeEntryType type)
 {
-       gchar *header;
+       const gchar *header;
        gchar *cur, *begin;
        gboolean in_quote = FALSE;
        if (!address || *address == '\0') return;
@@ -4472,8 +4472,8 @@ static gint compose_redirect_write_headers_from_headerlist(Compose *compose,
        GSList *list;
        ComposeHeaderEntry *headerentry;
        const gchar *headerentryname;
-       gchar *cc_hdr;
-       gchar *to_hdr;
+       const gchar *cc_hdr;
+       const gchar *to_hdr;
 
        debug_print("Writing redirect header\n");
 
@@ -5297,11 +5297,12 @@ static void compose_add_headerfield_from_headerlist(Compose *compose,
                                                    const gchar *fieldname,
                                                    const gchar *seperator)
 {
-       gchar *str, *fieldname_w_colon, *trans_fieldname;
+       gchar *str, *fieldname_w_colon;
        gboolean add_field = FALSE;
        GSList *list;
        ComposeHeaderEntry *headerentry;
-       const gchar * headerentryname;
+       const gchar *headerentryname;
+       const gchar *trans_fieldname;
        GString *fieldstr;
 
        if (IS_IN_CUSTOM_HEADER(fieldname))
@@ -5546,7 +5547,7 @@ static gchar *compose_get_header(Compose *compose)
                gchar *tmp;
                gchar *headername;
                gchar *headername_wcolon;
-               gchar *headername_trans;
+               const gchar *headername_trans;
                gchar *headervalue;
                gchar **string;
                gboolean standard_header = FALSE;
@@ -5575,7 +5576,7 @@ static gchar *compose_get_header(Compose *compose)
                string = std_headers;
                while (*string != NULL) {
                        headername_trans = prefs_common_translated_header_name(*string);
-                       if (!strcmp(headername_trans,headername_wcolon))
+                       if (!strcmp(headername_trans, headername_wcolon))
                                standard_header = TRUE;
                        string++;
                }
@@ -5717,7 +5718,7 @@ 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_translated_header_name(*string));
+               combo_list = g_list_append(combo_list, (gchar*)prefs_common_translated_header_name(*string));
                string++;
        }
        gtk_combo_set_popdown_strings(GTK_COMBO(combo), combo_list);
@@ -5806,7 +5807,7 @@ static void compose_create_header_entry(Compose *compose)
                
 }
 
-static void compose_add_header_entry(Compose *compose, gchar *header, gchar *text) 
+static void compose_add_header_entry(Compose *compose, const gchar *header, gchar *text) 
 {
        ComposeHeaderEntry *last_header;