2008-01-15 [wwp] 3.2.0cvs44

	* src/prefs_filtering.c
		Fix filtering prefs layout (Maemo port), moving page up/down
		from buttons to context menu.

diff --git a/ChangeLog b/ChangeLog
index 2f0f88bc06830bd115c7d1c2c59bd49fa6f500a9..7a7043c26f19dda62468429e63ed8dcbae7a69b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-15 [wwp]       3.2.0cvs44
+
+       * src/prefs_filtering.c
+               Fix filtering prefs layout (Maemo port), moving page up/down
+               from buttons to context menu.
+
 2008-01-15 [colin]     3.2.0cvs43
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 86738213ec0fa31d97efecb8753ca284317cb3b8..cea46fdba1e93df305d70e45e246d8c4275b994e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3180,3 +3180,4 @@
 ( cvs diff -u -r 1.395.2.349 -r 1.395.2.350 src/summaryview.c;  ) > 3.2.0cvs41.patchset
 ( cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/common/passcrypt.c;  ) > 3.2.0cvs42.patchset
 ( cvs diff -u -r 1.382.2.429 -r 1.382.2.430 src/compose.c;  ) > 3.2.0cvs43.patchset
+( cvs diff -u -r 1.59.2.63 -r 1.59.2.64 src/prefs_filtering.c;  ) > 3.2.0cvs44.patchset

diff --git a/configure.ac b/configure.ac
index 8225b67fdcb472a8a2c6d156519768cecd919a69..4f661904b8d9371ca2d79a434738888e8be776f7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=43
+EXTRA_VERSION=44
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 450c9b3675e237d2f980a1f0afe3fe5b1b122910..43addfa45ba23765a6bd9245f346b3de7782733b 100644 (file)
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -316,10 +316,12 @@ static void prefs_filtering_create(void)
 
        GtkWidget *btn_vbox;
        GtkWidget *top_btn;
-       GtkWidget *page_up_btn;
        GtkWidget *up_btn;
        GtkWidget *down_btn;
+#ifndef MAEMO
+       GtkWidget *page_up_btn;
        GtkWidget *page_down_btn;
+#endif
        GtkWidget *bottom_btn;
        GtkWidget *table;
        static GdkGeometry geometry;
@@ -520,6 +522,7 @@ static void prefs_filtering_create(void)
        gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), top_btn,
                        _("Move selected rule to top of list"), NULL);
 
+#ifndef MAEMO
        page_up_btn = gtk_button_new_with_mnemonic (_("Page up"));
        gtk_button_set_image(GTK_BUTTON(page_up_btn),
                        gtk_image_new_from_stock(GTK_STOCK_GO_UP,GTK_ICON_SIZE_BUTTON));
@@ -529,6 +532,7 @@ static void prefs_filtering_create(void)
                         G_CALLBACK(prefs_filtering_page_up), NULL);
        gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), page_up_btn,
                        _("Move selected rule one page up in list"), NULL);
+#endif
 
        up_btn = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
        gtk_widget_show (up_btn);
@@ -546,6 +550,7 @@ static void prefs_filtering_create(void)
        gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), down_btn,
                        _("Move down selected rule by one row in list"), NULL);
 
+#ifndef MAEMO
        page_down_btn = gtk_button_new_with_mnemonic (_("Page down"));
        gtk_button_set_image(GTK_BUTTON(page_down_btn),
                        gtk_image_new_from_stock(GTK_STOCK_GO_DOWN,GTK_ICON_SIZE_BUTTON));
@@ -555,6 +560,7 @@ static void prefs_filtering_create(void)
                         G_CALLBACK(prefs_filtering_page_down), NULL);
        gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), page_down_btn,
                        _("Move selected rule one page down in list"), NULL);
+#endif
 
        bottom_btn = gtk_button_new_from_stock (GTK_STOCK_GOTO_BOTTOM);
        gtk_widget_show (bottom_btn);
@@ -1723,6 +1729,11 @@ static GtkItemFactoryEntry prefs_filtering_popup_entries[] =
        {N_("/_Delete"),                NULL, prefs_filtering_delete_cb, 0, NULL, NULL},
        {N_("/Delete _all"),            NULL, prefs_filtering_delete_all_cb, 0, NULL, NULL},
        {N_("/D_uplicate"),             NULL, prefs_filtering_duplicate_cb, 0, NULL, NULL},
+#ifdef MAEMO
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>", NULL},
+       {N_("/Move one page up"),               NULL, prefs_filtering_page_up, 0, NULL, NULL},
+       {N_("/Move one page down"),             NULL, prefs_filtering_page_down, 0, NULL, NULL},
+#endif
 };
 
 static gint prefs_filtering_list_btn_pressed(GtkWidget *widget, GdkEventButton *event,