2004-11-13 [paul] 0.9.12cvs146.6

	* src/compose.c
	* src/imap.c
	* src/matcher_parser.h
	* src/matcher_parser_parse.y
	* src/prefs_filtering.c
	* src/prefs_filtering_action.c
	* src/prefs_themes.c
	* src/prefs_toolbar.c
	* src/common/utils.c
		various small fixes/cleanups

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index dc7626a782cb1d86bf97a4a2cf15d42893bcf2bf..cb029bbe37cded6738769a5654e408a8b425eff8 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,16 @@
+2004-11-13 [paul]      0.9.12cvs146.6
+
+       * src/compose.c
+       * src/imap.c
+       * src/matcher_parser.h
+       * src/matcher_parser_parse.y
+       * src/prefs_filtering.c
+       * src/prefs_filtering_action.c
+       * src/prefs_themes.c
+       * src/prefs_toolbar.c
+       * src/common/utils.c
+               various small fixes/cleanups
+

 2004-11-12 [colin]     0.9.12cvs146.5
 
        * src/textview.c
 2004-11-12 [colin]     0.9.12cvs146.5
 
        * src/textview.c

diff --git a/PATCHSETS b/PATCHSETS
index 82a152ce5c7ca853d2ea5426b07d5b90b61b95ba..b793fe319ee20b939a34f4bd9c16c1b16109599a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -230,3 +230,4 @@
 ( cvs diff -u -r 1.96.2.32 -r 1.96.2.33 src/textview.c; ) > 0.9.12cvs146.3.patchset
 ( cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/exporthtml.c; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/exportldif.c; cvs diff -u -r 1.179.2.11 -r 1.179.2.12 src/imap.c; cvs diff -u -r 1.79.2.4 -r 1.79.2.5 src/mh.c; cvs diff -u -r 1.83.2.23 -r 1.83.2.24 src/mimeview.c; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/prefs_spelling.c; cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/prefs_themes.c; ) > 0.9.12cvs146.4.patchset
 ( cvs diff -u -r 1.96.2.33 -r 1.96.2.34 src/textview.c; ) > 0.9.12cvs146.5.patchset
 ( cvs diff -u -r 1.96.2.32 -r 1.96.2.33 src/textview.c; ) > 0.9.12cvs146.3.patchset
 ( cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/exporthtml.c; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/exportldif.c; cvs diff -u -r 1.179.2.11 -r 1.179.2.12 src/imap.c; cvs diff -u -r 1.79.2.4 -r 1.79.2.5 src/mh.c; cvs diff -u -r 1.83.2.23 -r 1.83.2.24 src/mimeview.c; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/prefs_spelling.c; cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/prefs_themes.c; ) > 0.9.12cvs146.4.patchset
 ( cvs diff -u -r 1.96.2.33 -r 1.96.2.34 src/textview.c; ) > 0.9.12cvs146.5.patchset

+( cvs diff -u -r 1.382.2.62 -r 1.382.2.63 src/compose.c; cvs diff -u -r 1.179.2.12 -r 1.179.2.13 src/imap.c; cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/matcher_parser.h; cvs diff -u -r 1.25.2.5 -r 1.25.2.6 src/matcher_parser_parse.y; cvs diff -u -r 1.59.2.8 -r 1.59.2.9 src/prefs_filtering.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/prefs_filtering_action.c; cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/prefs_themes.c; cvs diff -u -r 1.30.2.5 -r 1.30.2.6 src/prefs_toolbar.c; cvs diff -u -r 1.36.2.14 -r 1.36.2.15 src/common/utils.c; ) > 0.9.12cvs146.6.patchset

diff --git a/configure.ac b/configure.ac
index 0b2d476c8ccf7e958a4f7768325cf378b4a7111e..ae8a1b4214ab55d8a1385ea8b09028e15f6a6212 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=146
 EXTRA_RELEASE=
 BINARY_AGE=0
 EXTRA_VERSION=146
 EXTRA_RELEASE=

-EXTRA_GTK2_VERSION=.5
+EXTRA_GTK2_VERSION=.6

 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/common/utils.c b/src/common/utils.c
index 419f8c71d01f7d3e5b1ea13d522adfdf2b3978f7..801a4555c1dd39c49806ababd170ee267875d923 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1470,21 +1470,6 @@ GList *uri_list_extract_filenames(const gchar *uri_list)
        return result;
 }
 
        return result;
 }
 

-#define HEX_TO_INT(val, hex) \
-{ \
-       gchar c = hex; \
- \
-       if ('0' <= c && c <= '9') { \
-               val = c - '0'; \
-       } else if ('a' <= c && c <= 'f') { \
-               val = c - 'a' + 10; \
-       } else if ('A' <= c && c <= 'F') { \
-               val = c - 'A' + 10; \
-       } else { \
-               val = 0; \
-       } \
-}
-

 /* Converts two-digit hexadecimal to decimal.  Used for unescaping escaped 
  * characters
  */
 /* Converts two-digit hexadecimal to decimal.  Used for unescaping escaped 
  * characters
  */

diff --git a/src/compose.c b/src/compose.c
index 73e6d09a8d71330feaf63de07a0208ade5fd7688..ecdf0eea72d70fcb683de7f7ff3b91fc5b3f9481 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -4109,7 +4109,7 @@ static gchar *compose_get_header(Compose *compose)
        compose_add_headerfield_from_headerlist(compose, header, "Bcc", ", ");
 
        /* Subject */
        compose_add_headerfield_from_headerlist(compose, header, "Bcc", ", ");
 
        /* Subject */

-       str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
+       str = (gpointer)gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));

        if (*str != '\0' && !IS_IN_CUSTOM_HEADER("Subject")) {
                gchar *tmpstr;
 
        if (*str != '\0' && !IS_IN_CUSTOM_HEADER("Subject")) {
                gchar *tmpstr;
 


@@ -4259,7 +4259,7 @@ static gchar *compose_get_header(Compose *compose)
                g_free(tmp);
                
                entry_str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
                g_free(tmp);
                
                entry_str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));

-               Xstrdup_a(headervalue, entry_str, return -1);
+               Xstrdup_a(headervalue, entry_str, return FALSE);

                subst_char(headervalue, '\r', ' ');
                subst_char(headervalue, '\n', ' ');
                string = std_headers;
                subst_char(headervalue, '\r', ' ');
                subst_char(headervalue, '\n', ' ');
                string = std_headers;

diff --git a/src/imap.c b/src/imap.c
index 43d022f7b36f775c5a9b6262d71293bc61bf0c15..f2bea385f8392659f7b077518df3d9a6f381f545 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -1368,7 +1368,7 @@ static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item)
                        new_item->stype = F_INBOX;
                        folder->inbox = new_item;
                } else if (!folder_item_parent(item) || item->stype == F_INBOX) {
                        new_item->stype = F_INBOX;
                        folder->inbox = new_item;
                } else if (!folder_item_parent(item) || item->stype == F_INBOX) {

-                       gchar *base;
+                       const gchar *base;

 
                        base = g_basename(new_item->path);
 
 
                        base = g_basename(new_item->path);
 

diff --git a/src/matcher_parser.h b/src/matcher_parser.h
index 9b749dfbb825c93fcc337cadbd88d24d75278f2f..703287076d2eb621a003850515317d2cfe317814 100644 (file)
--- a/src/matcher_parser.h
+++ b/src/matcher_parser.h
@@ -30,9 +30,9 @@ extern int matcher_parserlineno;
 void matcher_parser_start_parsing      (FILE *f);
 int matcher_parserparse                        (void);
 
 void matcher_parser_start_parsing      (FILE *f);
 int matcher_parserparse                        (void);
 

-MatcherList *matcher_parser_get_cond   (const gchar *str);
-MatcherProp *matcher_parser_get_prop   (const gchar *str);
-FilteringProp *matcher_parser_get_filtering    (const gchar *str);
-GSList *matcher_parser_get_action_list(const gchar *str);
+MatcherList *matcher_parser_get_cond   (gchar *str);
+MatcherProp *matcher_parser_get_prop   (gchar *str);
+FilteringProp *matcher_parser_get_filtering    (gchar *str);
+GSList *matcher_parser_get_action_list(gchar *str);

 
 #endif
 
 #endif

diff --git a/src/matcher_parser_parse.y b/src/matcher_parser_parse.y
index ff423054328afab01bfee7ec2028b99b2b67a339..7cfa758a16cdeed797f52f318823e083ecbe9912 100644 (file)
--- a/src/matcher_parser_parse.y
+++ b/src/matcher_parser_parse.y
@@ -73,7 +73,7 @@ void matcher_parser_start_parsing(FILE *f)
  
 void * matcher_parser_scan_string(const char * str);
  
  
 void * matcher_parser_scan_string(const char * str);
  

-FilteringProp *matcher_parser_get_filtering(const gchar *str)
+FilteringProp *matcher_parser_get_filtering(gchar *str)

 {
        void *bufstate;
 
 {
        void *bufstate;
 


@@ -111,7 +111,7 @@ static gboolean check_quote_symetry(gchar *str)
        return !(ret % 2);
 }
 
        return !(ret % 2);
 }
 

-MatcherList *matcher_parser_get_cond(const gchar *str)
+MatcherList *matcher_parser_get_cond(gchar *str)

 {
        void *bufstate;
 
 {
        void *bufstate;
 


@@ -133,7 +133,7 @@ MatcherList *matcher_parser_get_cond(const gchar *str)
        return cond;
 }
 
        return cond;
 }
 

-GSList *matcher_parser_get_action_list(const gchar *str)
+GSList *matcher_parser_get_action_list(gchar *str)

 {
        void *bufstate;
 
 {
        void *bufstate;
 


@@ -155,7 +155,7 @@ GSList *matcher_parser_get_action_list(const gchar *str)
        return action_list;
 }
 
        return action_list;
 }
 

-MatcherProp *matcher_parser_get_prop(const gchar *str)
+MatcherProp *matcher_parser_get_prop(gchar *str)

 {
        MatcherList *list;
        MatcherProp *prop;
 {
        MatcherList *list;
        MatcherProp *prop;

diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index d28a354eea3c10c86ff3a130a592e28cd3bc6a0a..9bf8e01dc01c8a3a2a4e513b160899d946bb82cb 100644 (file)
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -705,10 +705,10 @@ static void prefs_filtering_condition_define_done(MatcherList * matchers)
 
 static void prefs_filtering_condition_define(void)
 {
 
 static void prefs_filtering_condition_define(void)
 {

-       const gchar * cond_str;
+       gchar * cond_str;

        MatcherList * matchers = NULL;
 
        MatcherList * matchers = NULL;
 

-       cond_str = gtk_entry_get_text(GTK_ENTRY(filtering.cond_entry));
+       cond_str = (gpointer)gtk_entry_get_text(GTK_ENTRY(filtering.cond_entry));

 
        if (*cond_str != '\0') {
                matchers = matcher_parser_get_cond(cond_str);
 
        if (*cond_str != '\0') {
                matchers = matcher_parser_get_cond(cond_str);


@@ -739,10 +739,10 @@ static void prefs_filtering_action_define_done(GSList * action_list)
 
 static void prefs_filtering_action_define(void)
 {
 
 static void prefs_filtering_action_define(void)
 {

-       const gchar * action_str;
+       gchar * action_str;

        GSList * action_list = NULL;
 
        GSList * action_list = NULL;
 

-       action_str = gtk_entry_get_text(GTK_ENTRY(filtering.action_entry));
+       action_str = (gpointer)gtk_entry_get_text(GTK_ENTRY(filtering.action_entry));

 
        if (*action_str != '\0') {
                action_list = matcher_parser_get_action_list(action_str);
 
        if (*action_str != '\0') {
                action_list = matcher_parser_get_action_list(action_str);


@@ -768,31 +768,31 @@ static void prefs_filtering_action_define(void)
 static FilteringProp * prefs_filtering_dialog_to_filtering(gboolean alert)
 {
        MatcherList * cond;
 static FilteringProp * prefs_filtering_dialog_to_filtering(gboolean alert)
 {
        MatcherList * cond;

-       const gchar * cond_str;
-       const gchar * action_str;
+       gchar * cond_str;
+       gchar * action_str;

        FilteringProp * prop;
        GSList * action_list;
 
        FilteringProp * prop;
        GSList * action_list;
 

-       cond_str = gtk_entry_get_text(GTK_ENTRY(filtering.cond_entry));
+       cond_str = (gpointer)gtk_entry_get_text(GTK_ENTRY(filtering.cond_entry));

        if (*cond_str == '\0') {
                if(alert == TRUE) alertpanel_error(_("Condition string is empty."));
                return NULL;
        }
 
        if (*cond_str == '\0') {
                if(alert == TRUE) alertpanel_error(_("Condition string is empty."));
                return NULL;
        }
 

-       action_str = gtk_entry_get_text(GTK_ENTRY(filtering.action_entry));
+       action_str = (gpointer)gtk_entry_get_text(GTK_ENTRY(filtering.action_entry));

        if (*action_str == '\0') {
                if(alert == TRUE) alertpanel_error(_("Action string is empty."));
                return NULL;
        }
 
        if (*action_str == '\0') {
                if(alert == TRUE) alertpanel_error(_("Action string is empty."));
                return NULL;
        }
 

-       cond = matcher_parser_get_cond(cond_str);
+       cond = (gpointer)matcher_parser_get_cond(cond_str);

 
        if (cond == NULL) {
                if(alert == TRUE) alertpanel_error(_("Condition string is not valid."));
                return NULL;
        }
         
 
        if (cond == NULL) {
                if(alert == TRUE) alertpanel_error(_("Condition string is not valid."));
                return NULL;
        }
         

-        action_list = matcher_parser_get_action_list(action_str);
+        action_list = (gpointer)matcher_parser_get_action_list(action_str);

 
        if (action_list == NULL) {
                if(alert == TRUE) alertpanel_error(_("Action string is not valid."));
 
        if (action_list == NULL) {
                if(alert == TRUE) alertpanel_error(_("Action string is not valid."));

diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index 54e2c64aef7ef56e96caf6dbf9def78dc0d4abe1..2557114f28521a930dd07b56d16f3ae3186ccafa 100644 (file)
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -737,7 +737,7 @@ static FilteringAction * prefs_filtering_action_dialog_to_action(gboolean alert)
        gint action_type;
        gint list_id;
        gint account_id;
        gint action_type;
        gint list_id;
        gint account_id;

-       const gchar * destination;
+       gchar * destination;

        gint labelcolor = 0;
         FilteringAction * action;
         gchar * score_str;
        gint labelcolor = 0;
         FilteringAction * action;
         gchar * score_str;


@@ -754,7 +754,8 @@ static FilteringAction * prefs_filtering_action_dialog_to_action(gboolean alert)
        case ACTION_MOVE:
        case ACTION_COPY:
        case ACTION_EXECUTE:
        case ACTION_MOVE:
        case ACTION_COPY:
        case ACTION_EXECUTE:

-               destination = gtk_entry_get_text(GTK_ENTRY(filtering_action.dest_entry));
+               destination = (gpointer)gtk_entry_get_text(
+                               GTK_ENTRY(filtering_action.dest_entry));

                if (*destination == '\0') {
                        if (alert)
                                 alertpanel_error(action_id == ACTION_EXECUTE 
                if (*destination == '\0') {
                        if (alert)
                                 alertpanel_error(action_id == ACTION_EXECUTE 


@@ -766,7 +767,8 @@ static FilteringAction * prefs_filtering_action_dialog_to_action(gboolean alert)
        case ACTION_FORWARD:
        case ACTION_FORWARD_AS_ATTACHMENT:
        case ACTION_REDIRECT:
        case ACTION_FORWARD:
        case ACTION_FORWARD_AS_ATTACHMENT:
        case ACTION_REDIRECT:

-               destination = gtk_entry_get_text(GTK_ENTRY(filtering_action.dest_entry));
+               destination = (gpointer)gtk_entry_get_text(
+                               GTK_ENTRY(filtering_action.dest_entry));

                if (*destination == '\0') {
                        if (alert)
                                 alertpanel_error(_("Recipient is not set."));
                if (*destination == '\0') {
                        if (alert)
                                 alertpanel_error(_("Recipient is not set."));


@@ -780,7 +782,7 @@ static FilteringAction * prefs_filtering_action_dialog_to_action(gboolean alert)
                break;
         case ACTION_CHANGE_SCORE:
         case ACTION_SET_SCORE:
                break;
         case ACTION_CHANGE_SCORE:
         case ACTION_SET_SCORE:

-               score_str = gtk_entry_get_text(GTK_ENTRY(filtering_action.dest_entry));
+               score_str = (gpointer)gtk_entry_get_text(GTK_ENTRY(filtering_action.dest_entry));

                if (*score_str == '\0') {
                        if (alert)
                                 alertpanel_error(_("Score is not set"));
                if (*score_str == '\0') {
                        if (alert)
                                 alertpanel_error(_("Score is not set"));

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index de6204ce4b519a77ff48ca9702293dc128e51373..c2198b5c005803bf553a631d9efd0642ddb13fdd 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -178,7 +178,7 @@ static void prefs_themes_file_stats(const gchar *filename, gpointer data)
 static void prefs_themes_file_remove(const gchar *filename, gpointer data)
 {
        gchar **status = (gchar **)data;
 static void prefs_themes_file_remove(const gchar *filename, gpointer data)
 {
        gchar **status = (gchar **)data;

-       gchar *name;
+       const gchar *name;

        
        if ((*status) != NULL)
                return;
        
        if ((*status) != NULL)
                return;


@@ -196,7 +196,7 @@ static void prefs_themes_file_remove(const gchar *filename, gpointer data)
 static void prefs_themes_file_install(const gchar *filename, gpointer data)
 {
        CopyInfo *ci = (CopyInfo *)data;
 static void prefs_themes_file_install(const gchar *filename, gpointer data)
 {
        CopyInfo *ci = (CopyInfo *)data;

-       gchar *name;
+       const gchar *name;

        
        if (ci->status != NULL)
                return;
        
        if (ci->status != NULL)
                return;


@@ -307,7 +307,7 @@ static void prefs_themes_get_themes_and_names(ThemesData *tdata)
        tpaths = tdata->themes;
        while (tpaths != NULL) {
                ThemeName *name = g_new0(ThemeName, 1);
        tpaths = tdata->themes;
        while (tpaths != NULL) {
                ThemeName *name = g_new0(ThemeName, 1);

-               gchar     *sname = g_basename((gchar *)(tpaths->data));
+               const gchar *sname = g_basename((gchar *)(tpaths->data));

                
                if (IS_INTERNAL_THEME(sname))
                        name->name = g_strdup(_("Default internal theme"));
                
                if (IS_INTERNAL_THEME(sname))
                        name->name = g_strdup(_("Default internal theme"));


@@ -453,7 +453,8 @@ static void prefs_themes_btn_remove_clicked_cb(GtkWidget *widget, gpointer data)
 static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data)
 {
        gchar      *filename, *source;
 static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data)
 {
        gchar      *filename, *source;

-       gchar      *themeinfo, *themename;
+       gchar      *themeinfo;
+       const gchar *themename;

        gchar      *alert_title = NULL;
        CopyInfo   *cinfo;
        AlertValue  val = 0;
        gchar      *alert_title = NULL;
        CopyInfo   *cinfo;
        AlertValue  val = 0;

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 5a707101f20103369e3b7b43c0ec1bf5672e071f..896913579886fcbd57b120d398145b4c9d6673ff 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -398,7 +398,7 @@ static void prefs_toolbar_register(GtkButton *button, ToolbarPage *prefs_toolbar
 
                if (g_utf8_collate(item[3], syl_act) == 0) {
 
 
                if (g_utf8_collate(item[3], syl_act) == 0) {
 

-                       const gchar *entry = gtk_entry_get_text(GTK_ENTRY(prefs_toolbar->combo_syl_entry));
+                       gchar *entry = (gpointer)gtk_entry_get_text(GTK_ENTRY(prefs_toolbar->combo_syl_entry));

                        get_action_name(entry, &item[2]);
                }
                else {
                        get_action_name(entry, &item[2]);
                }
                else {


@@ -469,7 +469,7 @@ static void prefs_toolbar_substitute(GtkButton *button, ToolbarPage *prefs_toolb
 
                if (g_utf8_collate(item[3], syl_act) == 0) {
 
 
                if (g_utf8_collate(item[3], syl_act) == 0) {
 

-                       const gchar *entry = gtk_entry_get_text(GTK_ENTRY(prefs_toolbar->combo_syl_entry));
+                       gchar *entry = (gpointer)gtk_entry_get_text(GTK_ENTRY(prefs_toolbar->combo_syl_entry));

                        get_action_name(entry, &item[2]);
                } else {
                        item[2] = g_strdup(gtk_entry_get_text(GTK_ENTRY(prefs_toolbar->entry_icon_text)));
                        get_action_name(entry, &item[2]);
                } else {
                        item[2] = g_strdup(gtk_entry_get_text(GTK_ENTRY(prefs_toolbar->entry_icon_text)));