sync with 0.9.4cvs11

diff --git a/ChangeLog b/ChangeLog
index 8bec50736630578d22b6661a44b81777ae271930..01aabd97078da8cf6832ce72ac73559fbb67ff5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-28
+
+       * src/imap.c: imap_scan_tree_recursive(): fixed compile error.
+
+2003-08-27
+
+       * src/prefs_filter.c: added 'Top' and 'Bottom' button.
+
 2003-08-26
 
        * src/folder.[ch]: folder_item_remove_children(): new. It removes

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 12b40e7452fd393393b6250114a98f18f1435425..da2710d733b9c3543b1f6c46eb15b75f468ea9ef 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2003-08-29 [paul]      0.9.4claws41
+
+       * src/prefs_filtering.c
+               add 'Top' and 'Bottom' buttons, based on changes in
+               src/prefs_filter.c in 0.9.4cvs11.
+
 2003-08-27 [christoph] 0.9.4claws40
 
        * src/folderview.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 36544c44d451c00c28d8154d354916f72de9e421..779a331b1d4c4ec868ca5d4549dc10753698943e 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,11 @@
+2003-08-28
+
+       * src/imap.c: imap_scan_tree_recursive(): ¥³¥ó¥Ñ¥¤¥ë¥¨¥é¡¼¤ò½¤Àµ¡£
+
+2003-08-27
+
+       * src/prefs_filter.c: ¡ÖÀèƬ¡×¤È¡ÖËöÈø¡×¥Ü¥¿¥ó¤òÄɲá£
+
 2003-08-26
 
        * src/folder.[ch]: folder_item_remove_children(): ¿·µ¬¡£ FolderItem

diff --git a/configure.ac b/configure.ac
index 683202c28605d06803d906325ccd538f3ebc1d62..212bf6e6ca63717c5c04c16c0c6294516ad93103 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=40
+EXTRA_VERSION=41
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 610af63472353389dfb4d21d7c1d371c3e3d963d..847c5dec9784d06490e72f02a02d92ee654d7c22 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -2116,9 +2116,9 @@ static void prefs_message_create(void)
 
        PACK_CHECK_BUTTON (hbox1, chkbtn_enablecol,
                           _("Enable coloration of message"));
-       gtk_signal_connect (GTK_OBJECT (chkbtn_enablecol), "toggled",
-                                               GTK_SIGNAL_FUNC (prefs_enable_message_color_toggled),
-                                               NULL);
+       gtk_signal_connect(GTK_OBJECT(chkbtn_enablecol), "toggled",
+                          GTK_SIGNAL_FUNC(prefs_enable_message_color_toggled),
+                          NULL);
 
        button_edit_col = gtk_button_new_with_label (_(" Edit... "));
        gtk_widget_show (button_edit_col);

diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 16c373e854563e06d28ae80380353f0c2ad263c6..02572b272a171507f7a9a7a3e622c3cef54ae1f2 100644 (file)
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -75,8 +75,10 @@ static void prefs_filtering_set_list (void);
 static void prefs_filtering_register_cb        (void);
 static void prefs_filtering_substitute_cb      (void);
 static void prefs_filtering_delete_cb  (void);
+static void prefs_filtering_top                (void);
 static void prefs_filtering_up         (void);
 static void prefs_filtering_down       (void);
+static void prefs_filtering_bottom     (void);
 static void prefs_filtering_select     (GtkCList       *clist,
                                         gint            row,
                                         gint            column,
@@ -187,8 +189,11 @@ static void prefs_filtering_create(void)
        GtkWidget *cond_clist;
 
        GtkWidget *btn_vbox;
+       GtkWidget *spc_vbox;
+       GtkWidget *top_btn;
        GtkWidget *up_btn;
        GtkWidget *down_btn;
+       GtkWidget *bottom_btn;
 
        gchar *title[1];
 
@@ -333,6 +338,14 @@ static void prefs_filtering_create(void)
        gtk_widget_show (btn_vbox);
        gtk_box_pack_start (GTK_BOX (cond_hbox), btn_vbox, FALSE, FALSE, 0);
 
+       top_btn = gtk_button_new_with_label (_("Top"));
+       gtk_widget_show (top_btn);
+       gtk_box_pack_start (GTK_BOX (btn_vbox), top_btn, FALSE, FALSE, 0);
+       gtk_signal_connect (GTK_OBJECT (top_btn), "clicked",
+                           GTK_SIGNAL_FUNC (prefs_filtering_top), NULL);
+
+       PACK_VSPACER (btn_vbox, spc_vbox, VSPACING_NARROW_2);
+
        up_btn = gtk_button_new_with_label (_("Up"));
        gtk_widget_show (up_btn);
        gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 0);
@@ -345,6 +358,14 @@ static void prefs_filtering_create(void)
        gtk_signal_connect (GTK_OBJECT (down_btn), "clicked",
                            GTK_SIGNAL_FUNC (prefs_filtering_down), NULL);
 
+       PACK_VSPACER (btn_vbox, spc_vbox, VSPACING_NARROW_2);
+
+       bottom_btn = gtk_button_new_with_label (_("Bottom"));
+       gtk_widget_show (bottom_btn);
+       gtk_box_pack_start (GTK_BOX (btn_vbox), bottom_btn, FALSE, FALSE, 0);
+       gtk_signal_connect (GTK_OBJECT (bottom_btn), "clicked",
+                           GTK_SIGNAL_FUNC (prefs_filtering_bottom), NULL);
+
        gtk_widget_set_usize(window, 500, -1);
 
        gtk_widget_show_all(window);
@@ -840,6 +861,18 @@ static void prefs_filtering_delete_cb(void)
        prefs_filtering_update_hscrollbar();
 }
 
+static void prefs_filtering_top(void)
+{
+       GtkCList *clist = GTK_CLIST(filtering.cond_clist);
+       gint row;
+
+       if (!clist->selection) return;
+
+       row = GPOINTER_TO_INT(clist->selection->data);
+       if (row > 1)
+               gtk_clist_row_move(clist, row, 1);
+}
+
 static void prefs_filtering_up(void)
 {
        GtkCList *clist = GTK_CLIST(filtering.cond_clist);
@@ -850,9 +883,8 @@ static void prefs_filtering_up(void)
        row = GPOINTER_TO_INT(clist->selection->data);
        if (row > 1) {
                gtk_clist_row_move(clist, row, row - 1);
-               if(gtk_clist_row_is_visible(clist, row - 1) != GTK_VISIBILITY_FULL) {
-                       gtk_clist_moveto(clist, row - 1, 0, 0, 0);
-               } 
+               if (gtk_clist_row_is_visible(clist, row - 1) != GTK_VISIBILITY_FULL) 
+                       gtk_clist_moveto(clist, row - 1, 0, 0, 0); 
        }
 }
 
@@ -866,12 +898,23 @@ static void prefs_filtering_down(void)
        row = GPOINTER_TO_INT(clist->selection->data);
        if (row > 0 && row < clist->rows - 1) {
                gtk_clist_row_move(clist, row, row + 1);
-               if(gtk_clist_row_is_visible(clist, row + 1) != GTK_VISIBILITY_FULL) {
-                       gtk_clist_moveto(clist, row + 1, 0, 1, 0);
-               } 
+               if (gtk_clist_row_is_visible(clist, row + 1) != GTK_VISIBILITY_FULL)
+                       gtk_clist_moveto(clist, row + 1, 0, 1, 0); 
        }
 }
 
+static void prefs_filtering_bottom(void)
+{
+       GtkCList *clist = GTK_CLIST(filtering.cond_clist);
+       gint row;
+
+       if (!clist->selection) return;
+
+       row = GPOINTER_TO_INT(clist->selection->data);
+       if (row > 0 && row < clist->rows - 1)
+               gtk_clist_row_move(clist, row, clist->rows - 1);
+}
+
 static void prefs_filtering_select_set(FilteringProp *prop)
 {
        gchar *matcher_str;