sync with sylpheed 0.7.0cvs39
authorPaul Mangan <paul@claws-mail.org>
Fri, 8 Feb 2002 10:07:11 +0000 (10:07 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 8 Feb 2002 10:07:11 +0000 (10:07 +0000)
22 files changed:
AUTHORS
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/addressbook.c
src/compose.c
src/editaddress.c
src/editgroup.c
src/folderview.c
src/importldif.c
src/mainwindow.c
src/md5.c
src/mimeview.c
src/prefs_actions.c
src/prefs_common.c
src/prefs_customheader.c
src/prefs_filter.c
src/prefs_filtering.c
src/prefs_matcher.c
src/prefs_scoring.c
src/summaryview.c

diff --git a/AUTHORS b/AUTHORS
index cd3f173..5d64adf 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -113,3 +113,4 @@ contributors (beside the above; based on Changelog)
        Yasuzaki Masayoshi
        Stoyan Genov
        Jeremy Andrews
+       Shawn Houston
index d4b4f1b..719dde8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,20 @@
          doesn't exist.
        * src/foldersel.[ch]: foldersel_folder_sel(): added an argument
          that specifies the folder selection type.
+       * src/addressbook.c
+         src/compose.c
+         src/editaddress.c
+         src/editgroup.c
+         src/folderview.c
+         src/importldif.c
+         src/mainwindow.c
+         src/md5.c
+         src/mimeview.c
+         src/prefs_common.c
+         src/prefs_customheader.c
+         src/prefs_filter.c
+         src/summaryview.c: made it compile with C compilers other than gcc
+         (thanks to Shawn Houston).
 
 2002-02-06
 
index c399e5d..bc984ca 100644 (file)
@@ -1,7 +1,18 @@
+2002-02-08 [paul]      0.7.0claws57
+
+       * sync with sylpheed 0.7.0cvs39
+               see ChangeLog entry 2002-02-07 (last entry) 
+
+       * src/prefs_actions.c
+         src/prefs_filtering.c
+         src/prefs_matcher.c
+         src/prefs_scoring.c
+               sync: made it compile with C compilers other than gcc
+
 2002-02-07 [paul]      0.7.0claws56
 
        * sync with sylpheed 0.7.0cvs38
-               see ChangeLog entries 2002-02-06 {last 2 entries) and
+               see ChangeLog entries 2002-02-06 (last 2 entries) and
                2002-02-07
 
 2002-02-07 [darko]     0.7.0claws55
index 4c5a983..259e206 100644 (file)
@@ -4,6 +4,20 @@
          ¾ì¹ç¤Ï¥á¥Ã¥»¡¼¥¸¤ò¼èÆÀ¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
        * src/foldersel.[ch]: foldersel_folder_sel(): ¥Õ¥©¥ë¥ÀÁªÂò¤Î
          ¥¿¥¤¥×¤ò»ØÄꤹ¤ë°ú¿ô¤òÄɲá£
+       * src/addressbook.c
+         src/compose.c
+         src/editaddress.c
+         src/editgroup.c
+         src/folderview.c
+         src/importldif.c
+         src/mainwindow.c
+         src/md5.c
+         src/mimeview.c
+         src/prefs_common.c
+         src/prefs_customheader.c
+         src/prefs_filter.c
+         src/summaryview.c: gcc °Ê³°¤Î C ¥³¥ó¥Ñ¥¤¥é¤Ç¤â¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤ë
+         ¤è¤¦¤Ë¤·¤¿(Shawn Houston ¤µ¤ó thanks)¡£
 
 2002-02-06
 
index dbb5414..ebc048d 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws56
+EXTRA_VERSION=claws57
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 6edc109..35f2e12 100644 (file)
@@ -525,12 +525,16 @@ static void addressbook_create(void)
        gint n_entries;
        GList *nodeIf;
 
-       gchar *titles[N_COLS] = {_("Name"), _("E-Mail address"), _("Remarks")};
+       gchar *titles[N_COLS];
        gchar *text;
        gint i;
 
        debug_print("Creating addressbook window...\n");
 
+       titles[COL_NAME]    = _("Name");
+       titles[COL_ADDRESS] = _("E-Mail address");
+       titles[COL_REMARKS] = _("Remarks");
+
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(window), _("Address book"));
        gtk_widget_set_usize(window, ADDRESSBOOK_WIDTH, ADDRESSBOOK_HEIGHT);
index 630158b..a466ad3 100644 (file)
@@ -4192,12 +4192,16 @@ static GtkWidget *compose_create_header(Compose *compose)
 
 GtkWidget *compose_create_attach(Compose *compose)
 {
-       gchar *titles[] = {_("MIME type"), _("Size"), _("Name")};
+       gchar *titles[N_ATTACH_COLS];
        gint i;
 
        GtkWidget *attach_scrwin;
        GtkWidget *attach_clist;
 
+       titles[COL_MIMETYPE] = _("MIME type");
+       titles[COL_SIZE]     = _("Size");
+       titles[COL_NAME]     = _("Name");
+
        /* attachment list */
        attach_scrwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(attach_scrwin),
@@ -4342,6 +4346,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 
        UndoMain *undostruct;
 
+       gchar *titles[N_ATTACH_COLS];
        guint n_menu_entries;
        GtkStyle  *style, *new_style;
        GdkColormap *cmap;
@@ -4364,6 +4369,10 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        debug_print(_("Creating compose window...\n"));
        compose = g_new0(Compose, 1);
 
+       titles[COL_MIMETYPE] = _("MIME type");
+       titles[COL_SIZE]     = _("Size");
+       titles[COL_NAME]     = _("Name");
+
        compose->account = account;
        compose->orig_account = account;
 
index 76345e2..dadddff 100644 (file)
@@ -602,9 +602,13 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
        GtkWidget *entry_remarks;
        gint top;
 
-       gchar *titles[ EMAIL_N_COLS ] = { _("E-Mail Address"), _("Alias"), _("Remarks") };
+       gchar *titles[ EMAIL_N_COLS ];
        gint i;
 
+       titles[ EMAIL_COL_EMAIL   ] = _("E-Mail Address");
+       titles[ EMAIL_COL_ALIAS   ] = _("Alias");
+       titles[ EMAIL_COL_REMARKS ] = _("Remarks");
+
        vbox = gtk_vbox_new( FALSE, 8 );
        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
@@ -746,9 +750,12 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
        GtkWidget *entry_value;
        gint top;
 
-       gchar *titles[ ATTRIB_N_COLS ] = { _("Name"), _("Value") };
+       gchar *titles[ ATTRIB_N_COLS ];
        gint i;
 
+       titles[ ATTRIB_COL_NAME  ] = _("Name");
+       titles[ ATTRIB_COL_VALUE ] = _("Value");
+
        vbox = gtk_vbox_new( FALSE, 8 );
        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
index c4f65e6..a1ca39b 100644 (file)
@@ -246,9 +246,13 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
        GtkWidget *buttonAvail;
        gint top;
 
-       gchar *titles[ GROUP_N_COLS ] = { _( "Name" ), _("E-Mail Address"), _("Remarks") };
+       gchar *titles[ GROUP_N_COLS ];
        gint i;
 
+       titles[ GROUP_COL_NAME    ] = _( "Name" );
+       titles[ GROUP_COL_EMAIL   ] = _("E-Mail Address");
+       titles[ GROUP_COL_REMARKS ] = _("Remarks");
+
        window = gtk_window_new(GTK_WINDOW_DIALOG);
        gtk_widget_set_usize(window, EDITGROUP_WIDTH, EDITGROUP_HEIGHT );
        gtk_container_set_border_width(GTK_CONTAINER(window), 0);
index 23a7ad0..5c3a9d6 100644 (file)
@@ -311,8 +311,7 @@ FolderView *folderview_create(void)
        FolderView *folderview;
        GtkWidget *scrolledwin;
        GtkWidget *ctree;
-       gchar *titles[N_FOLDER_COLS] = {_("Folder"), _("New"),
-                                       _("Unread"), _("#")};
+       gchar *titles[N_FOLDER_COLS];
        GtkWidget *mail_popup;
        GtkWidget *news_popup;
        GtkWidget *imap_popup;
@@ -327,6 +326,11 @@ FolderView *folderview_create(void)
        debug_print(_("Creating folder view...\n"));
        folderview = g_new0(FolderView, 1);
 
+       titles[COL_FOLDER] = _("Folder");
+       titles[COL_NEW]    = _("New");
+       titles[COL_UNREAD] = _("Unread");
+       titles[COL_TOTAL]  = _("#");
+
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
                                       GTK_POLICY_AUTOMATIC,
index 51f29d3..eb35d6a 100644 (file)
@@ -550,10 +550,13 @@ static void imp_ldif_page_fields( gint pageNum, gchar *pageLbl ) {
        GtkWidget *check_select;
        gint top;
 
-       gchar *titles[ FIELDS_N_COLS ] =
-               { _("S"), _("LDIF Field"), _("Attribute Name") };
+       gchar *titles[ FIELDS_N_COLS ];
        gint i;
 
+       titles[ FIELD_COL_SELECT ] = _("S");
+       titles[ FIELD_COL_FIELD  ] = _("LDIF Field");
+       titles[ FIELD_COL_ATTRIB ] = _("Attribute Name");
+
        vbox = gtk_vbox_new(FALSE, 8);
        gtk_container_add( GTK_CONTAINER( impldif_dlg.notebook ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER (vbox), 4 );
index ecfe401..b777d1c 100644 (file)
@@ -1438,28 +1438,38 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
 void main_window_set_toolbar_sensitive(MainWindow *mainwin)
 {
        SensitiveCond state;
-    gboolean sensitive;
+       gboolean sensitive;
        gint i;
 
-       const struct {
+       struct {
                GtkWidget *widget;
                SensitiveCond cond;
-       } entry[] = {
-               {mainwin->get_btn         , M_HAVE_ACCOUNT|M_UNLOCKED},
-               {mainwin->getall_btn      , M_HAVE_ACCOUNT|M_UNLOCKED},
-               {mainwin->compose_mail_btn, M_HAVE_ACCOUNT},
-               {mainwin->compose_news_btn, M_HAVE_NEWS_ACCOUNT},
-               {mainwin->reply_btn       , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-               {mainwin->replyall_btn    , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-               {mainwin->replysender_btn , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-               {mainwin->fwd_btn         , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-               /* {mainwin->prefs_btn      , M_UNLOCKED},
-               {mainwin->account_btn    , M_UNLOCKED}, */
-               {mainwin->next_btn        , M_MSG_EXIST},
-               {mainwin->delete_btn      , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
-               {mainwin->exec_btn        , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
-               {NULL, 0}
-       };
+       } entry[10];
+
+       entry[0].widget  = mainwin->get_btn;
+       entry[0].cond    = M_HAVE_ACCOUNT|M_UNLOCKED;
+       entry[1].widget  = mainwin->getall_btn;
+       entry[1].cond    = M_HAVE_ACCOUNT|M_UNLOCKED;
+       entry[2].widget  = mainwin->compose_news_btn;
+       entry[2].cond    = M_HAVE_NEWS_ACCOUNT;
+       entry[3].widget  = mainwin->reply_btn;
+       entry[3].cond    = M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST;
+       entry[4].widget  = mainwin->replyall_btn;
+       entry[4].cond    = M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST;
+       entry[5].widget  = mainwin->fwd_btn;
+       entry[5].cond    = M_HAVE_ACCOUNT|M_TARGET_EXIST;
+/*     entry[6].widget  = mainwin->prefs_btn;
+       entry[6].cond    = M_UNLOCKED;
+       entry[7].widget  = mainwin->account_btn;
+       entry[7].cond    = M_UNLOCKED; */
+       entry[6].widget  = mainwin->next_btn;
+       entry[6].cond    = M_MSG_EXIST;
+       entry[7].widget  = mainwin->delete_btn;
+       entry[7].cond    = M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED;
+       entry[8].widget = mainwin->exec_btn;
+       entry[8].cond   = M_MSG_EXIST|M_EXEC|M_UNLOCKED;
+       entry[9].widget = NULL;
+       entry[9].cond   = 0;
 
        state = main_window_get_current_state(mainwin);
 
@@ -1501,9 +1511,9 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/View/Thread view"               , M_UNTHREADED},
                {"/View/Unthread view"             , M_THREADED},
                {"/View/Hide read messages"        , M_HIDE_READ_MSG},
-               {"/View/Go to"                     , M_MSG_EXIST},
                {"/View/Go to/Prev message"        , M_MSG_EXIST},
                {"/View/Go to/Next message"        , M_MSG_EXIST},
+               {"/View/Go to/Prev unread message" , M_MSG_EXIST},
                {"/View/Go to/Next unread message" , M_MSG_EXIST},
                {"/View/Go to/Prev marked message" , M_MSG_EXIST},
                {"/View/Go to/Next marked message" , M_MSG_EXIST},
index 53b9711..465cbf0 100644 (file)
--- a/src/md5.c
+++ b/src/md5.c
@@ -96,7 +96,7 @@ transform(MD5_CONTEXT *ctx, const unsigned char *data)
 #ifdef BIG_ENDIAN_HOST
        {
                int i;
-               const unsigned char *p2, *p1;
+               unsigned char *p2, *p1;
 
                for (i = 0, p1 = data, p2 = (unsigned char*)correct_words;
                     i < 16; i++, p2 += 4) {
index 54218a0..8fc12ae 100644 (file)
@@ -136,14 +136,17 @@ MimeView *mimeview_create(void)
        GtkWidget *vbox;
        GtkWidget *popupmenu;
        GtkItemFactory *popupfactory;
-
-       gchar *titles[] = {_("MIME Type"), _("Size"), _("Name")};
+       gchar *titles[N_MIMEVIEW_COLS];
        gint n_entries;
        gint i;
 
        debug_print(_("Creating MIME view...\n"));
        mimeview = g_new0(MimeView, 1);
 
+       titles[COL_MIMETYPE] = _("MIME Type");
+       titles[COL_SIZE]     = _("Size");
+       titles[COL_NAME]     = _("Name");
+
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
                                       GTK_POLICY_AUTOMATIC,
index cc971aa..b58b3da 100644 (file)
@@ -153,7 +153,7 @@ static void prefs_actions_create(MainWindow *mainwin)
        GtkWidget *up_btn;
        GtkWidget *down_btn;
        
-       gchar *title[] = {_("Registered actions")};
+       gchar *title[1];
 
        debug_print(_("Creating actions setting window...\n"));
 
@@ -274,6 +274,7 @@ static void prefs_actions_create(MainWindow *mainwin)
                                        GTK_POLICY_AUTOMATIC,
                                        GTK_POLICY_AUTOMATIC);
 
+       title[0] = _("Registered actions");
        cond_clist = gtk_clist_new_with_titles(1, title);
        gtk_widget_show (cond_clist);
        gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_clist);
index c98aae8..71c847a 100644 (file)
@@ -2780,29 +2780,29 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
        GtkWidget *cancel_btn;
        GtkWidget *datefmt_entry;
 
-       const struct {
+       struct {
                gchar *fmt;
                gchar *txt;
        } time_format[] = {
-               { "%a", _("the full abbreviated weekday name") },
-               { "%A", _("the full weekday name") },
-               { "%b", _("the abbreviated month name") },
-               { "%B", _("the full month name") },
-               { "%c", _("the preferred date and time for the current locale") },
-               { "%C", _("the century number (year/100)") },
-               { "%d", _("the day of the month as a decimal number") },
-               { "%H", _("the hour as a decimal number using a 24-hour clock") },
-               { "%I", _("the hour as a decimal number using a 12-hour clock") },
-               { "%j", _("the day of the year as a decimal number") },
-               { "%m", _("the month as a decimal number") },
-               { "%M", _("the minute as a decimal number") },
-               { "%p", _("either AM or PM") },
-               { "%S", _("the second as a decimal number") },
-               { "%w", _("the day of the week as a decimal number") },
-               { "%x", _("the preferred date for the current locale") },
-               { "%y", _("the last two digits of a year") },
-               { "%Y", _("the year as a decimal number") },
-               { "%Z", _("the time zone or name or abbreviation") }
+               { "%a", NULL },
+               { "%A", NULL },
+               { "%b", NULL },
+               { "%B", NULL },
+               { "%c", NULL },
+               { "%C", NULL },
+               { "%d", NULL },
+               { "%H", NULL },
+               { "%I", NULL },
+               { "%j", NULL },
+               { "%m", NULL },
+               { "%M", NULL },
+               { "%p", NULL },
+               { "%S", NULL },
+               { "%w", NULL },
+               { "%x", NULL },
+               { "%y", NULL },
+               { "%Y", NULL },
+               { "%Z", NULL }
        };
 
        gchar *titles[2];
@@ -2810,6 +2810,26 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
        const gint TIME_FORMAT_ELEMS =
                sizeof time_format / sizeof time_format[0];
 
+       time_format[0].txt  = _("the full abbreviated weekday name");
+       time_format[1].txt  = _("the full weekday name");
+       time_format[2].txt  = _("the abbreviated month name");
+       time_format[3].txt  = _("the full month name");
+       time_format[4].txt  = _("the preferred date and time for the current locale");
+       time_format[5].txt  = _("the century number (year/100)");
+       time_format[6].txt  = _("the day of the month as a decimal number");
+       time_format[7].txt  = _("the hour as a decimal number using a 24-hour clock");
+       time_format[8].txt  = _("the hour as a decimal number using a 12-hour clock");
+       time_format[9].txt  = _("the day of the year as a decimal number");
+       time_format[10].txt = _("the month as a decimal number");
+       time_format[11].txt = _("the minute as a decimal number");
+       time_format[12].txt = _("either AM or PM");
+       time_format[13].txt = _("the second as a decimal number");
+       time_format[14].txt = _("the day of the week as a decimal number");
+       time_format[15].txt = _("the preferred date for the current locale");
+       time_format[16].txt = _("the last two digits of a year");
+       time_format[17].txt = _("the year as a decimal number");
+       time_format[18].txt = _("the time zone or name or abbreviation");
+
        if (datefmt_win) return datefmt_win;
 
        datefmt_win = gtk_window_new(GTK_WINDOW_DIALOG);
index 1a9e1da..cd562c2 100644 (file)
@@ -140,7 +140,7 @@ static void prefs_custom_header_create(void)
        GtkWidget *up_btn;
        GtkWidget *down_btn;
 
-       gchar *title[] = {_("Custom headers")};
+       gchar *title[1];
 
        debug_print(_("Creating custom header setting window...\n"));
 
@@ -261,6 +261,7 @@ static void prefs_custom_header_create(void)
                                        GTK_POLICY_AUTOMATIC,
                                        GTK_POLICY_AUTOMATIC);
 
+       title[0] = _("Custom headers");
        customhdr_clist = gtk_clist_new_with_titles(1, title);
        gtk_widget_show (customhdr_clist);
        gtk_container_add (GTK_CONTAINER (ch_scrolledwin), customhdr_clist);
index 77116b7..e18cfbc 100644 (file)
@@ -186,7 +186,7 @@ static void prefs_filter_create(void)
        GtkWidget *up_btn;
        GtkWidget *down_btn;
 
-       gchar *title[] = {_("Registered rules")};
+       gchar *title[1];
 
        debug_print(_("Creating filter setting window...\n"));
 
@@ -432,6 +432,7 @@ static void prefs_filter_create(void)
                                        GTK_POLICY_AUTOMATIC,
                                        GTK_POLICY_AUTOMATIC);
 
+       title[0] = _("Registered rules");
        cond_clist = gtk_clist_new_with_titles(1, title);
        gtk_widget_show (cond_clist);
        gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_clist);
@@ -788,11 +789,13 @@ static void prefs_filter_select(GtkCList *clist, gint row, gint column,
                                GdkEvent *event)
 {
        Filter *flt;
-       Filter default_flt = {"Subject", NULL, _("(none)"), NULL,
+       Filter default_flt = {"Subject", NULL, NULL, NULL,
                              FLT_CONTAIN, FLT_CONTAIN, FLT_AND,
                              NULL, FLT_MOVE};
        gboolean is_regex;
 
+       default_flt.name2 = _("(none)");
+
        flt = gtk_clist_get_row_data(clist, row);
        if (!flt)
                flt = &default_flt;
index aa3cefa..c3fdde6 100644 (file)
@@ -312,7 +312,7 @@ static void prefs_filtering_create(void)
        GList *accounts;
        GList * cur;
 
-       gchar *title[] = {_("Registered rules")};
+       gchar *title[1];
 
        debug_print(_("Creating filtering setting window...\n"));
 
@@ -542,6 +542,7 @@ static void prefs_filtering_create(void)
                                        GTK_POLICY_AUTOMATIC,
                                        GTK_POLICY_AUTOMATIC);
 
+       title[0] = _("Registered rules");
        cond_clist = gtk_clist_new_with_titles(1, title);
        gtk_widget_show (cond_clist);
        gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_clist);
index e772c17..3265da8 100644 (file)
@@ -283,7 +283,7 @@ static void prefs_matcher_create(void)
        GList *combo_items;
        gint i;
 
-       gchar *title[] = {_("Registered rules")};
+       gchar *title[1];
 
        debug_print(_("Creating matcher setting window...\n"));
 
@@ -547,6 +547,7 @@ static void prefs_matcher_create(void)
                                        GTK_POLICY_AUTOMATIC,
                                        GTK_POLICY_AUTOMATIC);
 
+       title[0] = ("Registered rules");
        cond_clist = gtk_clist_new_with_titles(1, title);
        gtk_widget_show (cond_clist);
        gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_clist);
index ff03b24..a8327d4 100644 (file)
@@ -179,7 +179,7 @@ static void prefs_scoring_create(void)
        GtkWidget *kill_score_entry;
        GtkWidget *kill_score_label;
 
-       gchar *title[] = {_("Registered rules")};
+       gchar *title[1];
 
        debug_print(_("Creating scoring setting window...\n"));
 
@@ -303,6 +303,7 @@ static void prefs_scoring_create(void)
                                        GTK_POLICY_AUTOMATIC,
                                        GTK_POLICY_AUTOMATIC);
 
+       title[0] = ("Registered rules");
        cond_clist = gtk_clist_new_with_titles(1, title);
        gtk_widget_show (cond_clist);
        gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_clist);
index e54fc33..a3ccc2c 100644 (file)
@@ -2440,6 +2440,8 @@ void summary_step(SummaryView *summaryview, GtkScrollType type)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
+       if (summary_is_locked(summaryview)) return;
+
        if (type == GTK_SCROLL_STEP_FORWARD) {
                GtkCTreeNode *node;
                node = gtkut_ctree_node_next(ctree, summaryview->selected);