2008-05-07 [colin] 3.4.0cvs28
authorColin Leroy <colin@colino.net>
Wed, 7 May 2008 08:18:24 +0000 (08:18 +0000)
committerColin Leroy <colin@colino.net>
Wed, 7 May 2008 08:18:24 +0000 (08:18 +0000)
* configure.ac
* src/account.c
* src/addr_compl.c
* src/compose.c
* src/editaddress.c
* src/folderview.c
* src/mainwindow.c
* src/messageview.c
* src/mimeview.c
* src/prefs_account.c
* src/prefs_common.c
* src/prefs_display_header.c
* src/prefs_filtering.c
* src/prefs_summaries.c
* src/prefs_template.c
* src/prefs_toolbar.c
* src/stock_pixmap.c
* src/summaryview.c
* src/summaryview.h
* src/textview.c
* src/toolbar.c
* src/gtk/about.c
* src/gtk/gtksctree.c
* src/gtk/menu.c
* src/gtk/prefswindow.c
* src/gtk/sslcertwindow.c
Separate generic UMPC code (layouts, ...) from
MAEMO code (Hildon, ...)

28 files changed:
ChangeLog
PATCHSETS
configure.ac
src/account.c
src/addr_compl.c
src/compose.c
src/editaddress.c
src/folderview.c
src/gtk/about.c
src/gtk/gtksctree.c
src/gtk/menu.c
src/gtk/prefswindow.c
src/gtk/sslcertwindow.c
src/mainwindow.c
src/messageview.c
src/mimeview.c
src/prefs_account.c
src/prefs_common.c
src/prefs_display_header.c
src/prefs_filtering.c
src/prefs_summaries.c
src/prefs_template.c
src/prefs_toolbar.c
src/stock_pixmap.c
src/summaryview.c
src/summaryview.h
src/textview.c
src/toolbar.c

index 7b8e65e..d13ccd2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2008-05-07 [colin]     3.4.0cvs28
+
+       * configure.ac
+       * src/account.c
+       * src/addr_compl.c
+       * src/compose.c
+       * src/editaddress.c
+       * src/folderview.c
+       * src/mainwindow.c
+       * src/messageview.c
+       * src/mimeview.c
+       * src/prefs_account.c
+       * src/prefs_common.c
+       * src/prefs_display_header.c
+       * src/prefs_filtering.c
+       * src/prefs_summaries.c
+       * src/prefs_template.c
+       * src/prefs_toolbar.c
+       * src/stock_pixmap.c
+       * src/summaryview.c
+       * src/summaryview.h
+       * src/textview.c
+       * src/toolbar.c
+       * src/gtk/about.c
+       * src/gtk/gtksctree.c
+       * src/gtk/menu.c
+       * src/gtk/prefswindow.c
+       * src/gtk/sslcertwindow.c
+               Separate generic UMPC code (layouts, ...) from 
+               MAEMO code (Hildon, ...)
+
 2008-05-06 [paul]      3.4.0cvs27
 
        * tools/claws.i18n.status.pl
index 4004243..7fdf940 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.94.2.175 -r 1.94.2.176 src/messageview.c;  ) > 3.4.0cvs25.patchset
 ( cvs diff -u -r 1.36.2.138 -r 1.36.2.139 src/common/utils.c;  ) > 3.4.0cvs26.patchset
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 tools/claws.i18n.status.pl;  ) > 3.4.0cvs27.patchset
+( cvs diff -u -r 1.654.2.3384 -r 1.654.2.3385 configure.ac;  cvs diff -u -r 1.61.2.78 -r 1.61.2.79 src/account.c;  cvs diff -u -r 1.27.2.40 -r 1.27.2.41 src/addr_compl.c;  cvs diff -u -r 1.382.2.447 -r 1.382.2.448 src/compose.c;  cvs diff -u -r 1.14.2.49 -r 1.14.2.50 src/editaddress.c;  cvs diff -u -r 1.207.2.199 -r 1.207.2.200 src/folderview.c;  cvs diff -u -r 1.274.2.239 -r 1.274.2.240 src/mainwindow.c;  cvs diff -u -r 1.94.2.176 -r 1.94.2.177 src/messageview.c;  cvs diff -u -r 1.83.2.129 -r 1.83.2.130 src/mimeview.c;  cvs diff -u -r 1.105.2.130 -r 1.105.2.131 src/prefs_account.c;  cvs diff -u -r 1.204.2.168 -r 1.204.2.169 src/prefs_common.c;  cvs diff -u -r 1.16.2.34 -r 1.16.2.35 src/prefs_display_header.c;  cvs diff -u -r 1.59.2.67 -r 1.59.2.68 src/prefs_filtering.c;  cvs diff -u -r 1.1.2.51 -r 1.1.2.52 src/prefs_summaries.c;  cvs diff -u -r 1.12.2.62 -r 1.12.2.63 src/prefs_template.c;  cvs diff -u -r 1.30.2.49 -r 1.30.2.50 src/prefs_toolbar.c;  cvs diff -u -r 1.25.2.53 -r 1.25.2.54 src/stock_pixmap.c;  cvs diff -u -r 1.395.2.366 -r 1.395.2.367 src/summaryview.c;  cvs diff -u -r 1.68.2.45 -r 1.68.2.46 src/summaryview.h;  cvs diff -u -r 1.96.2.200 -r 1.96.2.201 src/textview.c;  cvs diff -u -r 1.43.2.97 -r 1.43.2.98 src/toolbar.c;  cvs diff -u -r 1.4.2.61 -r 1.4.2.62 src/gtk/about.c;  cvs diff -u -r 1.1.4.43 -r 1.1.4.44 src/gtk/gtksctree.c;  cvs diff -u -r 1.5.2.27 -r 1.5.2.28 src/gtk/menu.c;  cvs diff -u -r 1.12.2.45 -r 1.12.2.46 src/gtk/prefswindow.c;  cvs diff -u -r 1.9.2.19 -r 1.9.2.20 src/gtk/sslcertwindow.c;  ) > 3.4.0cvs28.patchset
index 70ee441..f4374ee 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=27
+EXTRA_VERSION=28
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -502,11 +502,23 @@ if test $ac_cv_enable_maemo = yes; then
                else
                        AC_DEFINE(MAEMO, 1, Build for maemo)
                        AC_DEFINE(CHINOOK, 1, Maemo chinook)
+                       ac_cv_enable_generic_umpc=yes
                fi
        else
                AC_DEFINE(MAEMO, 1, Build for maemo)
+               ac_cv_enable_generic_umpc=yes
        fi
 fi
+
+dnl generic umpc
+AC_ARG_ENABLE(generic-umpc,
+       [  --enable-generic-umpc   Enable generic UMPC code [default=no]],
+       [ac_cv_enable_generic_umpc=$enableval], [ac_cv_enable_generic_umpc=no])
+if test $ac_cv_enable_generic_umpc = yes; then
+       AC_DEFINE(GENERIC_UMPC, 1, Generic UMPC code)
+       AC_MSG_RESULT($ac_cv_enable_generic_umpc)
+fi
+
 PKG_CHECK_MODULES(CONIC, conic, ac_cv_enable_conic=yes,
          ac_cv_enable_conic=no)
 AC_SUBST(CONIC_CFLAGS)
@@ -1033,6 +1045,7 @@ echo "LibSM             : $ac_cv_enable_libsm"
 echo "NetworkManager    : $enable_networkmanager_support"
 echo "Manual            : $ac_cv_enable_manual"
 echo "Plugins           : $PLUGINS"
+echo "Generic UMPC code : $ac_cv_enable_generic_umpc"
 echo "Maemo  build      : $ac_cv_enable_maemo"
 echo "Config dir        : $ac_cv_with_config_dir"
 echo ""
index 84fd099..15a81e7 100644 (file)
@@ -1464,7 +1464,7 @@ static GtkWidget *account_list_view_create(void)
 
        list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)));
        g_object_unref(G_OBJECT(store));
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        g_object_set(list_view, "allow-checkbox-mode", FALSE, NULL);
 #endif
        gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
index 877c49a..de71e4f 100644 (file)
@@ -929,7 +929,7 @@ static void addrcompl_add_entry( CompletionWindow *cw, gchar *address ) {
                /* Select first row for now */
                gtk_tree_selection_select_iter(selection, &iter);
        }
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        else if( cw->listCount == 2 ) {
                gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
                /* Move off first row */
@@ -1290,7 +1290,7 @@ static gboolean address_completion_complete_address_in_entry(GtkEntry *entry,
                new = get_next_complete_address();
                g_free( new );
        }
-#if (!defined(USE_LDAP) && !defined(MAEMO))
+#if (!defined(USE_LDAP) && !defined(GENERIC_UMPC))
        /* Select the address if there is only one match */
        if (ncount == 2) {
                /* Display selected address in entry field */           
index 102f589..37ca887 100644 (file)
@@ -4422,7 +4422,7 @@ static void compose_set_title(Compose *compose)
        subject = gtk_editable_get_chars(
                        GTK_EDITABLE(compose->subject_entry), 0, -1);
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        if (subject && strlen(subject))
                str = g_strdup_printf(_("%s - Compose message%s"),
                                      subject, edited); 
@@ -6762,7 +6762,7 @@ static Compose *compose_create(PrefsAccount *account,
        gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
                                      &geometry, GDK_HINT_MIN_SIZE);
 
-#ifndef MAEMO  
+#ifndef GENERIC_UMPC   
        if (compose_force_window_origin)
                gtk_widget_set_uposition(window, prefs_common.compose_x, 
                                 prefs_common.compose_y);
@@ -9281,7 +9281,7 @@ static void entry_allsel(GtkWidget *entry)
 static void compose_cut_cb(Compose *compose)
 {
        if (compose->focused_editable 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
            && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
 #endif
            )
@@ -9291,7 +9291,7 @@ static void compose_cut_cb(Compose *compose)
 static void compose_copy_cb(Compose *compose)
 {
        if (compose->focused_editable 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
            && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
 #endif
            )
@@ -9315,7 +9315,7 @@ static void compose_paste_as_quote_cb(Compose *compose)
 {
        gint wrap_quote = prefs_common.linewrap_quote;
        if (compose->focused_editable 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
            && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
 #endif
            ) {
@@ -9343,7 +9343,7 @@ static void compose_paste_no_wrap_cb(Compose *compose)
        GtkTextBuffer *buffer;
        BLOCK_WRAP();
        if (compose->focused_editable 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
            && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
 #endif
            )
@@ -9358,7 +9358,7 @@ static void compose_paste_wrap_cb(Compose *compose)
        GtkTextBuffer *buffer;
        BLOCK_WRAP();
        if (compose->focused_editable 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
            && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
 #endif
            )
@@ -9370,7 +9370,7 @@ static void compose_paste_wrap_cb(Compose *compose)
 static void compose_allsel_cb(Compose *compose)
 {
        if (compose->focused_editable 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
            && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
 #endif
            )
@@ -9693,7 +9693,7 @@ static void compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
        if (GTK_IS_EDITABLE(widget) || GTK_IS_TEXT_VIEW(widget))
                compose->focused_editable = widget;
        
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        if (GTK_IS_TEXT_VIEW(widget) 
            && gtk_paned_get_child1(GTK_PANED(compose->paned)) != compose->edit_vbox) {
                gtk_widget_ref(compose->notebook);
@@ -9735,7 +9735,7 @@ static void compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
 static void compose_changed_cb(GtkTextBuffer *textbuf, Compose *compose)
 {
        compose->modified = TRUE;
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        compose_set_title(compose);
 #endif
 }
index f11537e..a23a638 100644 (file)
@@ -70,7 +70,7 @@ typedef enum {
 #define EDITPERSON_WIDTH      520
 #define EDITPERSON_HEIGHT     320
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 # define EMAIL_N_COLS          3
 # define EMAIL_COL_WIDTH_EMAIL 180
 # define EMAIL_COL_WIDTH_ALIAS 80
@@ -80,7 +80,7 @@ typedef enum {
 # define EMAIL_COL_WIDTH_ALIAS 130
 #endif
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 # define ATTRIB_N_COLS          2
 # define ATTRIB_COL_WIDTH_NAME  240
 # define ATTRIB_COL_WIDTH_VALUE 0
@@ -102,7 +102,7 @@ static gchar* edit_person_get_common_name_from_widgets(void)
 {
        gchar *cn = NULL; /* cn must be freed by caller */
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {
                cn = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_name), 0, -1 );
                if ( cn == NULL || *cn == '\0' ) {
@@ -157,7 +157,7 @@ static void edit_person_ok(GtkWidget *widget, gboolean *cancelled) {
                gint val;
 
                val = alertpanel( _("Add New Person"),
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                                _("Adding a new person requires at least one of the\n"
                                  "following values to be set:\n"
                                  " - Display Name\n"
@@ -304,7 +304,7 @@ static void edit_person_load_email( ItemPerson *person ) {
                ItemEMail *email = addritem_copyfull_item_email( emorig );
                gint row;
                text[ EMAIL_COL_EMAIL   ] = email->address;
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                text[ EMAIL_COL_ALIAS   ] = email->obj.name;
                text[ EMAIL_COL_REMARKS ] = email->remarks;
 #endif
@@ -448,7 +448,7 @@ static void edit_person_email_add( gpointer data ) {
        if( ! errFlg ) {
                gchar *text[ EMAIL_N_COLS ];
                text[ EMAIL_COL_EMAIL   ] = email->address;
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                text[ EMAIL_COL_ALIAS   ] = email->obj.name;
                text[ EMAIL_COL_REMARKS ] = email->remarks;
 #endif
@@ -955,7 +955,7 @@ static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) {
        entry = gtk_entry_new(); \
 }
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        ATTACH_ROW(_("Display Name"), entry_name);
 #else
        ATTACH_HIDDEN_ROW(_("Display Name"), entry_name);
@@ -971,7 +971,7 @@ static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) {
                ATTACH_ROW(_("First Name"), entry_fn);
                ATTACH_ROW(_("Last Name"), entry_ln);
        }
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        ATTACH_ROW(_("Nickname"), entry_nn);
 #else
        ATTACH_HIDDEN_ROW(_("Nickname"), entry_nn);
@@ -1057,7 +1057,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
        gint i;
 
        titles[ EMAIL_COL_EMAIL   ] = _("Email Address");
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        titles[ EMAIL_COL_ALIAS   ] = _("Alias");
        titles[ EMAIL_COL_REMARKS ] = _("Remarks");
 #endif
@@ -1099,7 +1099,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
        /* Data entry area */
        table = gtk_table_new( 4, 2, FALSE);
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        gtk_container_add( GTK_CONTAINER(vboxl), clist_swin );
        gtk_box_pack_start(GTK_BOX(vboxl), table, FALSE, FALSE, 0);
 #else
@@ -1123,7 +1123,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
 
        gtk_table_attach(GTK_TABLE(table), entry_email, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        /* Next row */
        ++top;
        label = gtk_label_new(_("Alias"));
@@ -1159,7 +1159,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
        buttonAdd = gtk_button_new_from_stock(GTK_STOCK_ADD);
        
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonUp );
 
        gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonDown );
@@ -1307,7 +1307,7 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button, GTK_CAN_FOCUS);
 
        /* Data entry area */
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        table = gtk_table_new( 4, 2, FALSE);
        gtk_container_add( GTK_CONTAINER(vboxl), clist_swin );
        gtk_box_pack_start(GTK_BOX(vboxl), table, FALSE, FALSE, 0);
@@ -1323,7 +1323,7 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
 
        /* First row */
        top = 0;
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        label = gtk_label_new(_("Name"));
        gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
index 9edf583..70e1bf7 100644 (file)
@@ -263,7 +263,7 @@ static void folderview_drag_received_cb  (GtkWidget        *widget,
                                          guint             info,
                                          guint             time,
                                          FolderView       *folderview);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static void folderview_start_drag       (GtkWidget *widget, gint button, GdkEvent *event,
                                          FolderView       *folderview);
 #endif
@@ -429,7 +429,7 @@ static void folderview_column_set_titles(FolderView *folderview)
        gtk_widget_show_all(hbox_unread);
        gtk_widget_show_all(hbox_total);
 
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        gtk_widget_set_size_request(hbox_new, -1, 20);
        gtk_widget_set_size_request(hbox_unread, -1, 20);
        gtk_widget_set_size_request(hbox_total, -1, 20);
@@ -440,7 +440,7 @@ static void folderview_column_set_titles(FolderView *folderview)
        gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_UNREAD],hbox_unread);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_TOTAL],hbox_total);
 
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        GTK_EVENTS_FLUSH();
 #endif
 
@@ -558,7 +558,7 @@ static GtkWidget *folderview_ctree_create(FolderView *folderview)
                         folderview);
        g_signal_connect(G_OBJECT(ctree), "tree_select_row",
                         G_CALLBACK(folderview_selected), folderview);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        /* drag-n-dropping folders on maemo is impractical as this 
         * opens the folder almost everytime */
        g_signal_connect(G_OBJECT(ctree), "start_drag",
@@ -2080,7 +2080,7 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
        switch (event->keyval) {
        case GDK_Right:
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        case GDK_Return:
        case GDK_KP_Enter:
 #endif
@@ -2089,7 +2089,7 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                               folderview->selected);
                }
                break;
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        case GDK_Return:
                if (folderview->selected && GTK_CTREE_ROW(folderview->selected)->children) {
                        gtk_ctree_toggle_expansion(
@@ -2811,7 +2811,7 @@ static void drag_state_start(FolderView *folderview, GtkCTreeNode *node, FolderI
                folderview->drag_item = item;
        }                        
 }
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static void folderview_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
                                  FolderView       *folderview)
 {
index 61ab853..9d0cbf2 100644 (file)
@@ -156,7 +156,7 @@ static GtkWidget *about_create_child_page_info(void)
        gtk_text_buffer_create_tag(buffer, "underlined-list-title",
                                "underline", PANGO_UNDERLINE_SINGLE,
                                NULL);
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        gtk_text_buffer_insert(buffer, &iter, _(
                                "\n\nCopyright (C) 1999-2008\nHiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
                                "and the Claws Mail team"), -1);
@@ -752,7 +752,7 @@ static void about_create(void)
 
        button = gtkut_get_link_btn(window, HOMEPAGE_URI, " "HOMEPAGE_URI" ");
        gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        label = gtk_label_new
                (_("Copyright (C) 1999-2008\nHiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
                 "and the Claws Mail team"));
index 12e27b2..85f19d2 100644 (file)
@@ -1567,7 +1567,7 @@ sctree_is_hot_spot (GtkSCTree     *sctree,
      yu = (ROW_TOP_YPIXEL (clist, row) + (clist->row_height/2 - PM_SIZE) / 2 -
        (clist->row_height/2 - 1) % 2);
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
   if (clist->column[ctree->tree_column].justification == GTK_JUSTIFY_RIGHT)
     xl = (clist->column[ctree->tree_column].area.x + 
          clist->column[ctree->tree_column].area.width - 1 + clist->hoffset -
@@ -1798,7 +1798,7 @@ gtk_sctree_motion (GtkWidget *widget, GdkEventMotion *event)
 
        /* This is the same threshold value that is used in gtkdnd.c */
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 #define THRESHOLD 3
 #else
 #define THRESHOLD 8
index 5f67231..7039f93 100644 (file)
@@ -210,18 +210,18 @@ void menu_connect_identical_items(void)
                const gchar *path2;
        } pairs[] = {
                {"<Main>/Message/Reply",                        "<SummaryView>/Reply"},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                {"<Main>/Message/Reply to/all",                 "<SummaryView>/Reply to/all"},
                {"<Main>/Message/Reply to/sender",              "<SummaryView>/Reply to/sender"},
                {"<Main>/Message/Reply to/mailing list",        "<SummaryView>/Reply to/mailing list"},
 #endif
                {"<Main>/Message/Forward",                      "<SummaryView>/Forward"},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                {"<Main>/Message/Redirect",                     "<SummaryView>/Redirect"},
 #endif
                {"<Main>/Message/Move...",                      "<SummaryView>/Move..."},
                {"<Main>/Message/Copy...",                      "<SummaryView>/Copy..."},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                {"<Main>/Message/Delete...",                    "<SummaryView>/Delete..."},
 #endif
                {"<Main>/Message/Mark/Mark",                    "<SummaryView>/Mark/Mark"},
@@ -229,7 +229,7 @@ void menu_connect_identical_items(void)
                {"<Main>/Message/Mark/Mark as unread",          "<SummaryView>/Mark/Mark as unread"},
                {"<Main>/Message/Mark/Mark as read",            "<SummaryView>/Mark/Mark as read"},
                {"<Main>/Message/Mark/Mark all read",           "<SummaryView>/Mark/Mark all read"},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                {"<Main>/Tools/Add sender to address book",     "<SummaryView>/Add sender to address book"},
 #endif
                {"<Main>/Tools/Create filter rule/Automatically",       
@@ -237,7 +237,7 @@ void menu_connect_identical_items(void)
                {"<Main>/Tools/Create filter rule/by From",     "<SummaryView>/Create filter rule/by From"},
                {"<Main>/Tools/Create filter rule/by To",       "<SummaryView>/Create filter rule/by To"},
                {"<Main>/Tools/Create filter rule/by Subject",  "<SummaryView>/Create filter rule/by Subject"},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                {"<Main>/Tools/Create processing rule/Automatically",
                                                                "<SummaryView>/Create processing rule/Automatically"},
                {"<Main>/Tools/Create processing rule/by From", "<SummaryView>/Create processing rule/by From"},
@@ -247,7 +247,7 @@ void menu_connect_identical_items(void)
 #endif
                {"<Main>/View/Open in new window",              "<SummaryView>/View/Open in new window"},
                {"<Main>/View/Message source",                  "<SummaryView>/View/Message source"},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                {"<Main>/View/All headers",                     "<SummaryView>/View/All headers"},
 #endif
        };
index 2331cab..400763b 100644 (file)
@@ -132,7 +132,7 @@ static void close_all_pages(GSList *prefs_pages)
        }       
 }
 
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
 static void prefs_show_sections(PrefsWindow *prefswindow)
 {
        gint max;
@@ -167,7 +167,7 @@ static void apply_button_clicked(GtkButton *button, gpointer user_data)
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
        save_all_pages(prefswindow->prefs_pages);
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        prefs_show_sections(prefswindow);
 #endif
 }
@@ -209,7 +209,7 @@ static gboolean window_closed(GtkWidget *widget, GdkEvent *event, gpointer user_
 {
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        save_all_pages(prefswindow->prefs_pages);
 #endif
        close_prefs_window(prefswindow);
@@ -317,7 +317,7 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
                        (GTK_TREE_VIEW(tree_view)));
        GSList *cur;
        gint index; /* index in pages list */
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        GtkTreeSelection *selection;
        GtkTreeIter iter;
 #endif
@@ -399,7 +399,7 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
                prefswindow_build_all_pages(prefswindow, prefs_pages);
 
        /* select first one or its first child if necessary */
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
        if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) {
                if (activate_child && gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter)) {
@@ -518,7 +518,7 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
 
        gtk_widget_grab_focus(prefswindow->tree_view);
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        gtkut_stock_button_set_create(&prefswindow->confirm_area,
                                      &prefswindow->apply_btn,  GTK_STOCK_APPLY,
                                      &prefswindow->cancel_btn, GTK_STOCK_CANCEL,
@@ -536,7 +536,7 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
 
        gtk_box_pack_start(GTK_BOX(prefswindow->vbox), prefswindow->confirm_area, FALSE, FALSE, 0);
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        g_signal_connect(G_OBJECT(prefswindow->ok_btn), "clicked", 
                         G_CALLBACK(ok_button_clicked), prefswindow);
        g_signal_connect(G_OBJECT(prefswindow->cancel_btn), "clicked", 
@@ -583,7 +583,7 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
                                            *(prefswindow->save_height));
        }
 
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        prefs_show_sections(prefswindow);
 #endif
        gtk_widget_show(prefswindow->window);
@@ -691,7 +691,7 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
        GtkTreeIter iter;
        GtkAdjustment *adj;
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        if (currently_selected) 
                return TRUE;
 #endif
@@ -739,7 +739,7 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
        gtk_adjustment_set_value(adj, adj->lower);
        gtk_adjustment_changed(adj);
 
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        prefs_show_page(prefswindow);
 #endif
        return TRUE;
index 83b0ba3..169acb1 100644 (file)
@@ -197,7 +197,7 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
 
        memset(buf, 0, sizeof(buf));
        strftime(buf, sizeof(buf)-1, prefs_common.date_format, localtime_r(&exp_time_t, &lt));
-       exp_date = buf? g_strdup(buf):g_strdup("?");
+       exp_date = (*buf) ? g_strdup(buf):g_strdup("?");
 
        /* fingerprint */
 #if USE_OPENSSL
index 1025a2d..849591c 100644 (file)
@@ -114,7 +114,7 @@ static void main_window_menu_callback_block (MainWindow     *mainwin);
 static void main_window_menu_callback_unblock  (MainWindow     *mainwin);
 
 static void main_window_show_cur_account       (MainWindow     *mainwin);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static void main_window_separation_change      (MainWindow     *mainwin,
                                                 LayoutType      layout_mode);
 #endif
@@ -127,7 +127,7 @@ static void toolbar_child_attached          (GtkWidget      *widget,
 static void toolbar_child_detached             (GtkWidget      *widget,
                                                 GtkWidget      *child,
                                                 gpointer        data);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static gboolean ac_label_button_pressed                (GtkWidget      *widget,
                                                 GdkEventButton *event,
                                                 gpointer        data);
@@ -197,7 +197,7 @@ static void toggle_toolbar_cb        (MainWindow    *mainwin,
 static void toggle_col_headers_cb(MainWindow   *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static void toggle_statusbar_cb         (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -461,7 +461,7 @@ static void account_selector_menu_cb         (GtkMenuItem   *menuitem,
                                          gpointer       data);
 static void account_receive_menu_cb     (GtkMenuItem   *menuitem,
                                          gpointer       data);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static void account_compose_menu_cb     (GtkMenuItem   *menuitem,
                                          gpointer       data);
 #endif
@@ -577,13 +577,13 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Show or hide/Toolbar/Text below icons"},
        {N_("/_View/Show or hi_de/_Toolbar/_Text only"),
                                                NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Show or hide/Toolbar/Text below icons"},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {N_("/_View/Show or hi_de/_Toolbar/_Hide"),
                                                NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/Toolbar/Text below icons"},
 #endif
        {N_("/_View/Show or hi_de/_Message view"),
                                                "V", toggle_message_cb, 0, "<ToggleItem>"},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {N_("/_View/Show or hi_de/Status _bar"),
                                                NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
 #endif
@@ -594,7 +594,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
+#ifndef GENERIC_UMPC
        {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"},
@@ -1309,7 +1309,7 @@ static void mainwindow_tags_menu_create(MainWindow *mainwin, gboolean refresh)
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menuitem), menu);
        mainwin->tags_menu = menu;
 }
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static gboolean warning_icon_pressed(GtkWidget *widget, GdkEventButton *evt,
                                    MainWindow *mainwindow)
 {
@@ -1515,7 +1515,7 @@ MainWindow *main_window_create()
        GtkWidget *menubar;
        GtkWidget *handlebox;
        GtkWidget *vbox_body;
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        GtkWidget *hbox_stat;
        GtkWidget *statusbar;
        GtkWidget *progressbar;
@@ -1551,7 +1551,7 @@ MainWindow *main_window_create()
        window = GTK_WIDGET(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
+#ifdef GENERIC_UMPC
        prefs_common.layout_mode = SMALL_LAYOUT;
 #endif
        if (!geometry.min_height) {
@@ -1631,7 +1631,7 @@ MainWindow *main_window_create()
        gtk_container_set_border_width(GTK_CONTAINER(vbox_body), BORDER_WIDTH);
        gtk_box_pack_start(GTK_BOX(vbox), vbox_body, TRUE, TRUE, 0);
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        hbox_stat = gtk_hbox_new(FALSE, 2);
        gtk_box_pack_end(GTK_BOX(vbox_body), hbox_stat, FALSE, FALSE, 0);
 
@@ -1760,7 +1760,7 @@ MainWindow *main_window_create()
        mainwin->vbox_body      = vbox_body;
        mainwin->online_switch  = online_switch;
        mainwin->offline_switch    = offline_switch;
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        messageview->statusbar  = statusbar;
        mainwin->statusbar      = statusbar;
        mainwin->hbox_stat      = hbox_stat;
@@ -1861,7 +1861,7 @@ MainWindow *main_window_create()
        }
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        gtk_widget_hide(mainwin->hbox_stat);
        menuitem = gtk_item_factory_get_item
                (ifactory, "/View/Show or hide/Status bar");
@@ -1900,7 +1900,7 @@ MainWindow *main_window_create()
           menu items in different menus             */
        menu_connect_identical_items();
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        gtk_window_iconify(GTK_WINDOW(mainwin->window));
 #endif
 
@@ -2030,7 +2030,7 @@ static gboolean reflect_prefs_timeout_cb(gpointer data)
        gboolean pixmap_theme_changed = GPOINTER_TO_INT(data);
        GList *cur;
        MainWindow *mainwin;
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        GtkWidget *pixmap;
 #endif
        for (cur = mainwin_list; cur != NULL; cur = cur->next) {
@@ -2047,7 +2047,7 @@ static gboolean reflect_prefs_timeout_cb(gpointer data)
                        compose_reflect_prefs_pixmap_theme();
                        folderview_reflect_prefs_pixmap_theme(mainwin->folderview);
                        summary_reflect_prefs_pixmap_theme(mainwin->summaryview);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                        pixmap = stock_pixmap_widget(mainwin->hbox_stat, STOCK_PIXMAP_ONLINE);
                        gtk_container_remove(GTK_CONTAINER(mainwin->online_switch), 
                                             mainwin->online_pixmap);
@@ -2069,7 +2069,7 @@ static gboolean reflect_prefs_timeout_cb(gpointer data)
                textview_reflect_prefs(mainwin->messageview->mimeview->textview);
                folderview_reflect_prefs();
                summary_reflect_prefs();
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                summary_redisplay_msg(mainwin->summaryview);
 #endif
                if (prefs_common.layout_mode == SMALL_LAYOUT) {
@@ -2275,7 +2275,7 @@ static void main_window_set_toolbar_combo_receive_menu(MainWindow *mainwin,
 static void main_window_set_toolbar_combo_compose_menu(MainWindow *mainwin,
                                                       GList *account_list)
 {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        GList *cur_ac;
        GtkWidget *menuitem;
        PrefsAccount *ac_prefs;
@@ -2349,13 +2349,14 @@ static void main_window_show_cur_account(MainWindow *mainwin)
        gtk_window_set_title(GTK_WINDOW(mainwin->window), buf);
        g_free(buf);
 
-       gtk_label_set_text(GTK_LABEL(mainwin->ac_label), ac_name);
+       if (mainwin->ac_label)
+               gtk_label_set_text(GTK_LABEL(mainwin->ac_label), ac_name);
        if (mainwin->ac_button)
                gtk_widget_queue_resize(mainwin->ac_button);
 
        g_free(ac_name);
 }
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static void main_window_separation_change(MainWindow *mainwin, LayoutType layout_mode)
 {
        GtkWidget *folder_wid  = GTK_WIDGET_PTR(mainwin->folderview);
@@ -3167,7 +3168,7 @@ void main_window_show(MainWindow *mainwin)
 {
        gtk_widget_show(mainwin->window);
        gtk_widget_show(mainwin->vbox_body);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
         gtk_widget_set_uposition(mainwin->window,
                                  prefs_common.mainwin_x,
                                  prefs_common.mainwin_y);
@@ -3225,7 +3226,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
                                    prefs_common.msgview_height);
        }
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        mainwin->messageview->statusbar = mainwin->statusbar;
        mainwin->messageview->statusbar_cid = mainwin->messageview_cid;
 #endif
@@ -3391,7 +3392,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
+#ifndef GENERIC_UMPC
        switch (prefs_common.layout_mode) {
        case NORMAL_LAYOUT:
                SET_CHECK_MENU_ACTIVE("/View/Layout/Standard", TRUE);
@@ -3463,7 +3464,7 @@ static void toolbar_child_detached(GtkWidget *widget, GtkWidget *child,
 {
        gtk_widget_set_size_request(child, -1, -1);
 }
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static gboolean ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
                                    gpointer data)
 {
@@ -3671,7 +3672,7 @@ static void toggle_col_headers_cb(MainWindow *mainwin, guint action,
        }
 }
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
                                GtkWidget *widget)
 {
@@ -3787,7 +3788,7 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
        g_return_if_fail(menuitem != NULL);
        
        if (btn == GTK_BUTTON(mainwin->online_switch)) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                gtk_widget_hide (mainwin->online_switch);
                gtk_widget_show (mainwin->offline_switch);
 #endif
@@ -3807,7 +3808,7 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
                /*go online */
                if (!prefs_common.work_offline)
                        return;
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                gtk_widget_hide (mainwin->offline_switch);
                gtk_widget_show (mainwin->online_switch);
 #endif
@@ -4436,7 +4437,7 @@ static void account_receive_menu_cb(GtkMenuItem *menuitem, gpointer data)
 
        inc_account_mail(mainwin, account);
 }
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static void account_compose_menu_cb(GtkMenuItem *menuitem, gpointer data)
 {
        PrefsAccount *account = (PrefsAccount *)data;
index c146067..4a63810 100644 (file)
@@ -495,7 +495,7 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        GtkWidget *handlebox;
        GtkWidget *vbox;
        GtkWidget *menubar;
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        GtkWidget *statusbar = NULL;
 #endif
        guint n_menu_entries;
@@ -525,12 +525,17 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
 #else
        msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, handlebox,
                                          (gpointer)msgview);
+#ifndef GENERIC_UMPC
        statusbar = gtk_statusbar_new();
        gtk_widget_show(statusbar);
        gtk_box_pack_end(GTK_BOX(vbox), statusbar, FALSE, FALSE, 0);
        msgview->statusbar = statusbar;
        msgview->statusbar_cid = gtk_statusbar_get_context_id
                (GTK_STATUSBAR(statusbar), "Message View");
+#else
+       msgview->statusbar = NULL;
+       msgview->statusbar_cid = 0;
+#endif
 #endif
 
 
@@ -1104,7 +1109,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        }
        mimeview_show_message(messageview->mimeview, mimeinfo, file);
        
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        messageview_set_position(messageview, 0);
 #endif
 
@@ -1294,7 +1299,7 @@ void messageview_delete(MessageView *msgview)
                        /* NOTE: does not update to next message in summaryview */
                }
        }
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        if (msgview->window && !prefs_common.always_show_msg) {
                messageview_destroy(msgview);
        }
@@ -1916,7 +1921,7 @@ static void prev_cb(gpointer data, guint action, GtkWidget *widget)
                return;
        }
        if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
                       
                if (msginfo)
@@ -1941,7 +1946,7 @@ static void next_cb(gpointer data, guint action, GtkWidget *widget)
                return;
        }
        if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
                       
                if (msginfo)
@@ -1966,7 +1971,7 @@ static void prev_unread_cb(gpointer data, guint action, GtkWidget *widget)
                return;
        }
        if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
                       
                if (msginfo)
@@ -1991,7 +1996,7 @@ static void next_unread_cb(gpointer data, guint action, GtkWidget *widget)
                return;
        }
        if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
                       
                if (msginfo)
@@ -2016,7 +2021,7 @@ static void prev_new_cb(gpointer data, guint action, GtkWidget *widget)
                return;
        }
        if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
                       
                if (msginfo)
@@ -2041,7 +2046,7 @@ static void next_new_cb(gpointer data, guint action, GtkWidget *widget)
                return;
        }
        if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
                       
                if (msginfo)
@@ -2066,7 +2071,7 @@ static void prev_marked_cb(gpointer data, guint action, GtkWidget *widget)
                return;
        }
        if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
                       
                if (msginfo)
@@ -2091,7 +2096,7 @@ static void next_marked_cb(gpointer data, guint action, GtkWidget *widget)
                return;
        }
        if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
                       
                if (msginfo)
@@ -2116,7 +2121,7 @@ static void prev_labeled_cb(gpointer data, guint action, GtkWidget *widget)
                return;
        }
        if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
                       
                if (msginfo)
@@ -2141,7 +2146,7 @@ static void next_labeled_cb(gpointer data, guint action, GtkWidget *widget)
                return;
        }
        if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
                       
                if (msginfo)
@@ -2166,7 +2171,7 @@ static void last_read_cb(gpointer data, guint action, GtkWidget *widget)
                return;
        }
        if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
                       
                if (msginfo)
@@ -2191,7 +2196,7 @@ static void parent_cb(gpointer data, guint action, GtkWidget *widget)
                return;
        }
        if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
                       
                if (msginfo)
@@ -2216,7 +2221,7 @@ static void goto_unread_folder_cb(gpointer data, guint action, GtkWidget *widget
                return;
        }
        if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
                       
                if (msginfo)
@@ -2246,7 +2251,7 @@ static void goto_folder_cb(gpointer data, guint action, GtkWidget *widget)
                        return;
                }
                if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                        MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
                       
                        if (msginfo)
index bd22db9..f3129b8 100644 (file)
@@ -359,7 +359,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
 
        gtk_widget_show(hbox);
        gtk_widget_hide(ctree_mainbox);
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        gtk_widget_set_size_request(mime_toggle, -1, arrow->requisition.height + 8);
 #endif
        mimeview->hbox          = hbox;
@@ -2279,7 +2279,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        g_signal_connect(G_OBJECT(button), "drag_data_get",
                         G_CALLBACK(mimeview_drag_data_get), mimeview);
        gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        gtk_widget_set_size_request(vbox, -1, pixmap->requisition.height + 8);
        gtk_widget_set_size_request(button, -1, pixmap->requisition.height + 4);
 #endif
index 75314ae..bce538a 100644 (file)
@@ -415,7 +415,7 @@ static PrefParam receive_param[] = {
         &receive_page.rmmail_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"message_leave_time", "7", &tmp_ac_prefs.msg_leave_time, P_INT,
         &receive_page.leave_time_spinbtn,
         prefs_set_data_from_spinbtn, prefs_set_spinbtn},
@@ -956,7 +956,7 @@ static void basic_create_widget_func(PrefsPage * _page,
 
        default_checkbtn = gtk_check_button_new_with_label (_("Set as default"));
        gtk_widget_show (default_checkbtn);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        gtk_box_pack_end (GTK_BOX (hbox), default_checkbtn, TRUE, FALSE, 0);
 #else
        gtk_box_pack_start (GTK_BOX (vbox1), default_checkbtn, FALSE, FALSE, 0);
@@ -1114,7 +1114,7 @@ static void basic_create_widget_func(PrefsPage * _page,
        pass_entry = gtk_entry_new ();
        gtk_widget_show (pass_entry);
        gtk_widget_set_size_request (pass_entry, DEFAULT_ENTRY_WIDTH, -1);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        gtk_table_attach (GTK_TABLE (serv_table), uid_entry, 1, 2, 7, 8,
                          GTK_EXPAND | GTK_SHRINK | GTK_FILL,
                          GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
@@ -1187,7 +1187,7 @@ static void basic_create_widget_func(PrefsPage * _page,
 
        pass_label = gtk_label_new (_("Password"));
        gtk_widget_show (pass_label);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        gtk_table_attach (GTK_TABLE (serv_table), pass_label, 2, 3, 7, 8,
                          0, 0, 0, 0);
 #else
@@ -1685,7 +1685,7 @@ static void send_create_widget_func(PrefsPage * _page,
        gtk_widget_set_size_request (smtp_uid_entry, DEFAULT_ENTRY_WIDTH, -1);
        gtk_box_pack_start (GTK_BOX (hbox), smtp_uid_entry, TRUE, TRUE, 0);
 
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
        hbox = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox);
index 17a2e6e..1df258c 100644 (file)
@@ -192,7 +192,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"confirm_send_queued_messages", "FALSE", &prefs_common.confirm_send_queued_messages,
         P_BOOL, NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"send_dialog_mode", "0", &prefs_common.send_dialog_invisible, P_BOOL,
         NULL, NULL, NULL},
 #else
@@ -282,7 +282,7 @@ static PrefParam param[] = {
        {"default_reply_list", "TRUE", &prefs_common.default_reply_list, P_BOOL,
         NULL, NULL, NULL},
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL,
         NULL, NULL, NULL},
 #else
@@ -321,7 +321,7 @@ static PrefParam param[] = {
          &prefs_common.normalfont_gtk1,        P_STRING, NULL, NULL, NULL},
 
        /* new fonts */
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"widget_font_gtk2",    NULL,
          &SPECIFIC_PREFS.widgetfont,           P_STRING, NULL, NULL, NULL},
        {"message_font_gtk2",   "Monospace 9",
@@ -447,7 +447,7 @@ static PrefParam param[] = {
 
        {"enable_thread", "TRUE", &prefs_common.enable_thread, P_BOOL,
         NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"toolbar_style", "3", &prefs_common.toolbar_style, P_ENUM,
         NULL, NULL, NULL},
 #else
@@ -458,7 +458,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"show_col_headers", "TRUE", &prefs_common.show_col_headers, P_BOOL,
         NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"show_statusbar", "TRUE", &prefs_common.show_statusbar, P_BOOL,
         NULL, NULL, NULL},
        {"show_searchbar", "TRUE", &prefs_common.show_searchbar, P_BOOL,
@@ -526,7 +526,7 @@ static PrefParam param[] = {
         &prefs_common.summary_col_size[S_COL_STATUS], P_INT, NULL, NULL, NULL},
        {"summary_col_size_mime", "10",
         &prefs_common.summary_col_size[S_COL_MIME], P_INT, NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"summary_col_size_subject", "200",
         &prefs_common.summary_col_size[S_COL_SUBJECT], P_INT, NULL, NULL, NULL},
        {"summary_col_size_from", "120",
@@ -585,7 +585,7 @@ static PrefParam param[] = {
        {"folder_col_pos_total", "3",
         &prefs_common.folder_col_pos[F_COL_TOTAL], P_INT, NULL, NULL, NULL},
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"folder_col_size_folder", "120",
         &prefs_common.folder_col_size[F_COL_FOLDER], P_INT, NULL, NULL, NULL},
        {"folder_col_size_new", "32",
@@ -634,7 +634,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"mainwin_maximised", "FALSE", &prefs_common.mainwin_maximised, P_BOOL,
         NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"mainwin_width", "800", &prefs_common.mainwin_width, P_INT,
         NULL, NULL, NULL},
        {"mainwin_height", "600", &prefs_common.mainwin_height, P_INT,
@@ -744,7 +744,7 @@ static PrefParam param[] = {
         &SPECIFIC_PREFS.mime_open_cmd,     P_STRING, NULL, NULL, NULL},
 
        /* Interface */
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"layout_mode", "0", &prefs_common.layout_mode, P_INT,
         NULL, NULL, NULL},
 #else
@@ -831,7 +831,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"summary_quicksearch_type", "0", &prefs_common.summary_quicksearch_type, P_INT,
         NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"summary_quicksearch_recurse", "1", &prefs_common.summary_quicksearch_recurse, P_INT,
         NULL, NULL, NULL},
 #else
@@ -855,7 +855,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"log_length", "500", &prefs_common.loglength, P_INT,
         NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"enable_log_standard", "TRUE", &prefs_common.enable_log_standard, P_BOOL,
         NULL, NULL, NULL},
        {"enable_log_warning", "TRUE", &prefs_common.enable_log_warning, P_BOOL,
@@ -1041,7 +1041,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"hover_timeout", "500", &prefs_common.hover_timeout, P_INT,
         NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"cache_max_mem_usage", "4096", &prefs_common.cache_max_mem_usage, P_INT,
         NULL, NULL, NULL},
        {"cache_min_keep_time", "15", &prefs_common.cache_min_keep_time, P_INT,
@@ -1078,7 +1078,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"unsafe_ssl_certs", "FALSE", &prefs_common.unsafe_ssl_certs, P_BOOL,
         NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"real_time_sync", "FALSE", &prefs_common.real_time_sync, P_BOOL,
         NULL, NULL, NULL},
 #else
index dcc56fb..4bc0d20 100644 (file)
@@ -111,7 +111,7 @@ static void drag_end        (GtkTreeView *list_view,
                         GdkDragContext *context,
                         gpointer data);
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static gchar *defaults[] =
 {
        "From",
index 9f9b826..0d7b933 100644 (file)
@@ -321,7 +321,7 @@ static void prefs_filtering_create(void)
        GtkWidget *top_btn;
        GtkWidget *up_btn;
        GtkWidget *down_btn;
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        GtkWidget *page_up_btn;
        GtkWidget *page_down_btn;
 #endif
@@ -525,7 +525,7 @@ static void prefs_filtering_create(void)
        gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), top_btn,
                        _("Move the selected rule to the top"), NULL);
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        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));
@@ -553,7 +553,7 @@ static void prefs_filtering_create(void)
        gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), down_btn,
                        _("Move the selected rule down"), NULL);
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        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));
@@ -1752,7 +1752,7 @@ 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
+#ifdef GENERIC_UMPC
        {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},
@@ -1833,7 +1833,7 @@ static GtkWidget *prefs_filtering_list_view_create(void)
 
        list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL
                (prefs_filtering_create_data_store())));
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        g_object_set(list_view, "allow-checkbox-mode", FALSE, NULL);
 #endif
 
index ca2081e..3b20c34 100644 (file)
@@ -497,7 +497,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
                (vbox2, checkbtn_show_tooltips,
                 _("Show tooltips"));
 
-#if !GTK_CHECK_VERSION(2,12,0) && !MAEMO
+#if !GTK_CHECK_VERSION(2,12,0) && !GENERIC_UMPC
        gtk_widget_hide(checkbtn_show_tooltips);
 #endif
        hbox2 = gtk_hbox_new (FALSE, 8);
index cc3db46..f427a3f 100644 (file)
@@ -267,7 +267,7 @@ static void prefs_template_window_create(void)
                }
        }
        gtk_widget_show(text_value);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        gtk_widget_set_size_request(text_value, -1, 120);
 #else
        gtk_widget_set_size_request(text_value, -1, 60);
index 417b659..e039cc4 100644 (file)
@@ -771,7 +771,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
        GtkWidget *reg_hbox;
        GtkWidget *arrow;
        GtkWidget *btn_hbox;
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        GtkWidget *hbox;
 #endif
        GtkWidget *reg_btn;
@@ -918,7 +918,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
                          prefs_toolbar);
 
        default_btn = gtk_button_new_with_label(_(" Use default "));
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        gtk_box_pack_end(GTK_BOX(reg_hbox), default_btn, FALSE, TRUE, 0);
 #else
        hbox = gtk_hbox_new(FALSE, 0);
index 776e5cc..4d91718 100644 (file)
@@ -83,7 +83,7 @@
 #include "pixmaps/queue_open.xpm"
 #include "pixmaps/queue_open_hrm.xpm"
 #include "pixmaps/claws-mail_icon.xpm"
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 #include "pixmaps/claws-mail_logo.xpm"
 #else
 #include "pixmaps/claws-mail_logo-small.xpm"
@@ -362,7 +362,7 @@ static StockPixmapData pixmaps[] =
        {claws_mail_icon_xpm                    , NULL, NULL, "claws_mail_icon", NULL},
        {read_xpm                               , NULL, NULL, "read", NULL},
        {trash_btn_xpm                          , NULL, NULL, "trash_btn", NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {claws_mail_logo_xpm                    , NULL, NULL, "claws_mail_logo", NULL},
 #else
        {claws_mail_logo_small_xpm              , NULL, NULL, "claws_mail_logo_small", NULL},
index 1638bf0..12c27f5 100644 (file)
@@ -274,7 +274,7 @@ static GtkWidget *summary_ctree_create      (SummaryView    *summaryview);
 static gint summary_toggle_pressed     (GtkWidget              *eventbox,
                                         GdkEventButton         *event,
                                         SummaryView            *summaryview);
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
 static void summary_toggle_multiple_pressed
                                        (GtkWidget              *widget,
                                         SummaryView            *summaryview);
@@ -313,7 +313,7 @@ static void summary_col_resized             (GtkCList               *clist,
 static void summary_reply_cb           (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static void summary_show_all_header_cb (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
@@ -325,7 +325,7 @@ static void summary_add_address_cb  (SummaryView            *summaryview,
 static void summary_create_filter_cb   (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static void summary_create_processing_cb(SummaryView           *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
@@ -458,7 +458,7 @@ GtkTargetEntry summary_drag_types[2] =
 static GtkItemFactoryEntry summary_popup_entries[] =
 {
        {N_("/_Reply"),                 "<control>R", summary_reply_cb, COMPOSE_REPLY, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {N_("/Repl_y to"),              NULL, NULL,             0, "<Branch>"},
        {N_("/Repl_y to/_all"),         "<shift><control>R", summary_reply_cb,  COMPOSE_REPLY_TO_ALL, NULL},
        {N_("/Repl_y to/_sender"),      NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
@@ -467,7 +467,7 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {"/---",                        NULL, NULL,             0, "<Separator>"},
 #endif
        {N_("/_Forward"),               "<control><alt>F", summary_reply_cb, COMPOSE_FORWARD_INLINE, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {N_("/For_ward as attachment"), NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
        {N_("/Redirect"),               NULL, summary_reply_cb, COMPOSE_REDIRECT, NULL},
 #endif
@@ -475,7 +475,7 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/M_ove..."),               "<control>O", summary_move_to,  0, NULL},
        {N_("/_Copy..."),               "<shift><control>O", summary_copy_to,   0, NULL},
        {N_("/Move to _trash"),         "<control>D", summary_delete_trash,     0, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {N_("/_Delete..."),             NULL, summary_delete, 0, NULL},
 #endif
        {"/---",                        NULL, NULL,             0, "<Separator>"},
@@ -500,7 +500,7 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/Ta_gs"),                  NULL, NULL,             0, NULL},
 
        {"/---",                        NULL, NULL,             0, "<Separator>"},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {N_("/Add sender to address boo_k"),
                                        NULL, summary_add_address_cb, 0, NULL},
 #endif
@@ -513,7 +513,7 @@ static GtkItemFactoryEntry summary_popup_entries[] =
                                        NULL, summary_create_filter_cb, FILTER_BY_TO, NULL},
        {N_("/Create f_ilter rule/by _Subject"),
                                        NULL, summary_create_filter_cb, FILTER_BY_SUBJECT, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {N_("/Create processing rule"), NULL, NULL,             0, "<Branch>"},
        {N_("/Create processing rule/_Automatically"),
                                        NULL, summary_create_processing_cb, FILTER_BY_AUTO, NULL},
@@ -529,12 +529,12 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/_View/Open in new _window"),
                                        "<control><alt>N", summary_open_msg,    0, NULL},
        {N_("/_View/Message _source"),  "<control>U", summary_view_source, 0, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {N_("/_View/All _headers"),     "<control>H", summary_show_all_header_cb, 0, "<ToggleItem>"},
 #endif
        {"/---",                        NULL, NULL,             0, "<Separator>"},
        {N_("/_Save as..."),            "<control>S", summary_save_as,   0, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {N_("/_Print..."),              "<control>P", summary_print,   0, NULL},
 #endif
 };  /* see also list in menu_connect_identical_items() in menu.c if this changes */
@@ -620,7 +620,7 @@ SummaryView *summary_create(void)
        GtkWidget *statlabel_msgs;
        GtkWidget *hbox_spc;
        GtkWidget *toggle_eventbox;
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        GtkWidget *multiple_sel_togbtn;
 #endif
        GtkWidget *toggle_arrow;
@@ -689,7 +689,7 @@ SummaryView *summary_create(void)
                         G_CALLBACK(summary_toggle_pressed),
                         summaryview);
 
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        multiple_sel_togbtn = gtk_toggle_button_new();
        gtk_widget_show(multiple_sel_togbtn);
        gtk_box_pack_end(GTK_BOX(hbox), multiple_sel_togbtn, FALSE, FALSE, 4);
@@ -717,7 +717,7 @@ SummaryView *summary_create(void)
        summaryview->mainwidget_book = gtk_notebook_new();
         gtk_notebook_set_show_tabs(GTK_NOTEBOOK(summaryview->mainwidget_book), FALSE);
         gtk_notebook_set_show_border(GTK_NOTEBOOK(summaryview->mainwidget_book), FALSE);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        gtk_container_add(GTK_CONTAINER(summaryview->mainwidget_book),
                scrolledwin);
        gtk_box_pack_start(GTK_BOX(vbox), summaryview->mainwidget_book, TRUE, TRUE, 0);
@@ -743,7 +743,7 @@ SummaryView *summary_create(void)
        quicksearch = quicksearch_new();
        gtk_box_pack_start(GTK_BOX(vbox), quicksearch_get_widget(quicksearch), FALSE, FALSE, 0);
 
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        gtk_container_add(GTK_CONTAINER(summaryview->mainwidget_book),
                scrolledwin);
        gtk_box_pack_start(GTK_BOX(vbox), summaryview->mainwidget_book, TRUE, TRUE, 0);
@@ -773,7 +773,7 @@ SummaryView *summary_create(void)
        summaryview->statlabel_msgs = statlabel_msgs;
        summaryview->toggle_eventbox = toggle_eventbox;
        summaryview->toggle_arrow = toggle_arrow;
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        summaryview->multiple_sel_togbtn = multiple_sel_togbtn;
 #endif
        summaryview->toggle_search = toggle_search;
@@ -996,7 +996,7 @@ void summary_init(SummaryView *summaryview)
        gtk_widget_show(pixmap);
        summaryview->quick_search_pixmap = pixmap;
        
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_SELECTION);
        gtk_container_add(GTK_CONTAINER(summaryview->multiple_sel_togbtn), pixmap);
        gtk_widget_show(pixmap);
@@ -1640,7 +1640,7 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
        GtkItemFactory *ifactory = summaryview->popupfactory;
        SensitiveCond state;
        gboolean sensitive;
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        GtkWidget *menuitem;
 #endif
        gint i;
@@ -1650,7 +1650,7 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
                SensitiveCond cond;
        } entry[] = {
                {"/Reply"                       , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                {"/Reply to"                    , M_HAVE_ACCOUNT|M_TARGET_EXIST},
                {"/Reply to/all"                , M_HAVE_ACCOUNT|M_TARGET_EXIST},
                {"/Reply to/sender"             , M_HAVE_ACCOUNT|M_TARGET_EXIST},
@@ -1658,7 +1658,7 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
 #endif
 
                {"/Forward"                     , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                {"/Forward as attachment"       , M_HAVE_ACCOUNT|M_TARGET_EXIST},
                {"/Redirect"                    , M_HAVE_ACCOUNT|M_TARGET_EXIST},
 #endif
@@ -1666,7 +1666,7 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
                {"/Move..."                     , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
                {"/Copy..."                     , M_TARGET_EXIST|M_EXEC},
                {"/Move to trash"               , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                {"/Delete..."                   , M_TARGET_EXIST|M_ALLOW_DELETE},
 #endif
 
@@ -1684,22 +1684,22 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
                {"/Color label"                 , M_TARGET_EXIST},
                {"/Tags"                        , M_TARGET_EXIST},
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                {"/Add sender to address book"  , M_SINGLE_TARGET_EXIST},
 #endif
                {"/Create filter rule"          , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                {"/Create processing rule"      , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
 #endif
 
                {"/View"                        , M_SINGLE_TARGET_EXIST},
                {"/View/Open in new window"     , M_SINGLE_TARGET_EXIST},
                {"/View/Message source"         , M_SINGLE_TARGET_EXIST},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                {"/View/All headers"            , M_SINGLE_TARGET_EXIST},
 #endif
                {"/Save as..."                  , M_TARGET_EXIST},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                {"/Print..."                    , M_TARGET_EXIST},
 #endif
                {NULL, 0}
@@ -1716,7 +1716,7 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
 
 
        summary_lock(summaryview);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        menuitem = gtk_item_factory_get_widget(ifactory, "/View/All headers");
        if (summaryview->messageview 
        &&  summaryview->messageview->mimeview
@@ -2693,7 +2693,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
 
                hbox  = gtk_hbox_new(FALSE, 4);
                label = gtk_label_new(title);
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        gtk_widget_set_size_request(hbox, -1, 20);
 #endif
 
@@ -5857,7 +5857,7 @@ static gboolean summary_popup_menu(GtkWidget *widget, gpointer data)
        return TRUE;
 }
 
-#if GTK_CHECK_VERSION(2,12,0) && !MAEMO
+#if GTK_CHECK_VERSION(2,12,0) && !GENERIC_UMPC
 static gchar *summaryview_get_tooltip_text(SummaryView *summaryview, MsgInfo *info, gint column)
 {
        MsgFlags flags;
@@ -6171,7 +6171,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                         G_CALLBACK(summary_drag_motion_cb),
                         summaryview);
 
-#if GTK_CHECK_VERSION(2,12,0) && !MAEMO
+#if GTK_CHECK_VERSION(2,12,0) && !GENERIC_UMPC
        g_object_set (G_OBJECT(ctree), "has-tooltip", TRUE, NULL);
        g_signal_connect(G_OBJECT(ctree), "query-tooltip", 
                         G_CALLBACK(tooltip_cb),
@@ -6235,7 +6235,7 @@ static gint summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
                summary_toggle_view(summaryview);
        return TRUE;
 }
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
 static void summary_toggle_multiple_pressed(GtkWidget *widget,
                                   SummaryView *summaryview)
 {
@@ -6335,7 +6335,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                case GDK_KP_Enter:
                        handled = TRUE;
                        if (summaryview->displayed != summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                                summary_display_msg(summaryview,
                                                    summaryview->selected);
 #else
@@ -6659,7 +6659,7 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
        compose_reply_from_messageview(msgview, msginfo_list, action);
        g_slist_free(msginfo_list);
 }
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static void summary_show_all_header_cb(SummaryView *summaryview,
                                       guint action, GtkWidget *widget)
 {
@@ -6680,7 +6680,7 @@ static void summary_create_filter_cb(SummaryView *summaryview,
 {
        summary_filter_open(summaryview, (PrefsFilterType)action, 0);
 }
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static void summary_create_processing_cb(SummaryView *summaryview,
                                         guint action, GtkWidget *widget)
 {
@@ -7373,7 +7373,7 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
        gtk_widget_show(pixmap);
        summaryview->quick_search_pixmap = pixmap;
 
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_SELECTION);
        gtk_container_remove (GTK_CONTAINER(summaryview->multiple_sel_togbtn), 
                              summaryview->multiple_sel_image);
index 3f074d9..171bcea 100644 (file)
@@ -103,7 +103,7 @@ struct _SummaryView
        GtkWidget *statlabel_msgs;
        GtkWidget *toggle_eventbox;
        GtkWidget *toggle_arrow;
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        GtkWidget *multiple_sel_togbtn;
        GtkWidget *multiple_sel_image;
 #endif
index 6219b66..556fa1d 100644 (file)
@@ -764,7 +764,7 @@ static void recursive_add_parts(TextView *textview, GNode *node)
         mimeinfo = (MimeInfo *) node->data;
         
         textview_add_part(textview, mimeinfo);
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        textview_set_position(textview, 0);
 #endif        
         if ((mimeinfo->type != MIMETYPE_MULTIPART) &&
@@ -885,14 +885,14 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
                g_free(content_type);
        }
        TEXTVIEW_INSERT(_("  The following can be performed on this part\n"));
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        TEXTVIEW_INSERT(_("  by right-clicking the icon or list item:"));
 #endif
        TEXTVIEW_INSERT("\n");
 
        TEXTVIEW_INSERT(_("     - To save, select "));
        TEXTVIEW_INSERT_LINK(_("'Save as...'"), "sc://save_as", NULL);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        TEXTVIEW_INSERT(_(" (Shortcut key: 'y')"));
 #endif
        TEXTVIEW_INSERT("\n");
@@ -900,7 +900,7 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
        TEXTVIEW_INSERT(_("     - To display as text, select "));
        TEXTVIEW_INSERT_LINK(_("'Display as text'"), "sc://display_as_text", NULL);
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        TEXTVIEW_INSERT(_(" (Shortcut key: 't')"));
 #endif
        TEXTVIEW_INSERT("\n");
@@ -908,7 +908,7 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
        TEXTVIEW_INSERT(_("     - To open with an external program, select "));
        TEXTVIEW_INSERT_LINK(_("'Open'"), "sc://open", NULL);
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        TEXTVIEW_INSERT(_(" (Shortcut key: 'l')\n"));
        TEXTVIEW_INSERT(_("       (alternately double-click, or click the middle "));
        TEXTVIEW_INSERT(_("mouse button)\n"));
index 2f3a6b3..24d5466 100644 (file)
@@ -227,7 +227,7 @@ struct {
        { "toolbar_compose.xml", NULL}, 
        { "toolbar_msgview.xml", NULL}
 };
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 static GtkItemFactoryEntry reply_entries[] =
 {
        {N_("/Reply with _quote"), NULL,    toolbar_reply, COMPOSE_REPLY_WITH_QUOTE, NULL},
@@ -499,7 +499,7 @@ static void toolbar_set_default_main(void)
        struct {
                gint action;
        } default_toolbar[] = {
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
                { A_GO_FOLDERS},
                { A_OPEN_MAIL},         
                { A_SEPARATOR}, 
@@ -510,14 +510,14 @@ static void toolbar_set_default_main(void)
                { A_COMPOSE_EMAIL},
                { A_SEPARATOR},
                { A_REPLY_MESSAGE}, 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                { A_REPLY_ALL},
                { A_REPLY_SENDER},
 #endif
                { A_FORWARD},
                { A_SEPARATOR},
                { A_TRASH},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 #if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
                { A_LEARN_SPAM},
 #endif
@@ -558,7 +558,7 @@ static void toolbar_set_default_compose(void)
        struct {
                gint action;
        } default_toolbar[] = {
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
                { A_CLOSE},
                { A_SEPARATOR}, 
 #endif
@@ -566,7 +566,7 @@ static void toolbar_set_default_compose(void)
                { A_SENDL},
                { A_DRAFT},
                { A_SEPARATOR}, 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                { A_INSERT},
 #endif
                { A_ATTACH},
@@ -606,7 +606,7 @@ static void toolbar_set_default_msgview(void)
        struct {
                gint action;
        } default_toolbar[] = {
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
                { A_CLOSE},
                { A_SEPARATOR}, 
 #endif
@@ -616,7 +616,7 @@ static void toolbar_set_default_msgview(void)
                { A_FORWARD},
                { A_SEPARATOR},
                { A_TRASH},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 #if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
                { A_LEARN_SPAM},
 #endif
@@ -880,7 +880,7 @@ static void activate_compose_button (Toolbar           *toolbar,
                gtk_tool_button_set_icon_widget(
                        GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
                        toolbar->compose_news_icon);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->compose_mail_btn), GTK_TOOLTIPS(toolbar->tooltips),
                        _("Compose News message"), NULL);
 #endif 
@@ -889,7 +889,7 @@ static void activate_compose_button (Toolbar           *toolbar,
                gtk_tool_button_set_icon_widget(
                        GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
                        toolbar->compose_mail_icon);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->compose_mail_btn), GTK_TOOLTIPS(toolbar->tooltips),
                        _("Compose Email"), NULL);
 #endif 
@@ -921,7 +921,7 @@ static void activate_learn_button (Toolbar           *toolbar,
                gtk_tool_button_set_label(
                        GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
                        _("Spam"));
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->learn_spam_btn), GTK_TOOLTIPS(toolbar->tooltips),
                        _("Learn spam"), NULL); 
 #endif
@@ -933,7 +933,7 @@ static void activate_learn_button (Toolbar           *toolbar,
                gtk_tool_button_set_label(
                        GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
                        _("Ham"));
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->learn_spam_btn), GTK_TOOLTIPS(toolbar->tooltips),
                        _("Learn ham"), NULL);
 #endif 
@@ -1345,7 +1345,7 @@ static void toolbar_prev_unread_cb(GtkWidget *widget, gpointer data)
                
                /* Now we need to update the messageview window */
                if (msgview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                        MsgInfo * msginfo = summary_get_selected_msg(msgview->mainwin->summaryview);
                       
                        if (msginfo)
@@ -1392,7 +1392,7 @@ static void toolbar_next_unread_cb(GtkWidget *widget, gpointer data)
 
                /* Now we need to update the messageview window */
                if (msgview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                        MsgInfo * msginfo = summary_get_selected_msg(msgview->mainwin->summaryview);
                        
                        if (msginfo)
@@ -1720,7 +1720,7 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
                }
        }
 }
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
 #define TOOLBAR_ITEM(item,icon,text,tooltip) {                                                         \
        item = GTK_WIDGET(gtk_tool_button_new(icon, text));                                             \
        gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                                      \
@@ -1812,7 +1812,7 @@ Toolbar *toolbar_create(ToolbarType        type,
        GSList *cur;
        GSList *toolbar_list;
        Toolbar *toolbar_data;
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        GtkTooltips *toolbar_tips;
        
        toolbar_tips = gtk_tooltips_new();
@@ -1877,7 +1877,7 @@ Toolbar *toolbar_create(ToolbarType        type,
                        toolbar_data->open_mail_btn = item; 
                        break;
                case A_COMPOSE_EMAIL:
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                        TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
                                _("Compose Email"),
                                _("Compose with selected Account"));
@@ -1913,7 +1913,7 @@ Toolbar *toolbar_create(ToolbarType        type,
                        MAKE_MENU(learn_entries,"<LearnSpam>",toolbar_data->learn_spam_btn);
                        break;
                case A_REPLY_MESSAGE:
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                        TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
                                _("Reply to Message"),
                                _("Reply to Message options"));
@@ -1927,7 +1927,7 @@ Toolbar *toolbar_create(ToolbarType        type,
 #endif
                        break;
                case A_REPLY_SENDER:
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                        TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
                                _("Reply to Sender"),
                                _("Reply to Sender options"));
@@ -1941,7 +1941,7 @@ Toolbar *toolbar_create(ToolbarType        type,
 #endif
                        break;
                case A_REPLY_ALL:
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                        TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
                                _("Reply to All"),
                                _("Reply to All options"));
@@ -1955,7 +1955,7 @@ Toolbar *toolbar_create(ToolbarType        type,
 #endif
                        break;
                case A_REPLY_ML:
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                        TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
                                _("Reply to Mailing-list"),
                                _("Reply to Mailing-list options"));
@@ -1969,7 +1969,7 @@ Toolbar *toolbar_create(ToolbarType        type,
 #endif
                        break;
                case A_FORWARD:
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
                        TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
                                _("Forward Message"),
                                _("Forward Message options"));
@@ -2074,13 +2074,13 @@ Toolbar *toolbar_create(ToolbarType      type,
 
        }
        toolbar_data->toolbar = toolbar;
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        toolbar_data->tooltips = toolbar_tips;
 #endif
        gtk_widget_show_all(toolbar);
 
        if (type == TOOLBAR_MAIN) {
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
                MainWindow *mainwin = mainwindow_get_mainwindow();
                GtkWidget *progressbar = gtk_progress_bar_new();
                item = GTK_WIDGET(gtk_tool_item_new());
@@ -2131,7 +2131,7 @@ void toolbar_update(ToolbarType type, gpointer data)
        Compose    *compose = (Compose*)data;
        MessageView *msgview = (MessageView*)data;
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        switch(type) {
        case TOOLBAR_MAIN:
                toolbar_data = mainwin->toolbar;
@@ -2171,9 +2171,9 @@ void toolbar_update(ToolbarType type, gpointer data)
        default:
                return;
        }
-
+#ifdef MAEMO
        hildon_window_remove_toolbar(HILDON_WINDOW(handlebox), GTK_TOOLBAR(toolbar_data->toolbar));
-
+#endif
        toolbar_init(toolbar_data);
        toolbar_data = toolbar_create(type, handlebox, data);
 #endif