Made some debug info not translatable and few code cleanups
authorMelvin Hadasht <melvin.hadasht@free.fr>
Wed, 14 Aug 2002 13:15:46 +0000 (13:15 +0000)
committerMelvin Hadasht <melvin.hadasht@free.fr>
Wed, 14 Aug 2002 13:15:46 +0000 (13:15 +0000)
ChangeLog.claws
configure.in
src/crash.c
src/exporthtml.c
src/foldersel.c
src/gtkspell.c
src/mutt.c
src/prefs_actions.c
src/prefs_common.c
src/prefs_toolbar.c
src/quote_fmt.c

index 94f2fda7961ee831bbea18a05350bf70649bd296..5cd60c187dfce12e73e85db33349c10d67dfabfb 100644 (file)
@@ -1,3 +1,21 @@
+2002-08-14 [melvin]    0.8.1claws59
+
+       * src/crash.c
+               Made bug report not translatable
+       * src/exporthtml.c
+               Fixed exporthtml_build_filespec() return value
+       * src/foldersel.c
+               Fixed incorrect include file
+       * src/gtkspell.c
+       * src/prefs_actions.c
+       * src/prefs_toolbar.c
+               Made debug info not translatable
+       * src/mutt.c
+       * src/quote_fmt.c
+               Added missing includes
+       * src/prefs_common.c
+               Fixed typo
+
 2002-08-14 [paul]      0.8.1claws58
 
        * faq/es/sylpheed-faq.html
index 6a2d5cfd274ef3376fc97c4e0b574d25b12310d5..e6b3fc4d7726a8b7acc441400356a06ceeb93401 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws58
+EXTRA_VERSION=claws59
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index c1f51e37bd6448adf3491e1d8168c3f676818796..31b64901f514bf8d3a5406c09f8f0247ac58c9c3 100644 (file)
@@ -144,7 +144,7 @@ static GtkWidget *crash_dialog_new(const gchar *text, const gchar *debug_output)
        gtk_container_add(GTK_CONTAINER(scrolledwindow1), text1);
        
        crash_report = g_strdup_printf(
-               _("Sylpheed version %s\nGTK+ version %d.%d.%d\nFeatures:%s\nOperating system: %s\nC Library: %s\n--\n%s"),
+               "Sylpheed version %s\nGTK+ version %d.%d.%d\nFeatures:%s\nOperating system: %s\nC Library: %s\n--\n%s",
                VERSION,
                gtk_major_version, gtk_minor_version, gtk_micro_version,
                get_compiled_in_features(),
index 78a01b0209447cd3d58e95c04e4e30eb6dc4f10e..7f7a1066d5c51e8b72accc427b8b20e8e496cf51 100644 (file)
@@ -1036,7 +1036,7 @@ void exporthtml_process(
  * Build full export file specification.
  * Enter:  ctl  Export control data.
  */
-static void *exporthtml_build_filespec( ExportHtmlCtl *ctl ) {
+static void exporthtml_build_filespec( ExportHtmlCtl *ctl ) {
        gchar *fileSpec;
 
        fileSpec = g_strconcat(
index c9d197f95f6d51d1bc2500dde670eff14c2637b6..6ed0c0ddcd9d7d3ea05b53da797cb72a7849b267 100644 (file)
@@ -23,7 +23,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwidget.h>
-#include <gtk/gtkctree.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkscrolledwindow.h>
@@ -42,6 +41,7 @@
 #include "main.h"
 #include "utils.h"
 #include "gtkutils.h"
+#include "gtksctree.h"
 #include "stock_pixmap.h"
 #include "foldersel.h"
 #include "alertpanel.h"
index 9e032f149ff0ec7605e5dccf8577bddad1cbe3d2..50b845e6d2dbd0541512a2ec91dc57ef34cda50e 100644 (file)
@@ -210,7 +210,7 @@ GtkPspellCheckers *gtkpspell_checkers_delete()
                return NULL;
 
        if ((checkers = gtkpspellcheckers->checkers) != NULL) {
-               debug_print(_("Pspell: number of running checkers to delete %d\n"),
+               debug_print("Pspell: number of running checkers to delete %d\n",
                                g_slist_length(checkers));
 
                g_slist_foreach(checkers, free_checkers, NULL);
@@ -218,7 +218,7 @@ GtkPspellCheckers *gtkpspell_checkers_delete()
        }
 
        if ((dict_list = gtkpspellcheckers->dictionary_list) != NULL) {
-               debug_print(_("Pspell: number of dictionaries to delete %d\n"),
+               debug_print("Pspell: number of dictionaries to delete %d\n",
                                g_slist_length(dict_list));
 
                gtkpspell_free_dictionary_list(dict_list);
@@ -505,22 +505,22 @@ static GtkPspeller *gtkpspeller_new(Dictionary *dictionary)
                gtkpspeller = (GtkPspeller *) exist->data;
                dictionary_delete(dict);
 
-               debug_print(_("Pspell: Using existing ispell checker %0x\n"),
+               debug_print("Pspell: Using existing ispell checker %0x\n",
                            (gint) gtkpspeller);
        } else {
                if ((gtkpspeller = gtkpspeller_real_new(dict)) != NULL) {
                        gtkpspellcheckers->checkers = 
                                g_slist_append(gtkpspellcheckers->checkers,
                                               gtkpspeller);
-                       debug_print(_("Pspell: Created a new gtkpspeller %0x\n"),
+                       debug_print("Pspell: Created a new gtkpspeller %0x\n",
                                    (gint) gtkpspeller);
                } else {
                        dictionary_delete(dict);
-                       debug_print(_("Pspell: Could not create spell checker.\n"));
+                       debug_print("Pspell: Could not create spell checker.\n");
                }
        }
 
-       debug_print(_("Pspell: number of existing checkers %d\n")
+       debug_print("Pspell: number of existing checkers %d\n"
                    g_slist_length(gtkpspellcheckers->checkers));
 
        return gtkpspeller;
@@ -568,20 +568,20 @@ static GtkPspeller *gtkpspeller_delete(GtkPspeller *gtkpspeller)
        g_return_val_if_fail(gtkpspellcheckers, NULL);
        
        if (gtkpspeller->ispell) 
-               debug_print(_("Pspell: Won't remove existing ispell checker %0x.\n")
+               debug_print("Pspell: Won't remove existing ispell checker %0x.\n"
                            (gint) gtkpspeller);
        else {
                gtkpspellcheckers->checkers = 
                        g_slist_remove(gtkpspellcheckers->checkers, 
                                       gtkpspeller);
 
-               debug_print(_("Pspell: Deleting gtkpspeller %0x.\n")
+               debug_print("Pspell: Deleting gtkpspeller %0x.\n"
                            (gint) gtkpspeller);
                
                gtkpspeller_real_delete(gtkpspeller);
        }
 
-       debug_print(_("Pspell: number of existing checkers %d\n")
+       debug_print("Pspell: number of existing checkers %d\n"
                    g_slist_length(gtkpspellcheckers->checkers));
 
        return gtkpspeller;
@@ -598,7 +598,7 @@ static GtkPspeller *gtkpspeller_real_delete(GtkPspeller *gtkpspeller)
 
        dictionary_delete(gtkpspeller->dictionary);
 
-       debug_print(_("Pspell: gtkpspeller %0x deleted.\n")
+       debug_print("Pspell: gtkpspeller %0x deleted.\n"
                    (gint) gtkpspeller);
 
        g_free(gtkpspeller);
@@ -627,10 +627,10 @@ static gboolean set_dictionary(PspellConfig *config, Dictionary *dict)
        buf[dict->dictname - dict->fullname] = 0x00;
 
        CONFIG_REPLACE_RETURN_FALSE_IF_FAIL("rem-all-word-list-path", "");
-       debug_print(_("Pspell: removed all paths.\n"));
+       debug_print("Pspell: removed all paths.\n");
 
        CONFIG_REPLACE_RETURN_FALSE_IF_FAIL("add-word-list-path", buf);
-       debug_print(_("Pspell: added path %s.\n"), buf);
+       debug_print("Pspell: added path %s.\n", buf);
 
        strncpy(buf, dict->dictname, BUFSIZE-1);
        language = buf;
@@ -658,7 +658,7 @@ static gboolean set_dictionary(PspellConfig *config, Dictionary *dict)
        else
                spelling = NULL;
 
-       debug_print(_("Pspell: Language: %s, spelling: %s, jargon: %s, module: %s\n"),
+       debug_print("Pspell: Language: %s, spelling: %s, jargon: %s, module: %s\n",
                    language, spelling, jargon, module);
        
        if (language)
@@ -743,7 +743,7 @@ static void set_real_sug_mode(GtkPspell *gtkpspell, const char *themode)
        result = gtkpspell_set_sug_mode(gtkpspell, mode);
 
        if(!result) {
-               debug_print(_("Pspell: error while changing suggestion mode:%s\n"),
+               debug_print("Pspell: error while changing suggestion mode:%s\n",
                            gtkpspellcheckers->error_message);
                gtkpspell_checkers_reset_error();
        }
@@ -1497,7 +1497,7 @@ GSList *gtkpspell_get_dictionary_list(const gchar *pspell_path, gint refresh)
        dict_path = g_strdup(pspell_path);
        prevdir   = g_get_current_dir();
        if (chdir(dict_path) <0) {
-               debug_print(_("Pspell: error when searching for dictionaries:\n%s\n"),
+               debug_print("Pspell: error when searching for dictionaries:\n%s\n",
                            g_strerror(errno));
                g_free(prevdir);
                g_free(dict_path);
@@ -1507,7 +1507,7 @@ GSList *gtkpspell_get_dictionary_list(const gchar *pspell_path, gint refresh)
                return gtkpspellcheckers->dictionary_list; 
        }
 
-       debug_print(_("Pspell: checking for dictionaries in %s\n"), dict_path);
+       debug_print("Pspell: checking for dictionaries in %s\n", dict_path);
 
        if (NULL != (dir = opendir("."))) {
                while (NULL != (ent = readdir(dir))) {
@@ -1525,7 +1525,7 @@ GSList *gtkpspell_get_dictionary_list(const gchar *pspell_path, gint refresh)
                                dict->dictname = strrchr(dict->fullname, 
                                                         G_DIR_SEPARATOR) + 1;
                                dict->encoding = NULL;
-                               debug_print(_("Pspell: found dictionary %s %s\n"),
+                               debug_print("Pspell: found dictionary %s %s\n",
                                            dict->fullname, dict->dictname);
                                list = g_slist_insert_sorted(list, dict,
                                                (GCompareFunc) compare_dict);
@@ -1534,13 +1534,13 @@ GSList *gtkpspell_get_dictionary_list(const gchar *pspell_path, gint refresh)
                closedir(dir);
        }
        else {
-               debug_print(_("Pspell: error when searching for dictionaries.\nNo dictionary found.\n(%s)")
+               debug_print("Pspell: error when searching for dictionaries.\nNo dictionary found.\n(%s)"
                            g_strerror(errno));
                list = create_empty_dictionary_list();
        }
         if(list==NULL){
                
-               debug_print(_("Pspell: error when searching for dictionaries.\nNo dictionary found.\n"));
+               debug_print("Pspell: error when searching for dictionaries.\nNo dictionary found.\n");
                list = create_empty_dictionary_list();
        }
 
index c4fed760639fe2496e2f450eeec76d95d35446b3..a49203af4fc46b72600bd3b1b3a5504d55452d63 100644 (file)
@@ -22,6 +22,8 @@
  */
 
 #include <sys/stat.h>
+#include <ctype.h>
+#include <string.h>
 #include <glib.h>
 
 #include "mgutils.h"
index a37d10191481cb62f63532b4b5dbd54c625c5a2a..c23e43a604fc7e1beedb5c002b63855b6ae7b373 100644 (file)
@@ -264,7 +264,7 @@ static void prefs_actions_create(MainWindow *mainwin)
 
        gchar *title[1];
 
-       debug_print(_("Creating actions setting window...\n"));
+       debug_print("Creating actions setting window...\n");
 
        window = gtk_window_new (GTK_WINDOW_DIALOG);
 
@@ -456,7 +456,7 @@ void prefs_actions_read_config(void)
        gchar buf[PREFSBUFSIZE];
        gchar *act;
 
-       debug_print(_("Reading actions configurations...\n"));
+       debug_print("Reading actions configurations...\n");
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACTIONS_RC, NULL);
        if ((fp = fopen(rcpath, "rb")) == NULL) {
@@ -491,7 +491,7 @@ void prefs_actions_write_config(void)
        PrefFile *pfile;
        GSList *cur;
 
-       debug_print(_("Writing actions configuration...\n"));
+       debug_print("Writing actions configuration...\n");
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACTIONS_RC, NULL);
        if ((pfile= prefs_write_open(rcpath)) == NULL) {
@@ -1168,7 +1168,7 @@ static gboolean execute_actions(gchar *action, GtkWidget *window,
                        cmd = parse_action_cmd(action, msginfo, ctree,
                                               mimeview);
                        if (!cmd) {
-                               debug_print(_("Action command error\n"));
+                               debug_print("Action command error\n");
                                is_ok  = FALSE; /* ERR: incorrect command */
                                break;
                        }
@@ -1260,7 +1260,7 @@ ChildInfo *fork_child(gchar *cmd, gint action_type, GtkWidget *text,
                }
        }
 
-       debug_print(_("Forking child and grandchild.\n"));
+       debug_print("Forking child and grandchild.\n");
 
        pid = fork();
        if (pid == 0) { /* Child */
@@ -1320,9 +1320,9 @@ ChildInfo *fork_child(gchar *cmd, gint action_type, GtkWidget *text,
                                close(chld_status[0]);
                        }
 
-                       debug_print(_("Child: Waiting for grandchild\n"));
+                       debug_print("Child: Waiting for grandchild\n");
                        waitpid(gch_pid, NULL, 0);
-                       debug_print(_("Child: grandchild ended\n"));
+                       debug_print("Child: grandchild ended\n");
                        if (sync) {
                                write(chld_status[1], "0\n", 2);
                                close(chld_status[1]);
@@ -1424,7 +1424,7 @@ static void kill_children_cb(GtkWidget *widget, gpointer data)
 
        for (cur = children->list; cur; cur = cur->next) {
                child_info = (ChildInfo *)(cur->data);
-               debug_print(_("Killing child group id %d\n"), child_info->pid);
+               debug_print("Killing child group id %d\n", child_info->pid);
                if (child_info->pid && kill(-child_info->pid, SIGTERM) < 0)
                        perror("kill");
        }
@@ -1516,7 +1516,7 @@ static void free_children(Children *children)
        GSList *cur;
        ChildInfo *child_info;
 
-       debug_print(_("Freeing children data %p\n"), children);
+       debug_print("Freeing children data %p\n", children);
 
        g_free(children->action);
        for (cur = children->list; cur;) {
@@ -1534,7 +1534,7 @@ static void update_io_dialog(Children *children)
 {
        GSList *cur;
 
-       debug_print(_("Updating actions input/output dialog.\n"));
+       debug_print("Updating actions input/output dialog.\n");
 
        if (!children->nb) {
                gtk_widget_set_sensitive(children->abort_btn, FALSE);
@@ -1685,7 +1685,7 @@ static void catch_status(gpointer data, gint source, GdkInputCondition cond)
        gdk_input_remove(child_info->tag_status);
 
        c = read(source, &buf, 1);
-       debug_print(_("Child returned %c\n"), buf);
+       debug_print("Child returned %c\n", buf);
 
        waitpid(-child_info->pid, NULL, 0);
        childinfo_close_pipes(child_info);
@@ -1701,7 +1701,7 @@ static void catch_input(gpointer data, gint source, GdkInputCondition cond)
        gchar *input;
        gint c;
 
-       debug_print(_("Sending input to grand child.\n"));
+       debug_print("Sending input to grand child.\n");
        if (!(cond && GDK_INPUT_WRITE))
                return;
 
@@ -1718,7 +1718,7 @@ static void catch_input(gpointer data, gint source, GdkInputCondition cond)
 
        gtk_entry_set_text(GTK_ENTRY(children->input_entry), "");
        gtk_widget_set_sensitive(children->input_hbox, TRUE);
-       debug_print(_("Input to grand child sent.\n"));
+       debug_print("Input to grand child sent.\n");
 }
 
 static void catch_output(gpointer data, gint source, GdkInputCondition cond)
@@ -1727,7 +1727,7 @@ static void catch_output(gpointer data, gint source, GdkInputCondition cond)
        gint c, i;
        gchar buf[PREFSBUFSIZE];
 
-       debug_print(_("Catching grand child's output.\n"));
+       debug_print("Catching grand child's output.\n");
        if (child_info->type & ACTION_PIPE_OUT
            && source == child_info->chld_out) {
                gboolean is_selection = FALSE;
index 50132f7e4494acc2081a7ae13b2519b4b743a473..e91ca172b5fefafa8a5a86854f2b6b9ce422fa77 100644 (file)
@@ -1165,7 +1165,7 @@ static void prefs_receive_create(void)
        gtk_box_pack_start (GTK_BOX (vbox2), hbox_newmail_notify, FALSE, 
                            FALSE, 0);
 
-       label_newmail_notify_cmd = gtk_label_new (_("Command  to execute:\n"
+       label_newmail_notify_cmd = gtk_label_new (_("Command to execute:\n"
                                                    "(use %d as number of new "
                                                    "mails)"));
        gtk_label_set_justify(GTK_LABEL(label_newmail_notify_cmd), 
index fa7b74729713fb770d63551cd494d9ffdbda8fd7..638a8e4560223d2c132cc6de67ec1bf0ebbe84aa 100644 (file)
@@ -652,7 +652,7 @@ static void prefs_toolbar_create(void)
 
        gchar *titles[N_DISPLAYED_ITEMS_COLS];
 
-       debug_print(_("Creating custom toolbar window...\n"));
+       debug_print("Creating custom toolbar window...\n");
 
        window = gtk_window_new (GTK_WINDOW_DIALOG);
        gtk_widget_set_usize (window, 450, -1); 
index 01478dd67113dd58e050db3a3dd70e93e1fa028e..ee7b6c7a98bb2125090c8ffc6361d76bed15d2b0 100644 (file)
@@ -26,6 +26,8 @@
 #include <gdk/gdkkeysyms.h>
 
 #include "intl.h"
+#include "manage_window.h"
+#include "gtkutils.h"
 
 static GtkWidget *quote_desc_win;