2007-03-22 [colin] 2.8.1cvs36
authorColin Leroy <colin@colino.net>
Thu, 22 Mar 2007 07:52:47 +0000 (07:52 +0000)
committerColin Leroy <colin@colino.net>
Thu, 22 Mar 2007 07:52:47 +0000 (07:52 +0000)
* src/mainwindow.c
* src/mainwindow.h
* src/summaryview.c
Rename "little screen" to "Small screen"
* src/gtk/Makefile.am
* src/common/utils.c
* src/mh.c
Fix Maemo-related compilation problems

ChangeLog
PATCHSETS
configure.ac
src/common/utils.c
src/gtk/Makefile.am
src/mainwindow.c
src/mainwindow.h
src/mh.c
src/summaryview.c

index 5282b6353a36d7df89b0091f95c5a20b5598e02c..c81617f766c93f9c8261426193bc3fb703e82942 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-03-22 [colin]     2.8.1cvs36
+
+       * src/mainwindow.c
+       * src/mainwindow.h
+       * src/summaryview.c
+               Rename "little screen" to "Small screen"
+       * src/gtk/Makefile.am
+       * src/common/utils.c
+       * src/mh.c
+               Fix Maemo-related compilation problems
+
 2007-03-21 [colin]     2.8.1cvs35
 
        * configure.ac
index c3530db1dd97e81fe0e4d0bc07dcd1d9f0d655c0..f8c26c59e280e4e26f1f7147ecb55c2da4edf54f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.115.2.146 -r 1.115.2.147 src/main.c;  ) > 2.8.1cvs33.patchset
 ( cvs diff -u -r 1.654.2.2505 -r 1.654.2.2506 configure.ac;  cvs diff -u -r 1.155.2.55 -r 1.155.2.56 src/Makefile.am;  ) > 2.8.1cvs34.patchset
 ( cvs diff -u -r 1.654.2.2506 -r 1.654.2.2507 configure.ac;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 claws-mail.desktop;  ) > 2.8.1cvs35.patchset
+( cvs diff -u -r 1.274.2.179 -r 1.274.2.180 src/mainwindow.c;  cvs diff -u -r 1.39.2.35 -r 1.39.2.36 src/mainwindow.h;  cvs diff -u -r 1.79.2.53 -r 1.79.2.54 src/mh.c;  cvs diff -u -r 1.395.2.288 -r 1.395.2.289 src/summaryview.c;  cvs diff -u -r 1.36.2.99 -r 1.36.2.100 src/common/utils.c;  cvs diff -u -r 1.20.2.12 -r 1.20.2.13 src/gtk/Makefile.am;  ) > 2.8.1cvs36.patchset
index 19a1ee99699aeac9d1ee06affde8a4fd71fcf45e..990e539f6b75176bfe5eff0ed52f8a7553ef9de5 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=35
+EXTRA_VERSION=36
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 8a07661ff6225e2f695b085a1d591f9975583277..772a1297272cb32a2ef52bad35a85817f01e2688 100644 (file)
@@ -2195,7 +2195,7 @@ gboolean is_file_entry_exist(const gchar *file)
 
 gboolean dirent_is_regular_file(struct dirent *d)
 {
-#ifdef HAVE_DIRENT_D_TYPE
+#if !defined(G_OS_WIN32) && !defined(MAEMO) && defined(HAVE_DIRENT_D_TYPE)
        if (d->d_type == DT_REG)
                return TRUE;
        else if (d->d_type != DT_UNKNOWN)
@@ -2207,7 +2207,7 @@ gboolean dirent_is_regular_file(struct dirent *d)
 
 gboolean dirent_is_directory(struct dirent *d)
 {
-#ifdef HAVE_DIRENT_D_TYPE
+#if !defined(G_OS_WIN32) && !defined(MAEMO) && defined(HAVE_DIRENT_D_TYPE)
        if (d->d_type == DT_DIR)
                return TRUE;
        else if (d->d_type != DT_UNKNOWN)
index 65e82dde1cd109b5a3eb173cca94d3936818e8f1..6a774c85fa89c096186dbf5319e71355686e2330 100644 (file)
@@ -70,6 +70,7 @@ AM_CPPFLAGS = \
        $(OPENSSL_CFLAGS) \
        $(ASPELL_CFLAGS) \
        $(GNOMEPRINT_CFLAGS) \
+       $(MAEMO_CFLAGS) \
        -DPLUGINDIR=\"$(PLUGINDIR)\" \
        -DDOCDIR=\"$(DOCDIR)\" 
 
@@ -77,7 +78,8 @@ libclawsgtk_la_LIBADD = \
        ../common/libclawscommon.la \
        $(GTK_LIBS) \
        $(ASPELL_LIBS) \
-       $(GNOMEPRINT_LIBS)
+       $(GNOMEPRINT_LIBS) \
+       $(MAEMO_LIBS)
 
 BUILT_SOURCES=claws-marshal.c claws-marshal.h 
 
index d77eb5d42aee6ccd56cd848a68151d60f0523a26..67f2f4249467c7c93c7f4e2e15df0e028eaeaccc 100644 (file)
@@ -565,7 +565,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/Layout/_Three columns"),    NULL, set_layout_cb, VERTICAL_LAYOUT, "/View/Layout/Standard"},
        {N_("/_View/Layout/_Wide message"),     NULL, set_layout_cb, WIDE_LAYOUT, "/View/Layout/Standard"},
        {N_("/_View/Layout/W_ide message list"),NULL, set_layout_cb, WIDE_MSGLIST_LAYOUT, "/View/Layout/Standard"},
-       {N_("/_View/Layout/_Little screen"),    NULL, set_layout_cb, LITTLE_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>"},
        {N_("/_View/_Sort"),                    NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Sort/by _number"),         NULL, sort_summary_cb, SORT_BY_NUMBER, "<RadioItem>"},
@@ -1472,7 +1472,7 @@ MainWindow *main_window_create()
        gtk_widget_add_events(GTK_WIDGET(window), GDK_VISIBILITY_NOTIFY_MASK);
 
        if (prefs_common.layout_mode == VERTICAL_LAYOUT ||
-           prefs_common.layout_mode == LITTLE_LAYOUT) {
+           prefs_common.layout_mode == SMALL_LAYOUT) {
                summary_relayout(mainwin->summaryview); 
        }
 
@@ -1972,7 +1972,7 @@ void main_window_toggle_message_view(MainWindow *mainwin)
        switch (prefs_common.layout_mode) {
        case NORMAL_LAYOUT:
        case VERTICAL_LAYOUT:
-       case LITTLE_LAYOUT:
+       case SMALL_LAYOUT:
                ppaned = mainwin->vpaned;
                container = mainwin->hpaned;
                if (ppaned->parent != NULL) {
@@ -2693,7 +2693,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
        gboolean first_set = (mainwin->hpaned == NULL);
        debug_print("Setting widgets... ");
 
-       if (layout_mode == LITTLE_LAYOUT && first_set) {
+       if (layout_mode == SMALL_LAYOUT && first_set) {
                gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->folderview),
                                    prefs_common.folderview_width,
                                    prefs_common.folderview_height);
@@ -2725,11 +2725,11 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
        }
 
        menu_set_sensitive(ifactory, "/View/Show or hide/Message view", 
-               (layout_mode != WIDE_MSGLIST_LAYOUT && layout_mode != LITTLE_LAYOUT));
+               (layout_mode != WIDE_MSGLIST_LAYOUT && layout_mode != SMALL_LAYOUT));
        switch (layout_mode) {
        case VERTICAL_LAYOUT:
        case NORMAL_LAYOUT:
-       case LITTLE_LAYOUT:
+       case SMALL_LAYOUT:
                hpaned = gtk_hpaned_new();
                if (layout_mode == VERTICAL_LAYOUT)
                        vpaned = gtk_hpaned_new();
@@ -2753,7 +2753,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
                gtk_paned_add2(GTK_PANED(vpaned),
                               GTK_WIDGET_PTR(mainwin->messageview));
                gtk_widget_show(vpaned);
-               if (layout_mode == LITTLE_LAYOUT && first_set) {
+               if (layout_mode == SMALL_LAYOUT && first_set) {
                        mainwin_paned_show_first(GTK_PANED(hpaned));
                }
                gtk_widget_queue_resize(vpaned);
@@ -2813,12 +2813,12 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
        mainwin->hpaned = hpaned;
        mainwin->vpaned = vpaned;
 
-       if (layout_mode == LITTLE_LAYOUT) {
+       if (layout_mode == SMALL_LAYOUT) {
                if (mainwin->messageview->visible)
                        main_window_toggle_message_view(mainwin);
        } 
 
-       if (layout_mode == LITTLE_LAYOUT && first_set) {
+       if (layout_mode == SMALL_LAYOUT && first_set) {
                gtk_widget_realize(mainwin->window);
                gtk_widget_realize(mainwin->folderview->ctree);
                gtk_widget_realize(mainwin->summaryview->hbox);
@@ -2891,8 +2891,8 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
        case WIDE_MSGLIST_LAYOUT:
                SET_CHECK_MENU_ACTIVE("/View/Layout/Wide message list", TRUE);
                break;
-       case LITTLE_LAYOUT:
-               SET_CHECK_MENU_ACTIVE("/View/Layout/Little screen", TRUE);
+       case SMALL_LAYOUT:
+               SET_CHECK_MENU_ACTIVE("/View/Layout/Small screen", TRUE);
                break;
        }
 #undef SET_CHECK_MENU_ACTIVE
@@ -3154,17 +3154,17 @@ static void set_layout_cb(MainWindow *mainwin, guint action,
                return;
        }
        
-       if (!mainwin->messageview->visible && layout_mode != LITTLE_LAYOUT)
+       if (!mainwin->messageview->visible && layout_mode != SMALL_LAYOUT)
                main_window_toggle_message_view(mainwin);
-       else if (mainwin->messageview->visible && layout_mode == LITTLE_LAYOUT)
+       else if (mainwin->messageview->visible && layout_mode == SMALL_LAYOUT)
                main_window_toggle_message_view(mainwin);
 
        main_window_separation_change(mainwin, layout_mode);
        mainwindow_reset_paned(GTK_PANED(mainwin->vpaned));
-       if (old_layout_mode == LITTLE_LAYOUT && layout_mode != LITTLE_LAYOUT) {
+       if (old_layout_mode == SMALL_LAYOUT && layout_mode != SMALL_LAYOUT) {
                mainwindow_reset_paned(GTK_PANED(mainwin->hpaned));
        }
-       if (old_layout_mode != LITTLE_LAYOUT && layout_mode == LITTLE_LAYOUT) {
+       if (old_layout_mode != SMALL_LAYOUT && layout_mode == SMALL_LAYOUT) {
                mainwin_paned_show_first(GTK_PANED(mainwin->hpaned));
                mainwindow_exit_folder(mainwin);
        }
@@ -4129,7 +4129,7 @@ void mainwindow_jump_to(const gchar *target)
 }
 
 void mainwindow_exit_folder(MainWindow *mainwin) {
-       if (prefs_common.layout_mode == LITTLE_LAYOUT) {
+       if (prefs_common.layout_mode == SMALL_LAYOUT) {
                folderview_close_opened(mainwin->folderview);
                mainwin_paned_show_first(GTK_PANED(mainwin->hpaned));
                mainwin->in_folder = FALSE;
@@ -4137,7 +4137,7 @@ void mainwindow_exit_folder(MainWindow *mainwin) {
 }
 
 void mainwindow_enter_folder(MainWindow *mainwin) {
-       if (prefs_common.layout_mode == LITTLE_LAYOUT) {
+       if (prefs_common.layout_mode == SMALL_LAYOUT) {
                mainwin_paned_show_last(GTK_PANED(mainwin->hpaned));
                mainwin->in_folder = TRUE;
        }
index 7f035082c6dbc6e463119f2a9191ebc00c73734b..e3c0184bef8be9ab9e774c17ff247469e00bc58c 100644 (file)
@@ -66,7 +66,7 @@ typedef enum
        VERTICAL_LAYOUT  = 1 << 0,
        WIDE_LAYOUT = 1 << 1,
        WIDE_MSGLIST_LAYOUT = 1 << 2,
-       LITTLE_LAYOUT
+       SMALL_LAYOUT
 } LayoutType;
 
 typedef enum
index f608fa3a990840307764b4b984482e45e168d266..1c39984230f1aa3b46f4a9527109317a2d38a158 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -1055,12 +1055,12 @@ static void mh_scan_tree_recursive(FolderItem *item)
                entry = mh_filename_from_utf8(utf8entry);
 
                if (
-#if !defined(G_OS_WIN32) && defined(HAVE_DIRENT_D_TYPE)
+#if !defined(G_OS_WIN32) && !defined(MAEMO) && defined(HAVE_DIRENT_D_TYPE)
                        d->d_type == DT_DIR ||
                        (d->d_type == DT_UNKNOWN &&
 #endif
                        g_stat(entry, &s) == 0 && S_ISDIR(s.st_mode)
-#if !defined(G_OS_WIN32) && defined(HAVE_DIRENT_D_TYPE)
+#if !defined(G_OS_WIN32) && !defined(MAEMO) && defined(HAVE_DIRENT_D_TYPE)
                        )
 #endif
                   ) {
index 80ee3de774cccf27f766a0feb05ca9bc3ababa5f..46ee482af5eb515b0f492084e875a1d65955d9e0 100644 (file)
@@ -724,7 +724,7 @@ SummaryView *summary_create(void)
                quicksearch_hide(quicksearch);
        
        if (prefs_common.layout_mode == WIDE_MSGLIST_LAYOUT ||
-           prefs_common.layout_mode == LITTLE_LAYOUT)
+           prefs_common.layout_mode == SMALL_LAYOUT)
                gtk_widget_hide(summaryview->toggle_eventbox);
 
        return summaryview;
@@ -749,18 +749,18 @@ void summary_relayout(SummaryView *summaryview)
                gtk_widget_show_all(summaryview->stat_box);
                gtk_widget_show_all(summaryview->stat_box2);
                if (prefs_common.layout_mode == WIDE_MSGLIST_LAYOUT ||
-                   prefs_common.layout_mode == LITTLE_LAYOUT)
+                   prefs_common.layout_mode == SMALL_LAYOUT)
                        gtk_widget_hide(summaryview->toggle_eventbox);
                else
                        gtk_widget_show(summaryview->toggle_eventbox);
                break;
        case VERTICAL_LAYOUT:
-       case LITTLE_LAYOUT:
+       case SMALL_LAYOUT:
                gtk_box_pack_start(GTK_BOX(summaryview->stat_box), summaryview->hbox_l, TRUE, TRUE, 0);
                gtk_box_pack_start(GTK_BOX(summaryview->stat_box2), summaryview->statlabel_msgs, FALSE, FALSE, 4);
                gtk_widget_show_all(summaryview->stat_box);
                gtk_widget_show_all(summaryview->stat_box2);
-               if (prefs_common.layout_mode == LITTLE_LAYOUT)
+               if (prefs_common.layout_mode == SMALL_LAYOUT)
                        gtk_widget_hide(summaryview->toggle_eventbox);
                else
                        gtk_widget_show(summaryview->toggle_eventbox);
@@ -1030,7 +1030,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        if (!is_refresh) {
                main_create_mailing_list_menu (summaryview->mainwin, NULL);
-               if (prefs_common.layout_mode == LITTLE_LAYOUT) {
+               if (prefs_common.layout_mode == SMALL_LAYOUT) {
                        if (item) {
                                mainwindow_enter_folder(summaryview->mainwin);
                                gtk_widget_grab_focus(summaryview->ctree);
@@ -3057,7 +3057,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
        
        g_return_if_fail(msginfo);
 
-       if (new_window && prefs_common.layout_mode != LITTLE_LAYOUT) {
+       if (new_window && prefs_common.layout_mode != SMALL_LAYOUT) {
                MessageView *msgview;
 
                msgview = messageview_create_with_new_window(summaryview->mainwin);
@@ -3065,7 +3065,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
        } else {
                MessageView *msgview;
 
-               if (prefs_common.layout_mode == LITTLE_LAYOUT) {
+               if (prefs_common.layout_mode == SMALL_LAYOUT) {
                        if (summaryview->ext_messageview == NULL)
                                summaryview->ext_messageview = messageview_create_with_new_window(summaryview->mainwin);
                        else
@@ -3230,7 +3230,7 @@ gboolean summary_step(SummaryView *summaryview, GtkScrollType type)
 
 void summary_toggle_view(SummaryView *summaryview)
 {
-       if (prefs_common.layout_mode == LITTLE_LAYOUT)
+       if (prefs_common.layout_mode == SMALL_LAYOUT)
                return;
        if (!messageview_is_visible(summaryview->messageview) &&
            summaryview->selected)
@@ -5899,7 +5899,7 @@ static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
        context = gtk_drag_begin(widget, summaryview->target_list,
                                 GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
        gtk_drag_set_icon_default(context);
-       if (prefs_common.layout_mode == LITTLE_LAYOUT) {
+       if (prefs_common.layout_mode == SMALL_LAYOUT) {
                gint min, max, mid;
                GtkWidget *paned = GTK_WIDGET_PTR(summaryview)->parent;
                if (paned && GTK_IS_PANED(paned)) {
@@ -5919,7 +5919,7 @@ static void summary_drag_end         (GtkWidget       *widget,
                                   GdkDragContext   *drag_context,
                                    SummaryView             *summaryview)
 {
-       if (prefs_common.layout_mode == LITTLE_LAYOUT) {
+       if (prefs_common.layout_mode == SMALL_LAYOUT) {
                g_timeout_add(250, summary_return_to_list, summaryview);
        }
 }
@@ -6465,7 +6465,7 @@ static gboolean summary_update_msg(gpointer source, gpointer data)
 static void summary_update_unread(SummaryView *summaryview, FolderItem *removed_item)
 {
        guint new, unread, unreadmarked, marked, total;
-       if (prefs_common.layout_mode != LITTLE_LAYOUT)
+       if (prefs_common.layout_mode != SMALL_LAYOUT)
                return;
        folder_count_total_msgs(&new, &unread, &unreadmarked, &marked, &total);
        if (removed_item) {