2007-10-12 [paul] 3.0.2cvs64
authorPaul Mangan <paul@claws-mail.org>
Fri, 12 Oct 2007 11:26:39 +0000 (11:26 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 12 Oct 2007 11:26:39 +0000 (11:26 +0000)
* src/account.c
* src/folderview.c
* src/main.c
* src/mainwindow.c
* src/messageview.c
* src/summary_search.c
* src/summaryview.c
* src/toolbar.c
* src/wizard.c
* src/common/utils.c
* src/gtk/prefswindow.c
fix a bunch of compiler warnings on maemo

14 files changed:
ChangeLog
PATCHSETS
configure.ac
src/account.c
src/common/utils.c
src/folderview.c
src/gtk/prefswindow.c
src/main.c
src/mainwindow.c
src/messageview.c
src/summary_search.c
src/summaryview.c
src/toolbar.c
src/wizard.c

index 2689b04..8581757 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-10-12 [paul]      3.0.2cvs64
+
+       * src/account.c
+       * src/folderview.c
+       * src/main.c
+       * src/mainwindow.c
+       * src/messageview.c
+       * src/summary_search.c
+       * src/summaryview.c
+       * src/toolbar.c
+       * src/wizard.c
+       * src/common/utils.c
+       * src/gtk/prefswindow.c
+               fix a bunch of compiler warnings on maemo
+
 2007-10-11 [colin]     3.0.2cvs63
 
        * src/editaddress.c
index f8d26e9..3adb066 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.14.2.39 -r 1.14.2.40 src/editaddress.c;  ) > 3.0.2cvs61.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/addrduplicates.c;  cvs diff -u -r 1.60.2.102 -r 1.60.2.103 src/addressbook.c;  cvs diff -u -r 1.382.2.416 -r 1.382.2.417 src/compose.c;  cvs diff -u -r 1.1.4.26 -r 1.1.4.27 src/expldifdlg.c;  cvs diff -u -r 1.274.2.214 -r 1.274.2.215 src/mainwindow.c;  cvs diff -u -r 1.94.2.159 -r 1.94.2.160 src/messageview.c;  cvs diff -u -r 1.56.2.57 -r 1.56.2.58 src/pop.c;  cvs diff -u -r 1.16.2.28 -r 1.16.2.29 src/prefs_customheader.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/prefs_send.c;  cvs diff -u -r 1.3.2.51 -r 1.3.2.52 src/prefs_themes.c;  cvs diff -u -r 1.13.2.33 -r 1.13.2.34 src/common/plugin.c;  cvs diff -u -r 1.5.2.49 -r 1.5.2.50 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.2.80 -r 1.1.2.81 src/gtk/quicksearch.c;  ) > 3.0.2cvs62.patchset
 ( cvs diff -u -r 1.14.2.40 -r 1.14.2.41 src/editaddress.c;  ) > 3.0.2cvs63.patchset
+( cvs diff -u -r 1.61.2.72 -r 1.61.2.73 src/account.c;  cvs diff -u -r 1.207.2.186 -r 1.207.2.187 src/folderview.c;  cvs diff -u -r 1.115.2.169 -r 1.115.2.170 src/main.c;  cvs diff -u -r 1.274.2.215 -r 1.274.2.216 src/mainwindow.c;  cvs diff -u -r 1.94.2.160 -r 1.94.2.161 src/messageview.c;  cvs diff -u -r 1.15.2.52 -r 1.15.2.53 src/summary_search.c;  cvs diff -u -r 1.395.2.330 -r 1.395.2.331 src/summaryview.c;  cvs diff -u -r 1.43.2.88 -r 1.43.2.89 src/toolbar.c;  cvs diff -u -r 1.1.2.61 -r 1.1.2.62 src/wizard.c;  cvs diff -u -r 1.36.2.117 -r 1.36.2.118 src/common/utils.c;  cvs diff -u -r 1.12.2.43 -r 1.12.2.44 src/gtk/prefswindow.c;  ) > 3.0.2cvs64.patchset
index 50e9a44..6e2596d 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=63
+EXTRA_VERSION=64
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index d2cac67..a519644 100644 (file)
@@ -108,10 +108,11 @@ static gint account_delete_event  (GtkWidget      *widget,
                                         gpointer        data);
 static void account_size_allocate_cb(GtkWidget *widget,
                                         GtkAllocation *allocation);
+#ifndef MAEMO
 static gboolean account_key_pressed    (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         gpointer        data);
-
+#endif
 static void account_list_view_add      (PrefsAccount   *ac_prefs);
 static void account_list_view_set      (void);
 
@@ -1219,7 +1220,7 @@ static gint account_delete_event(GtkWidget *widget, GdkEventAny *event,
        account_edit_close(NULL, NULL);
        return TRUE;
 }
-
+#ifndef MAEMO
 static gboolean account_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                    gpointer data)
 {
@@ -1227,7 +1228,7 @@ static gboolean account_key_pressed(GtkWidget *widget, GdkEventKey *event,
                account_edit_close(NULL, NULL);
        return FALSE;
 }
-
+#endif
 static void account_list_view_add(PrefsAccount *ac_prefs)
 {
        GtkTreeView *list_view = GTK_TREE_VIEW(edit_account.list_view);
index f5f07dc..8ebddbf 100644 (file)
@@ -3538,7 +3538,7 @@ gchar *get_command_output(const gchar *cmdline)
 
        return child_stdout;
 }
-
+#ifndef MAEMO
 static gint is_unchanged_uri_char(char c)
 {
        switch (c) {
@@ -3574,7 +3574,7 @@ static void encode_uri(gchar *encoded_uri, gint bufsize, const gchar *uri)
        }
        encoded_uri[k] = 0;
 }
-
+#endif
 gint open_uri(const gchar *uri, const gchar *cmdline)
 {
 #ifndef MAEMO
index fd708ed..eee8a5f 100644 (file)
@@ -263,8 +263,10 @@ static void folderview_drag_received_cb  (GtkWidget        *widget,
                                          guint             info,
                                          guint             time,
                                          FolderView       *folderview);
+#ifndef MAEMO
 static void folderview_start_drag       (GtkWidget *widget, gint button, GdkEvent *event,
                                          FolderView       *folderview);
+#endif
 static void folderview_drag_data_get     (GtkWidget        *widget,
                                          GdkDragContext   *drag_context,
                                          GtkSelectionData *selection_data,
@@ -2765,7 +2767,7 @@ static void drag_state_start(FolderView *folderview, GtkCTreeNode *node, FolderI
                folderview->drag_item = item;
        }                        
 }
-
+#ifndef MAEMO
 static void folderview_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
                                  FolderView       *folderview)
 {
@@ -2780,7 +2782,7 @@ static void folderview_start_drag(GtkWidget *widget, gint button, GdkEvent *even
                                 GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
        gtk_drag_set_icon_default(context);
 }
-
+#endif
 static void folderview_drag_data_get(GtkWidget        *widget,
                                     GdkDragContext   *drag_context,
                                     GtkSelectionData *selection_data,
index 06f92de..7975885 100644 (file)
@@ -192,14 +192,14 @@ static void ok_button_clicked(GtkButton *button, gpointer user_data)
                close_prefs_window(prefswindow);
        }               
 }
-
+#ifndef MAEMO
 static void cancel_button_clicked(GtkButton *button, gpointer user_data)
 {
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
        close_prefs_window(prefswindow);
 }
-
+#endif
 static gboolean window_closed(GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
@@ -211,7 +211,7 @@ static gboolean window_closed(GtkWidget *widget, GdkEvent *event, gpointer user_
 
        return FALSE;
 }
-
+#ifndef MAEMO
 static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                    PrefsWindow *data)
 {
@@ -220,11 +220,7 @@ static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
        if (event) {
                switch (event->keyval) {
                        case GDK_Escape :
-#ifndef MAEMO
                                cancel_button_clicked(NULL, data);
-#else
-                               ok_button_clicked(NULL, data);
-#endif
                                break;
                        case GDK_Return : 
                        case GDK_KP_Enter :
@@ -242,7 +238,7 @@ static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
        }
        return FALSE;
 }
-
+#endif
 typedef struct FindNodeByName {
        const gchar *name;
        gboolean     found;
@@ -316,8 +312,10 @@ 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
        GtkTreeSelection *selection;
        GtkTreeIter iter;
+#endif
 
        for (cur = prefs_pages, index = 0; cur != NULL; cur = g_slist_next(cur), index++) {
                PrefsPage *page = (PrefsPage *)cur->data;
index d3a17af..5459f79 100644 (file)
 #include "timing.h"
 
 #ifdef MAEMO
+#include <hildon-widgets/hildon-banner.h>
 #include <hildon-widgets/hildon-program.h>
 #include <gtk/gtkmain.h>
 #include <libosso.h>
index 9582686..cf65fe9 100644 (file)
@@ -114,10 +114,10 @@ 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
 static void main_window_separation_change      (MainWindow     *mainwin,
                                                 LayoutType      layout_mode);
-
+#endif
 static void main_window_set_widgets            (MainWindow     *mainwin,
                                                 LayoutType      layout_mode);
 
@@ -127,11 +127,11 @@ static void toolbar_child_attached                (GtkWidget      *widget,
 static void toolbar_child_detached             (GtkWidget      *widget,
                                                 GtkWidget      *child,
                                                 gpointer        data);
-
+#ifndef MAEMO
 static gboolean ac_label_button_pressed                (GtkWidget      *widget,
                                                 GdkEventButton *event,
                                                 gpointer        data);
-
+#endif
 static gint main_window_close_cb               (GtkWidget      *widget,
                                                 GdkEventAny    *event,
                                                 gpointer        data);
@@ -461,9 +461,10 @@ static void account_selector_menu_cb        (GtkMenuItem   *menuitem,
                                          gpointer       data);
 static void account_receive_menu_cb     (GtkMenuItem   *menuitem,
                                          gpointer       data);
+#ifndef MAEMO
 static void account_compose_menu_cb     (GtkMenuItem   *menuitem,
                                          gpointer       data);
-
+#endif
 static void prefs_open_cb      (GtkMenuItem    *menuitem,
                                 gpointer        data);
 static void plugins_open_cb    (GtkMenuItem    *menuitem,
@@ -576,8 +577,10 @@ 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
        {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
@@ -1287,7 +1290,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
 static gboolean warning_icon_pressed(GtkWidget *widget, GdkEventButton *evt,
                                    MainWindow *mainwindow)
 {
@@ -1321,7 +1324,7 @@ static gboolean warning_enter_notify(GtkWidget *widget,
        gdk_window_set_cursor(mainwindow->warning_btn->window, hand_cursor);
        return FALSE;
 }
-
+#endif
 void mainwindow_show_error(void)
 {
        MainWindow *mainwin = mainwindow_get_mainwindow();
@@ -1860,8 +1863,9 @@ static gboolean reflect_prefs_timeout_cb(gpointer data)
        gboolean pixmap_theme_changed = GPOINTER_TO_INT(data);
        GList *cur;
        MainWindow *mainwin;
+#ifndef MAEMO
        GtkWidget *pixmap;
-
+#endif
        for (cur = mainwin_list; cur != NULL; cur = cur->next) {
                mainwin = (MainWindow *)cur->data;
 
@@ -2168,7 +2172,7 @@ static void main_window_show_cur_account(MainWindow *mainwin)
 
        g_free(ac_name);
 }
-
+#ifndef MAEMO
 static void main_window_separation_change(MainWindow *mainwin, LayoutType layout_mode)
 {
        GtkWidget *folder_wid  = GTK_WIDGET_PTR(mainwin->folderview);
@@ -2200,7 +2204,7 @@ static void main_window_separation_change(MainWindow *mainwin, LayoutType layout
        gtk_widget_unref(summary_wid);
        gtk_widget_unref(message_wid);
 }
-
+#endif
 void mainwindow_reset_paned(GtkPaned *paned)
 {
                gint min, max, mid;
@@ -3264,7 +3268,7 @@ static void toolbar_child_detached(GtkWidget *widget, GtkWidget *child,
 {
        gtk_widget_set_size_request(child, -1, -1);
 }
-
+#ifndef MAEMO
 static gboolean ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
                                    gpointer data)
 {
@@ -3282,7 +3286,7 @@ static gboolean ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event
 
        return TRUE;
 }
-
+#endif
 static gint main_window_close_cb(GtkWidget *widget, GdkEventAny *event,
                                 gpointer data)
 {
@@ -4225,14 +4229,14 @@ static void account_receive_menu_cb(GtkMenuItem *menuitem, gpointer data)
 
        inc_account_mail(mainwin, account);
 }
-
+#ifndef MAEMO
 static void account_compose_menu_cb(GtkMenuItem *menuitem, gpointer data)
 {
        PrefsAccount *account = (PrefsAccount *)data;
 
        compose_new_with_folderitem(account, NULL, NULL);
 }
-
+#endif
 static void prefs_open_cb(GtkMenuItem *menuitem, gpointer data)
 {
        prefs_gtk_open();
index 04a011a..9ee70c0 100644 (file)
@@ -77,10 +77,11 @@ static gint messageview_delete_cb   (GtkWidget              *widget,
                                         MessageView            *messageview);
 static void messageview_size_allocate_cb(GtkWidget     *widget,
                                         GtkAllocation  *allocation);
+#ifndef MAEMO
 static gboolean key_pressed            (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         MessageView    *messageview);
-
+#endif
 static void return_receipt_show                (NoticeView     *noticeview, 
                                         MsgInfo        *msginfo);      
 static void return_receipt_send_clicked (NoticeView    *noticeview, 
@@ -489,7 +490,9 @@ void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        GtkWidget *handlebox;
        GtkWidget *vbox;
        GtkWidget *menubar;
+#ifndef MAEMO
        GtkWidget *statusbar = NULL;
+#endif
        guint n_menu_entries;
 
        vbox = gtk_vbox_new(FALSE, 0);
@@ -1368,7 +1371,7 @@ static void messageview_size_allocate_cb(GtkWidget *widget,
        prefs_common.msgwin_width  = allocation->width;
        prefs_common.msgwin_height = allocation->height;
 }
-
+#ifndef MAEMO
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                        MessageView *messageview)
 {
@@ -1385,7 +1388,7 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
        mimeview_pass_key_press_event(messageview->mimeview, event);
        return FALSE;
 }
-
+#endif
 static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
 {
        gchar *addr = NULL;
index 48f927b..0153f22 100644 (file)
@@ -140,11 +140,11 @@ static gboolean adv_condition_entry_focus_evt_in(GtkWidget *widget, GdkEventFocu
                                  gpointer data);
 static gboolean adv_condition_entry_focus_evt_out(GtkWidget *widget, GdkEventFocus *event,
                                  gpointer data);
-
+#ifndef MAEMO
 static gboolean key_pressed            (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         gpointer        data);
-
+#endif
 
 #define GTK_BUTTON_SET_SENSITIVE(widget,sensitive) {   \
        gboolean in_btn = FALSE;                                                        \
@@ -979,7 +979,7 @@ static gboolean adv_condition_entry_focus_evt_out(GtkWidget *widget, GdkEventFoc
        search_window.adv_condition_entry_has_focus = FALSE;
        return FALSE;
 }
-
+#ifndef MAEMO
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                            gpointer data)
 {
@@ -1036,3 +1036,4 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
 
        return FALSE;
 }
+#endif
index 1e82ab7..aa31890 100644 (file)
@@ -313,6 +313,7 @@ static void summary_col_resized             (GtkCList               *clist,
 static void summary_reply_cb           (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
+#ifndef MAEMO
 static void summary_show_all_header_cb (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
@@ -320,13 +321,15 @@ static void summary_show_all_header_cb    (SummaryView            *summaryview,
 static void summary_add_address_cb     (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
+#endif
 static void summary_create_filter_cb   (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
+#ifndef MAEMO
 static void summary_create_processing_cb(SummaryView           *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
-
+#endif
 static void summary_mark_clicked       (GtkWidget              *button,
                                         SummaryView            *summaryview);
 static void summary_status_clicked     (GtkWidget              *button,
@@ -1572,7 +1575,9 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
        GtkItemFactory *ifactory = summaryview->popupfactory;
        SensitiveCond state;
        gboolean sensitive;
+#ifndef MAEMO
        GtkWidget *menuitem;
+#endif
        gint i;
 
        static const struct {
@@ -6286,7 +6291,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
 static void summary_show_all_header_cb(SummaryView *summaryview,
                                       guint action, GtkWidget *widget)
 {
@@ -6301,19 +6306,19 @@ static void summary_add_address_cb(SummaryView *summaryview,
 {
        summary_add_address(summaryview);
 }
-
+#endif
 static void summary_create_filter_cb(SummaryView *summaryview,
                                     guint action, GtkWidget *widget)
 {
        summary_filter_open(summaryview, (PrefsFilterType)action, 0);
 }
-
+#ifndef MAEMO
 static void summary_create_processing_cb(SummaryView *summaryview,
                                         guint action, GtkWidget *widget)
 {
        summary_filter_open(summaryview, (PrefsFilterType)action, 1);
 }
-
+#endif
 static void summary_sort_by_column_click(SummaryView *summaryview,
                                         FolderSortKey sort_key)
 {
index 80c49c0..521b686 100644 (file)
@@ -226,7 +226,7 @@ struct {
        { "toolbar_compose.xml", NULL}, 
        { "toolbar_msgview.xml", NULL}
 };
-
+#ifndef MAEMO
 static GtkItemFactoryEntry reply_entries[] =
 {
        {N_("/Reply with _quote"), NULL,    toolbar_reply, COMPOSE_REPLY_WITH_QUOTE, NULL},
@@ -253,6 +253,7 @@ static GtkItemFactoryEntry forward_entries[] =
        {N_("/For_ward as attachment"), "<shift>F", toolbar_reply, COMPOSE_FORWARD_AS_ATTACH, NULL},
        {N_("/Redirec_t"),              NULL,       toolbar_reply, COMPOSE_REDIRECT, NULL}
 };
+#endif
 static GtkItemFactoryEntry learn_entries[] =
 {
        {N_("/Learn as _Spam"),         NULL,   toolbar_learn, TRUE, NULL},
@@ -2038,12 +2039,12 @@ Toolbar *toolbar_create(ToolbarType      type,
 #ifdef MAEMO
                MainWindow *mainwin = mainwindow_get_mainwindow();
                GtkWidget *progressbar = gtk_progress_bar_new();
-               item = gtk_tool_item_new();
+               item = GTK_WIDGET(gtk_tool_item_new());
                gtk_container_add (GTK_CONTAINER (item), progressbar);
                gtk_widget_show(item);
                gtk_widget_show(progressbar);
                gtk_widget_set_size_request(progressbar, 70, -1);
-               gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);                              \
+               gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);
                mainwin->progressbar = progressbar;
 #endif
                activate_compose_button(toolbar_data, 
@@ -2127,7 +2128,7 @@ void toolbar_update(ToolbarType type, gpointer data)
                return;
        }
 
-       hildon_window_remove_toolbar(HILDON_WINDOW(handlebox), GTK_WIDGET(toolbar_data->toolbar));
+       hildon_window_remove_toolbar(HILDON_WINDOW(handlebox), GTK_TOOLBAR(toolbar_data->toolbar));
 
        toolbar_init(toolbar_data);
        toolbar_data = toolbar_create(type, handlebox, data);
index 9a9aada..b0f20cb 100644 (file)
@@ -1509,13 +1509,13 @@ wizard_response_cb (GtkDialog * dialog, int response, gpointer data)
 {
        WizardWindow * wizard = (WizardWindow *)data;
        int current_page, num_pages;
+       gboolean skip_mailbox_page = FALSE;
+#ifndef MAEMO
        GtkWidget *menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(wizard->recv_type));
        GtkWidget *menuitem = gtk_menu_get_active(GTK_MENU(menu));
        gint protocol = GPOINTER_TO_INT
                        (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
-       gboolean skip_mailbox_page = FALSE;
-       
-#ifndef MAEMO
+
        if (protocol == A_IMAP4) {
                skip_mailbox_page = TRUE;
        }