2007-07-15 [colin] 2.10.0cvs28
authorColin Leroy <colin@colino.net>
Sun, 15 Jul 2007 09:14:01 +0000 (09:14 +0000)
committerColin Leroy <colin@colino.net>
Sun, 15 Jul 2007 09:14:01 +0000 (09:14 +0000)
* src/mainwindow.c
Maemo: force layout to be Small screen; the
others don't make sense

ChangeLog
PATCHSETS
configure.ac
src/mainwindow.c

index b7602c9df4f3f39d602cd0be8ee70a557f950de5..a1395ff51ddb1c45df7897656a80d88e3f73d757 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-15 [colin]     2.10.0cvs28
+
+       * src/mainwindow.c
+               Maemo: force layout to be Small screen; the
+               others don't make sense
+
 2007-07-14 [colin]     2.10.0cvs27
 
        * src/mimeview.c
index f812f7d23a90ed2b17ee06607a388a27300fda48..25654decfad6b663d1d6b1cc704b8de512dc4059 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.274.2.196 -r 1.274.2.197 src/mainwindow.c;  cvs diff -u -r 1.43.2.73 -r 1.43.2.74 src/toolbar.c;  ) > 2.10.0cvs25.patchset
 ( cvs diff -u -r 1.43.2.74 -r 1.43.2.75 src/toolbar.c;  ) > 2.10.0cvs26.patchset
 ( cvs diff -u -r 1.83.2.109 -r 1.83.2.110 src/mimeview.c;  cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/gtk/gtkvscrollbutton.c;  ) > 2.10.0cvs27.patchset
+( cvs diff -u -r 1.274.2.197 -r 1.274.2.198 src/mainwindow.c;  ) > 2.10.0cvs28.patchset
index 898e5fa8ca5cc0e1929fb0af84f06eb1da33eec8..3a82773fcea44b48bb619c7b1fc55607e8929a27 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=27
+EXTRA_VERSION=28
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index b4ff0a88806e8fd6227f0afbc27140f9ca35c43b..6fa82e6cec9708625dff4aac483678b9b82ef63c 100644 (file)
@@ -190,10 +190,11 @@ static void toggle_toolbar_cb      (MainWindow    *mainwin,
 static void toggle_statusbar_cb         (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+#ifndef MAEMO
 static void set_layout_cb       (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-
+#endif
 static void addressbook_open_cb        (MainWindow     *mainwin,
                                 guint           action,
                                 GtkWidget      *widget);
@@ -564,6 +565,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/Set displayed _columns/in _Message list..."),NULL, set_summary_display_item_cb, 0, NULL},
 
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
+#ifndef MAEMO
        {N_("/_View/La_yout"),                  NULL, NULL, 0, "<Branch>"},
        {N_("/_View/Layout/_Standard"),         NULL, set_layout_cb, NORMAL_LAYOUT, "<RadioItem>"},
        {N_("/_View/Layout/_Three columns"),    NULL, set_layout_cb, VERTICAL_LAYOUT, "/View/Layout/Standard"},
@@ -571,6 +573,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/Layout/W_ide message list"),NULL, set_layout_cb, WIDE_MSGLIST_LAYOUT, "/View/Layout/Standard"},
        {N_("/_View/Layout/S_mall screen"),     NULL, set_layout_cb, SMALL_LAYOUT, "/View/Layout/Standard"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
+#endif
        {N_("/_View/_Sort"),                    NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Sort/by _number"),         NULL, sort_summary_cb, SORT_BY_NUMBER, "<RadioItem>"},
        {N_("/_View/_Sort/by S_ize"),           NULL, sort_summary_cb, SORT_BY_SIZE, "/View/Sort/by number"},
@@ -1319,7 +1322,9 @@ MainWindow *main_window_create()
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "mainwindow");
        gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
-
+#ifdef MAEMO
+       prefs_common.layout_mode = SMALL_LAYOUT;
+#endif
        if (!geometry.min_height) {
                geometry.min_width = 320;
                geometry.min_height = 200;
@@ -3117,6 +3122,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
 }
 
+#ifndef MAEMO
        switch (prefs_common.layout_mode) {
        case NORMAL_LAYOUT:
                SET_CHECK_MENU_ACTIVE("/View/Layout/Standard", TRUE);
@@ -3134,6 +3140,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
                SET_CHECK_MENU_ACTIVE("/View/Layout/Small screen", TRUE);
                break;
        }
+#endif
 #undef SET_CHECK_MENU_ACTIVE
 
        if (folderwin) {
@@ -3377,6 +3384,7 @@ static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
        }
 }
 
+#ifndef MAEMO
 static void set_layout_cb(MainWindow *mainwin, guint action,
                               GtkWidget *widget)
 {
@@ -3410,6 +3418,7 @@ static void set_layout_cb(MainWindow *mainwin, guint action,
        summary_relayout(mainwin->summaryview); 
        summary_update_unread(mainwin->summaryview, NULL);
 }
+#endif
 
 void main_window_toggle_work_offline (MainWindow *mainwin, gboolean offline,
                                        gboolean ask_sync)