From 7be9b13b35cf265f9b64657c6dfd6515f3d6f46a Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 11 Jun 2013 15:59:51 +0100 Subject: [PATCH] remove obsolete maemo support --- claws-features.h.in | 2 - configure.ac | 40 ----- src/Makefile.am | 4 - src/account.c | 14 +- src/action.c | 7 +- src/addrcustomattr.c | 9 +- src/addressbook.c | 15 +- src/common/Makefile.am | 4 +- src/common/defs.h | 15 +- src/common/utils.c | 81 +-------- src/compose.c | 37 ---- src/editaddress.c | 7 - src/editldap.c | 6 +- src/edittags.c | 9 +- src/etpan/Makefile.am | 2 - src/folderview.c | 9 +- src/gtk/Makefile.am | 4 +- src/gtk/filesel.c | 37 +--- src/gtk/gtkutils.c | 7 +- src/gtk/gtkutils.h | 12 +- src/gtk/inputdialog.c | 16 -- src/gtk/logwindow.c | 6 +- src/gtk/menu.c | 10 +- src/gtk/prefswindow.c | 18 +- src/inc.c | 99 +---------- src/main.c | 189 +-------------------- src/main.h | 14 +- src/mainwindow.c | 204 ----------------------- src/mainwindow.h | 9 +- src/messageview.c | 30 +--- src/mh.c | 6 +- src/mimeview.c | 53 +----- src/plugins/bogofilter/Makefile.am | 6 +- src/plugins/pgpcore/Makefile.am | 4 - src/plugins/pgpcore/passphrase.c | 6 +- src/plugins/pgpinline/Makefile.am | 5 +- src/plugins/pgpmime/Makefile.am | 4 - src/plugins/smime/Makefile.am | 3 - src/plugins/spamassassin/Makefile.am | 6 +- src/plugins/vcalendar/vcal_meeting_gtk.c | 5 +- src/prefs_account.c | 10 +- src/prefs_actions.c | 9 +- src/prefs_common.c | 23 +-- src/prefs_common.h | 10 +- src/prefs_ext_prog.c | 13 +- src/prefs_filtering.c | 9 +- src/prefs_receive.c | 56 +------ src/prefs_template.c | 9 +- src/prefs_toolbar.c | 2 - src/statusbar.c | 74 +------- src/statusbar.h | 8 +- src/summary_search.c | 12 +- src/summaryview.c | 13 +- src/toolbar.c | 14 +- src/wizard.c | 204 +---------------------- 55 files changed, 65 insertions(+), 1415 deletions(-) diff --git a/claws-features.h.in b/claws-features.h.in index 81ff37fb1..949311611 100644 --- a/claws-features.h.in +++ b/claws-features.h.in @@ -18,6 +18,4 @@ #undef USE_NEW_ADDRBOOK #undef USE_PTHREAD #undef USE_SPAMASSASSIN_PLUGIN -#undef MAEMO -#undef CHINOOK #undef __CYGWIN__ diff --git a/configure.ac b/configure.ac index e1d166b2b..3c692110d 100644 --- a/configure.ac +++ b/configure.ac @@ -242,10 +242,6 @@ AC_ARG_ENABLE(generic-umpc, [ --enable-generic-umpc Build generic UMPC code], [enable_generic_umpc=$enableval], [enable_generic_umpc=no]) -AC_ARG_ENABLE(maemo, - [ --enable-maemo Build for the Maemo platform], - [enable_maemo=$enableval], [enable_maemo=no]) - AC_ARG_ENABLE(compface, [ --disable-compface Do not build compface support for X-Face], [enable_compface=$enableval], [enable_compface=yes]) @@ -574,41 +570,6 @@ if test $enable_generic_umpc = yes; then AC_MSG_RESULT($enable_generic_umpc) fi -dnl Maemo platform -if test $enable_maemo = yes; then - PKG_CHECK_MODULES(MAEMO, libosso hildon-libs hildon-fm gnome-vfs-2.0, enable_maemo=yes, - enable_maemo=no) - AC_SUBST(MAEMO_CFLAGS) - AC_SUBST(MAEMO_LIBS) - if test $enable_maemo = no; then - #test for chinook - PKG_CHECK_MODULES(MAEMO, libosso hildon-1 hildon-fm-2 gnome-vfs-2.0 hal, enable_maemo=yes, - enable_maemo=no) - AC_SUBST(MAEMO_CFLAGS) - AC_SUBST(MAEMO_LIBS) - if test $enable_maemo = no; then - AC_MSG_ERROR(one of libosso hildon-libs hildon-fm hildon-1 hildon-fm-2 not found) - else - AC_DEFINE(MAEMO, 1, Build for maemo) - AC_DEFINE(CHINOOK, 1, Maemo chinook) - AC_DEFINE(GENERIC_UMPC, 1, Generic UMPC code) - enable_generic_umpc=yes - fi - else - AC_DEFINE(MAEMO, 1, Build for maemo) - AC_DEFINE(GENERIC_UMPC, 1, Generic UMPC code) - enable_generic_umpc=yes - fi -fi - -PKG_CHECK_MODULES(CONIC, conic, enable_conic=yes, - enable_conic=no) -AC_SUBST(CONIC_CFLAGS) -AC_SUBST(CONIC_LIBS) -if test $enable_conic = yes; then - AC_DEFINE(CONIC, 1, Have conic lib) -fi - dnl Check for X-Face support AC_MSG_CHECKING([whether to use compface]) if test x"$enable_compface" = xyes; then @@ -1999,7 +1960,6 @@ echo "DBUS : $enable_dbus" echo "NetworkManager : $enable_networkmanager" echo "Manual : $enable_manual" echo "Generic UMPC code : $enable_generic_umpc" -echo "Maemo build : $enable_maemo" echo "Config dir : $ac_cv_with_config_dir" echo "Plugins" diff --git a/src/Makefile.am b/src/Makefile.am index e0d1d5daa..1a173ee9e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -560,8 +560,6 @@ claws_mail_LDADD = \ $(LIBICONV) \ $(STARTUP_NOTIFICATION_LIBS) \ $(LIBETPAN_LIBS) \ - $(MAEMO_LIBS) \ - $(CONIC_LIBS) \ $(DBUS_LIBS) \ $(CONTACTS_LIBS) @@ -581,8 +579,6 @@ AM_CPPFLAGS = \ $(GPGME_CFLAGS) \ $(LIBETPAN_CPPFLAGS) \ $(STARTUP_NOTIFICATION_CFLAGS) \ - $(MAEMO_CFLAGS) \ - $(CONIC_CFLAGS) \ $(DBUS_CFLAGS) \ $(NETWORKMANAGER_SUPPORT_CFLAGS) \ $(VALGRIND_CFLAGS) \ diff --git a/src/account.c b/src/account.c index 110cf5d70..303d9ec89 100644 --- a/src/account.c +++ b/src/account.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -108,11 +108,9 @@ 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 gboolean account_search_func_cb (GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer search_data); @@ -718,12 +716,8 @@ static void account_edit_create(void) gtk_window_set_title (GTK_WINDOW (window), _("Edit accounts")); g_signal_connect (G_OBJECT (window), "delete_event", G_CALLBACK (account_delete_event), NULL); -#ifdef MAEMO - maemo_connect_key_press_to_mainwindow(GTK_WINDOW(window)); -#else g_signal_connect (G_OBJECT (window), "key_press_event", G_CALLBACK (account_key_pressed), NULL); -#endif MANAGE_WINDOW_SIGNALS_CONNECT (window); gtk_widget_realize(window); @@ -848,9 +842,6 @@ static void account_edit_create(void) edit_account.window = window; edit_account.list_view = list_view; edit_account.close_btn = close_btn; -#ifdef MAEMO - maemo_window_full_screen_if_needed(GTK_WINDOW(edit_account.window)); -#endif } static void account_edit_prefs(GtkWidget *widget, gpointer data) @@ -1243,7 +1234,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) { @@ -1251,7 +1242,6 @@ static gboolean account_key_pressed(GtkWidget *widget, GdkEventKey *event, account_edit_close(NULL, NULL); return FALSE; } -#endif static gboolean account_search_func_cb (GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer search_data) diff --git a/src/action.c b/src/action.c index e26ca5704..a6aaf01eb 100644 --- a/src/action.c +++ b/src/action.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto & The Claws Mail Team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto & The Claws Mail Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1327,11 +1327,6 @@ static void create_io_dialog(Children *children) gtk_box_pack_start(GTK_BOX(input_hbox), entry, TRUE, TRUE, 0); if (children->action_type & ACTION_USER_HIDDEN_IN) { gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); -#ifdef MAEMO - hildon_gtk_entry_set_input_mode(GTK_ENTRY(entry), - HILDON_GTK_INPUT_MODE_FULL | - HILDON_GTK_INPUT_MODE_INVISIBLE); -#endif } gtk_widget_show(entry); diff --git a/src/addrcustomattr.c b/src/addrcustomattr.c index acbd57d1d..f3b067ff5 100644 --- a/src/addrcustomattr.c +++ b/src/addrcustomattr.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2007-2012 The Claws Mail Team + * Copyright (C) 2007-2013 The Claws Mail Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -280,15 +280,8 @@ static GtkWidget *custom_attr_window_list_view_create (void) /* create the columns */ custom_attr_window_create_list_view_columns(GTK_WIDGET(list_view)); -#ifndef MAEMO g_signal_connect(G_OBJECT(list_view), "popup-menu", G_CALLBACK(custom_attr_list_popup_menu), list_view); -#else - gtk_widget_tap_and_hold_setup(GTK_WIDGET(list_view), NULL, NULL, - GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS); - g_signal_connect(G_OBJECT(list_view), "tap-and-hold", - G_CALLBACK(custom_attr_list_popup_menu), list_view); -#endif g_signal_connect(G_OBJECT(list_view), "button-press-event", G_CALLBACK(custom_attr_list_btn_pressed), list_view); return GTK_WIDGET(list_view); diff --git a/src/addressbook.c b/src/addressbook.c index 76c8fb59b..31c633df5 100644 --- a/src/addressbook.c +++ b/src/addressbook.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -631,10 +631,7 @@ void addressbook_open(Compose *target) } gtk_widget_show_all(addrbook.window); -#ifdef MAEMO - maemo_window_full_screen_if_needed(GTK_WINDOW(addrbook.window)); - maemo_connect_key_press_to_mainwindow(GTK_WINDOW(addrbook.window)); -#endif + if (!prefs_common.addressbook_use_editaddress_dialog) addressbook_edit_person_widgetset_hide(); @@ -938,11 +935,7 @@ static void addressbook_create(void) gtk_action_group_add_actions(action_group, addressbook_list_popup_entries, G_N_ELEMENTS(addressbook_list_popup_entries), NULL); -#ifndef MAEMO MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR) -#else - MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP) -#endif MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu", "Book", "Book", GTK_UI_MANAGER_MENU) MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu", "Address", "Address", GTK_UI_MANAGER_MENU) @@ -997,11 +990,7 @@ static void addressbook_create(void) menubar = gtk_ui_manager_get_widget(ui_manager, "/Menu"); -#ifndef MAEMO gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0); -#else - hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar)); -#endif vbox2 = gtk_vbox_new(FALSE, BORDER_WIDTH); gtk_container_set_border_width(GTK_CONTAINER(vbox2), BORDER_WIDTH); diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 97f8d9964..1f3bdfb1b 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -75,7 +75,6 @@ INCLUDES = \ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ - $(MAEMO_CFLAGS) \ $(VALGRIND_CFLAGS) \ -DLOCALEDIR=\""$(localedir)"\" \ -DPLUGINDIR=\"$(PLUGINDIR)\" \ @@ -86,8 +85,7 @@ AM_CPPFLAGS = \ libclawscommon_la_LIBADD = \ $(GLIB_LIBS) \ $(CRYPT_LIBS) \ - $(PTHREAD_LIBS) \ - $(MAEMO_LIBS) + $(PTHREAD_LIBS) EXTRA_DIST = \ version.h.in fnmatch_loop.c diff --git a/src/common/defs.h b/src/common/defs.h index cd27480f2..72422adf9 100644 --- a/src/common/defs.h +++ b/src/common/defs.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -103,11 +103,6 @@ #define MARK_VERSION 2 #define TAGS_VERSION 1 -#ifdef MAEMO -#define MMC1_PATH "/media/mmc1" -#define MMC2_PATH "/media/mmc2" -#endif - #ifdef G_OS_WIN32 # define ACTIONS_RC "actionswinrc" # define COMMAND_HISTORY "command_history_win" @@ -116,11 +111,7 @@ #else # define ACTIONS_RC "actionsrc" # define COMMAND_HISTORY "command_history" -# ifndef MAEMO # define DEFAULT_SIGNATURE ".signature" -# else -# define DEFAULT_SIGNATURE "MyDocs/signature.txt" -# endif #endif #define DEFAULT_INC_PATH "/usr/bin/mh/inc" @@ -129,11 +120,7 @@ /* #define DEFAULT_INC_PROGRAM "imget" */ #define DEFAULT_SENDMAIL_CMD "/usr/sbin/sendmail -t -i" #define DEFAULT_BROWSER_CMD "firefox '%s'" -#ifndef MAEMO #define DEFAULT_EDITOR_CMD "gedit '%s'" -#else -#define DEFAULT_EDITOR_CMD "leafpad '%s'" -#endif #define DEFAULT_MIME_CMD "metamail -d -b -x -c %s '%s'" #define DEFAULT_IMAGE_VIEWER_CMD "display '%s'" #define DEFAULT_AUDIO_PLAYER_CMD "play '%s'" diff --git a/src/common/utils.c b/src/common/utils.c index a48d4e4cf..0512289d5 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto & The Claws Mail Team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto & The Claws Mail Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -66,15 +66,6 @@ # include #endif -#ifdef MAEMO -#include -#ifdef CHINOOK -# include -#else -# include -#endif -#endif - #include "utils.h" #include "socket.h" #include "../codeconv.h" @@ -1918,77 +1909,23 @@ const gchar *get_mail_base_dir(void) return get_home_dir(); } -#ifdef MAEMO -const gchar *prefs_common_get_data_root(void); -gchar *last_data_root = NULL; -#endif - const gchar *get_news_cache_dir(void) { static gchar *news_cache_dir = NULL; -#ifdef MAEMO - const gchar *data_root = prefs_common_get_data_root(); - if (strcmp2(data_root, last_data_root)) { - g_free(news_cache_dir); - news_cache_dir = NULL; - } -#endif if (!news_cache_dir) -#ifndef MAEMO news_cache_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, NEWS_CACHE_DIR, NULL); -#else - { - if (data_root) { - news_cache_dir = g_strconcat(data_root, G_DIR_SEPARATOR_S, - "Claws", G_DIR_SEPARATOR_S, - g_get_user_name(), G_DIR_SEPARATOR_S, - NEWS_CACHE_DIR, NULL); - g_free(last_data_root); - last_data_root = g_strdup(last_data_root); - } else { - news_cache_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, - NEWS_CACHE_DIR, NULL); - g_free(last_data_root); - last_data_root = NULL; - } - } -#endif + return news_cache_dir; } const gchar *get_imap_cache_dir(void) { static gchar *imap_cache_dir = NULL; -#ifdef MAEMO - const gchar *data_root = prefs_common_get_data_root(); - if (strcmp2(data_root, last_data_root)) { - g_free(imap_cache_dir); - imap_cache_dir = NULL; - } -#endif if (!imap_cache_dir) -#ifndef MAEMO imap_cache_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, IMAP_CACHE_DIR, NULL); -#else - { - if (data_root) { - imap_cache_dir = g_strconcat(data_root, G_DIR_SEPARATOR_S, - "Claws", G_DIR_SEPARATOR_S, - g_get_user_name(), G_DIR_SEPARATOR_S, - IMAP_CACHE_DIR, NULL); - g_free(last_data_root); - last_data_root = g_strdup(last_data_root); - } else { - imap_cache_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, - IMAP_CACHE_DIR, NULL); - g_free(last_data_root); - last_data_root = NULL; - } - } -#endif return imap_cache_dir; } @@ -2240,7 +2177,7 @@ gboolean is_file_entry_exist(const gchar *file) gboolean dirent_is_regular_file(struct dirent *d) { -#if !defined(G_OS_WIN32) && !defined(MAEMO) && defined(HAVE_DIRENT_D_TYPE) +#if !defined(G_OS_WIN32) && defined(HAVE_DIRENT_D_TYPE) if (d->d_type == DT_REG) return TRUE; else if (d->d_type != DT_UNKNOWN) @@ -3421,7 +3358,7 @@ gchar *get_command_output(const gchar *cmdline) return child_stdout; } -#ifndef MAEMO + static gint is_unchanged_uri_char(char c) { switch (c) { @@ -3457,10 +3394,10 @@ 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 + #ifndef G_OS_WIN32 gchar buf[BUFFSIZE]; gchar *p; @@ -3485,12 +3422,6 @@ gint open_uri(const gchar *uri, const gchar *cmdline) execute_command_line(buf, TRUE); #else ShellExecute(NULL, "open", uri, NULL, NULL, SW_SHOW); -#endif -#else - extern osso_context_t *get_osso_context(void); - osso_rpc_run_with_defaults(get_osso_context(), "osso_browser", - OSSO_BROWSER_OPEN_NEW_WINDOW_REQ, NULL, - DBUS_TYPE_STRING, uri, DBUS_TYPE_INVALID); #endif return 0; } diff --git a/src/compose.c b/src/compose.c index a045df531..6b999b145 100644 --- a/src/compose.c +++ b/src/compose.c @@ -7025,15 +7025,8 @@ static GtkWidget *compose_create_attach(Compose *compose) G_CALLBACK(attach_selected), compose); g_signal_connect(G_OBJECT(attach_clist), "button_press_event", G_CALLBACK(attach_button_pressed), compose); -#ifndef MAEMO g_signal_connect(G_OBJECT(attach_clist), "popup-menu", G_CALLBACK(popup_attach_button_pressed), compose); -#else - gtk_widget_tap_and_hold_setup(GTK_WIDGET(attach_clist), NULL, NULL, - GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS); - g_signal_connect(G_OBJECT(attach_clist), "tap-and-hold", - G_CALLBACK(popup_attach_button_pressed), compose); -#endif g_signal_connect(G_OBJECT(attach_clist), "key_press_event", G_CALLBACK(attach_key_pressed), compose); @@ -7382,11 +7375,7 @@ static Compose *compose_create(PrefsAccount *account, gtk_action_group_add_radio_actions(action_group, compose_radio_enc_entries, G_N_ELEMENTS(compose_radio_enc_entries), C_AUTO, G_CALLBACK(compose_set_encoding_cb), (gpointer)compose); -#ifndef MAEMO MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR) -#else - MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP) -#endif MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu", "Message", "Message", GTK_UI_MANAGER_MENU) MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu", "Edit", "Edit", GTK_UI_MANAGER_MENU) @@ -7567,11 +7556,7 @@ static Compose *compose_create(PrefsAccount *account, gtk_widget_show_all(menubar); gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(compose->ui_manager)); -#ifndef MAEMO gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0); -#else - hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar)); -#endif if (prefs_common.toolbar_detachable) { handlebox = gtk_handle_box_new(); @@ -7581,13 +7566,8 @@ static Compose *compose_create(PrefsAccount *account, gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0); gtk_widget_realize(handlebox); -#ifdef MAEMO - compose->toolbar = toolbar_create(TOOLBAR_COMPOSE, window, - (gpointer)compose); -#else compose->toolbar = toolbar_create(TOOLBAR_COMPOSE, handlebox, (gpointer)compose); -#endif vbox2 = gtk_vbox_new(FALSE, 2); gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0); @@ -7698,15 +7678,8 @@ static Compose *compose_create(PrefsAccount *account, G_CALLBACK(text_inserted), compose); g_signal_connect(G_OBJECT(text), "button_press_event", G_CALLBACK(text_clicked), compose); -#ifndef MAEMO g_signal_connect(G_OBJECT(text), "popup-menu", G_CALLBACK(compose_popup_menu), compose); -#else - gtk_widget_tap_and_hold_setup(GTK_WIDGET(text), NULL, NULL, - GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS); - g_signal_connect(G_OBJECT(text), "tap-and-hold", - G_CALLBACK(compose_popup_menu), compose); -#endif g_signal_connect(G_OBJECT(subject_entry), "changed", G_CALLBACK(compose_changed_cb), compose); g_signal_connect(G_OBJECT(subject_entry), "activate", @@ -7730,12 +7703,6 @@ static Compose *compose_create(PrefsAccount *account, /* pane between attach clist and text */ paned = gtk_vpaned_new(); gtk_container_add(GTK_CONTAINER(vbox2), paned); -#ifdef MAEMO - if( maemo_mainwindow_is_fullscreen(mainwindow_get_mainwindow()->window) ) - gtk_widget_set_size_request(edit_vbox, -1, mode == COMPOSE_NEW ? 300 : 280); - else - gtk_widget_set_size_request(edit_vbox, -1, mode == COMPOSE_NEW ? 250 : 230); -#endif gtk_paned_add1(GTK_PANED(paned), notebook); gtk_paned_add2(GTK_PANED(paned), edit_vbox); gtk_widget_show_all(paned); @@ -7932,10 +7899,6 @@ static Compose *compose_create(PrefsAccount *account, gtk_widget_realize(window); } else { gtk_widget_show(window); -#ifdef MAEMO - maemo_window_full_screen_if_needed(GTK_WINDOW(window)); - maemo_connect_key_press_to_mainwindow(GTK_WINDOW(window)); -#endif } return compose; diff --git a/src/editaddress.c b/src/editaddress.c index 079c7cf37..ad243013b 100644 --- a/src/editaddress.c +++ b/src/editaddress.c @@ -923,15 +923,8 @@ static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) { GTK_NOTEBOOK( personeditdlg.notebook ), gtk_notebook_get_nth_page( GTK_NOTEBOOK( personeditdlg.notebook ), pageNum ), label ); -#ifndef MAEMO g_signal_connect(G_OBJECT(ebox_picture), "popup-menu", G_CALLBACK(addressbook_edit_person_picture_popup_menu), NULL); -#else - gtk_widget_tap_and_hold_setup(GTK_WIDGET(ebox_picture), NULL, NULL, - GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS); - g_signal_connect(G_OBJECT(ebox_picture), "tap-and-hold", - G_CALLBACK(addressbook_edit_person_picture_popup_menu), NULL); -#endif g_signal_connect(G_OBJECT(ebox_picture), "button_press_event", G_CALLBACK(addressbook_edit_person_set_picture_cb), NULL); diff --git a/src/editldap.c b/src/editldap.c index 113ae308c..f9ebb5b09 100644 --- a/src/editldap.c +++ b/src/editldap.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2001-2012 Match Grun and the Claws Mail team + * Copyright (C) 2001-2013 Match Grun and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -724,10 +724,6 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl ) gtk_table_attach(GTK_TABLE(table), entry_bindPW, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); gtk_entry_set_visibility(GTK_ENTRY(entry_bindPW), FALSE); -#ifdef MAEMO - hildon_gtk_entry_set_input_mode(GTK_ENTRY(entry_bindPW), - HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE); -#endif CLAWS_SET_TIP(entry_bindPW, _( "The password to be used when connecting as the \"Bind DN\" " \ diff --git a/src/edittags.c b/src/edittags.c index c42e7c7cf..cba893e47 100644 --- a/src/edittags.c +++ b/src/edittags.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2007-2012 The Claws Mail Team + * Copyright (C) 2007-2013 The Claws Mail Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -345,15 +345,8 @@ static GtkWidget *apply_window_list_view_create (void) /* create the columns */ apply_window_create_list_view_columns(GTK_WIDGET(list_view)); -#ifndef MAEMO g_signal_connect(G_OBJECT(list_view), "popup-menu", G_CALLBACK(apply_list_popup_menu), list_view); -#else - gtk_widget_tap_and_hold_setup(GTK_WIDGET(list_view), NULL, NULL, - GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS); - g_signal_connect(G_OBJECT(list_view), "tap-and-hold", - G_CALLBACK(apply_list_popup_menu), list_view); -#endif g_signal_connect(G_OBJECT(list_view), "button-press-event", G_CALLBACK(apply_list_btn_pressed), list_view); return GTK_WIDGET(list_view); diff --git a/src/etpan/Makefile.am b/src/etpan/Makefile.am index b70dc616d..b4bfe62b4 100644 --- a/src/etpan/Makefile.am +++ b/src/etpan/Makefile.am @@ -23,12 +23,10 @@ INCLUDES = \ AM_CPPFLAGS = \ $(GTK_CFLAGS) \ $(LIBETPAN_CFLAGS) \ - $(MAEMO_CFLAGS) \ $(ENCHANT_CFLAGS) libclawsetpan_la_LIBADD = \ ../common/libclawscommon.la \ $(GTK_LIBS) \ $(LIBETPAN_LIBS) \ - $(MAEMO_LIBS) \ $(ENCHANT_LIBS) diff --git a/src/folderview.c b/src/folderview.c index 14b2f5118..a5a7ab0d1 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -470,15 +470,8 @@ static GtkWidget *folderview_ctree_create(FolderView *folderview) g_signal_connect(G_OBJECT(ctree), "button_press_event", G_CALLBACK(folderview_button_pressed), folderview); -#ifndef MAEMO g_signal_connect(G_OBJECT(ctree), "popup-menu", G_CALLBACK(folderview_popup_menu), folderview); -#else - gtk_widget_tap_and_hold_setup(GTK_WIDGET(ctree), NULL, NULL, - GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS); - g_signal_connect(G_OBJECT(ctree), "tap-and-hold", - G_CALLBACK(folderview_popup_menu), folderview); -#endif g_signal_connect(G_OBJECT(ctree), "button_release_event", G_CALLBACK(folderview_button_released), folderview); diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am index 5e7ee678a..8c5603655 100644 --- a/src/gtk/Makefile.am +++ b/src/gtk/Makefile.am @@ -81,7 +81,6 @@ AM_CPPFLAGS = \ -I$(srcdir)/.. \ -I$(builddir)/.. \ $(GTK_CFLAGS) \ - $(MAEMO_CFLAGS) \ $(ENCHANT_CFLAGS) \ -DPLUGINDIR=\"$(PLUGINDIR)\" \ -DDOCDIR=\"$(DOCDIR)\" @@ -89,8 +88,7 @@ AM_CPPFLAGS = \ libclawsgtk_la_LIBADD = \ ../common/libclawscommon.la \ $(GTK_LIBS) \ - $(ENCHANT_LIBS) \ - $(MAEMO_LIBS) + $(ENCHANT_LIBS) BUILT_SOURCES=claws-marshal.c claws-marshal.h diff --git a/src/gtk/filesel.c b/src/gtk/filesel.c index 815c4d187..b8276aeba 100644 --- a/src/gtk/filesel.c +++ b/src/gtk/filesel.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,14 +26,6 @@ #include #include -#ifdef MAEMO -#ifdef CHINOOK -#include -#else -#include -#endif -#endif - #include "claws.h" #include "filesel.h" #include "manage_window.h" @@ -90,27 +82,6 @@ static GList *filesel_create(const gchar *title, const gchar *path, GTK_FILE_CHOOSER_ACTION_SAVE); gchar * action_btn = (open == TRUE) ? GTK_STOCK_OPEN:GTK_STOCK_SAVE; -#ifdef MAEMO - GtkWidget *chooser; - if( path && strcmp(path, get_plugin_dir()) == 0 ) { -#if !GTK_CHECK_VERSION(2,14,0) - chooser = gtk_file_chooser_dialog_new_with_backend - (title, NULL, action, "gtk+", - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - action_btn, GTK_RESPONSE_ACCEPT, - NULL); -#else - chooser = gtk_file_chooser_dialog_new - (title, NULL, action, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - action_btn, GTK_RESPONSE_ACCEPT, - NULL); -#endif - } - else { - chooser = hildon_file_chooser_dialog_new (NULL, action); - } -#else #if !GTK_CHECK_VERSION(2,14,0) GtkWidget *chooser = gtk_file_chooser_dialog_new_with_backend (title, NULL, action, "gtk+", @@ -124,7 +95,6 @@ static GList *filesel_create(const gchar *title, const gchar *path, action_btn, GTK_RESPONSE_ACCEPT, NULL); #endif -#endif #if GLIB_CHECK_VERSION(2,16,0) gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(chooser), FALSE); @@ -193,12 +163,7 @@ static GList *filesel_create(const gchar *title, const gchar *path, g_free(tmp); } -#ifdef MAEMO - if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_OK - || gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_ACCEPT) -#else if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_ACCEPT) -#endif slist = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (chooser)); manage_window_focus_out(chooser, NULL, NULL); diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c index 72dbf4b77..5f477d974 100644 --- a/src/gtk/gtkutils.c +++ b/src/gtk/gtkutils.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1545,12 +1545,7 @@ gboolean gtkut_tree_model_get_iter_last(GtkTreeModel *model, GtkWidget *gtkut_window_new (GtkWindowType type, const gchar *class) { -#ifndef MAEMO GtkWidget *window = gtk_window_new(type); -#else - GtkWidget *window = hildon_window_new(); - hildon_program_add_window(hildon_program, HILDON_WINDOW(window)); -#endif gtk_window_set_role(GTK_WINDOW(window), class); return window; } diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h index 47d8561e3..de01d4f5f 100644 --- a/src/gtk/gtkutils.h +++ b/src/gtk/gtkutils.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,16 +32,6 @@ # include #endif -#ifdef MAEMO -#ifdef CHINOOK -#include -#else -#include -#include -#endif -#include "main.h" -#endif - #include "gtkcmctree.h" #ifndef GDK_KEY_Escape diff --git a/src/gtk/inputdialog.c b/src/gtk/inputdialog.c index e223488ce..3074007f6 100644 --- a/src/gtk/inputdialog.c +++ b/src/gtk/inputdialog.c @@ -101,10 +101,6 @@ gchar *input_dialog(const gchar *title, const gchar *message, gtk_widget_hide(icon_p); is_pass = FALSE; gtk_entry_set_visibility(GTK_ENTRY(entry), TRUE); -#ifdef MAEMO - hildon_gtk_entry_set_input_mode(GTK_ENTRY(entry), - HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP); -#endif return input_dialog_open(title, message, NULL, default_string, FALSE, NULL); } @@ -126,10 +122,6 @@ gchar *input_dialog_with_invisible(const gchar *title, const gchar *message, gtk_widget_show(icon_p); is_pass = TRUE; gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); -#ifdef MAEMO - hildon_gtk_entry_set_input_mode(GTK_ENTRY(entry), - HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE); -#endif return input_dialog_open(title, message, NULL, default_string, FALSE, NULL); } @@ -160,10 +152,6 @@ gchar *input_dialog_with_invisible_checkbtn(const gchar *title, const gchar *mes gtk_widget_show(icon_p); is_pass = TRUE; gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); -#ifdef MAEMO - hildon_gtk_entry_set_input_mode(GTK_ENTRY(entry), - HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE); -#endif return input_dialog_open(title, message, checkbtn_label, default_string, (checkbtn_state? *checkbtn_state:FALSE), checkbtn_state); } @@ -231,10 +219,6 @@ gchar *input_dialog_with_checkbtn(const gchar *title, gtk_widget_hide(icon_p); is_pass = FALSE; gtk_entry_set_visibility(GTK_ENTRY(entry), TRUE); -#ifdef MAEMO - hildon_gtk_entry_set_input_mode(GTK_ENTRY(entry), - HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP); -#endif return input_dialog_open(title, message, checkbtn_label, default_string, prefs_common.inherit_folder_props, checkbtn_state); diff --git a/src/gtk/logwindow.c b/src/gtk/logwindow.c index d94eeb0e1..c49d83662 100644 --- a/src/gtk/logwindow.c +++ b/src/gtk/logwindow.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -249,10 +249,6 @@ void log_window_show(LogWindow *logwin) gtk_window_deiconify(GTK_WINDOW(logwin->window)); gtk_widget_show(logwin->window); gtk_window_present(GTK_WINDOW(logwin->window)); -#ifdef MAEMO - maemo_window_full_screen_if_needed(GTK_WINDOW(logwin->window)); - maemo_connect_key_press_to_mainwindow(GTK_WINDOW(logwin->window)); -#endif } static void log_window_jump_to_error(LogWindow *logwin) diff --git a/src/gtk/menu.c b/src/gtk/menu.c index c08c5fcf8..bd1c61a15 100644 --- a/src/gtk/menu.c +++ b/src/gtk/menu.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,14 +34,6 @@ #include "gtkutils.h" #include "defs.h" -#ifdef MAEMO -#ifdef CHINOOK -#include -#else -#include -#endif -#endif - GtkActionGroup *cm_menu_create_action_group(const gchar *name, GtkActionEntry *entries, gint num_entries, gpointer data) { diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c index 936fe8eb7..57b1c5788 100644 --- a/src/gtk/prefswindow.c +++ b/src/gtk/prefswindow.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail Team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -197,14 +197,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; @@ -216,7 +216,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) { @@ -243,7 +243,7 @@ static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event, } return FALSE; } -#endif + typedef struct FindNodeByName { const gchar *name; gboolean found; @@ -564,13 +564,8 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages, g_signal_connect(G_OBJECT(prefswindow->window), "delete_event", G_CALLBACK(window_closed), prefswindow); - -#ifdef MAEMO - maemo_connect_key_press_to_mainwindow(GTK_WINDOW(prefswindow->window)); -#else g_signal_connect(G_OBJECT(prefswindow->window), "key_press_event", G_CALLBACK(prefswindow_key_pressed), &(prefswindow->window)); -#endif /* connect to callback only if we have non-NULL pointers to store size to */ if (prefswindow->save_width && prefswindow->save_height) { @@ -601,9 +596,6 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages, prefs_show_sections(prefswindow); #endif gtk_widget_show(prefswindow->window); -#ifdef MAEMO - maemo_window_full_screen_if_needed(GTK_WINDOW(prefswindow->window)); -#endif adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1)); gtk_adjustment_set_value(adj, gtk_adjustment_get_lower(adj)); diff --git a/src/inc.c b/src/inc.c index 1a63e8549..80ad90d8b 100644 --- a/src/inc.c +++ b/src/inc.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -60,25 +60,6 @@ #include "hooks.h" #include "logwindow.h" -#ifdef MAEMO -#ifdef CHINOOK -#include -#include -#else -#include -#include -#endif -#include - -#ifdef CONIC -#include -#include - -static ConIcConnection *maemo_connection = NULL; -static gboolean maemo_warned_offline = FALSE; -#endif -#endif - extern SessionStats session_stats; static GList *inc_dialog_list = NULL; @@ -1414,13 +1395,8 @@ void inc_unlock_real(void) static guint autocheck_timer = 0; static gpointer autocheck_data = NULL; -#ifdef MAEMO -osso_context_t *get_osso_context(void); -#endif - static void inc_notify_cmd(gint new_msgs, gboolean notify) { -#ifndef MAEMO gchar *buf, *numpos, *ret_str; gssize by_read = 0, by_written = 0; @@ -1448,65 +1424,12 @@ static void inc_notify_cmd(gint new_msgs, gboolean notify) execute_command_line(buf, TRUE); g_free(buf); - -#else - if (new_msgs) { - if (prefs_common.maemo_play_sound) - hildon_play_system_sound("/usr/share/sounds/ui-new_email.wav"); - if (prefs_common.maemo_show_banner) { - gchar *info = g_strdup_printf(ngettext("Claws Mail: %d new message", - "Claws Mail: %d new messages", - new_msgs), new_msgs); - osso_system_note_infoprint(get_osso_context(), info, NULL); - g_free(info); - } - } -#endif } -#if (defined(MAEMO) && defined(CONIC)) -static void maemo_connection_event(ConIcConnection *connection, - ConIcConnectionEvent *event, - gpointer user_data) -{ - ConIcConnectionStatus status = - con_ic_connection_event_get_status(event); - MainWindow *mainwin = (MainWindow *)user_data; - switch(status) { - case CON_IC_STATUS_CONNECTED: - debug_print("we're connected\n"); - main_window_toggle_work_offline(mainwin, FALSE, FALSE); - break; - default: - debug_print("we're disconnected\n"); - main_window_toggle_work_offline(mainwin, TRUE, FALSE); - maemo_warned_offline = FALSE; - break; - } -} - -#endif - void inc_autocheck_timer_init(MainWindow *mainwin) { -#if (defined(MAEMO) && defined(CONIC)) - GValue *val = g_new0(GValue, 1); - maemo_connection = con_ic_connection_new(); - - g_value_init(val, G_TYPE_BOOLEAN); - g_value_set_boolean(val, TRUE); - g_object_set_property(G_OBJECT(maemo_connection), - "automatic-connection-events", val); - g_free(val); - g_signal_connect (maemo_connection, "connection-event", - G_CALLBACK(maemo_connection_event), mainwin); - con_ic_connection_connect (maemo_connection, - CON_IC_CONNECT_FLAG_AUTOMATICALLY_TRIGGERED); - autocheck_data = mainwin; -#else autocheck_data = mainwin; inc_autocheck_timer_set(); -#endif } static void inc_autocheck_timer_set_interval(guint interval) @@ -1531,10 +1454,6 @@ static void inc_autocheck_timer_set_interval(guint interval) void inc_autocheck_timer_set(void) { inc_autocheck_timer_set_interval(prefs_common.autochk_itv * 60000); -#if (defined(MAEMO) && defined(CONIC)) - con_ic_connection_connect (maemo_connection, - CON_IC_CONNECT_FLAG_AUTOMATICALLY_TRIGGERED); -#endif } void inc_autocheck_timer_remove(void) @@ -1574,22 +1493,6 @@ gboolean inc_offline_should_override(gboolean force_ask, const gchar *msg) return FALSE; #endif -#if (defined(MAEMO) && defined(CONIC)) - if (prefs_common.work_offline) { - if (force_ask && !maemo_warned_offline) { - if (mainwindow_get_mainwindow()) - hildon_banner_show_information( - mainwindow_get_mainwindow()->window, - NULL, - _("Unable to connect: you are offline.")); - maemo_warned_offline = TRUE; - } - return FALSE; - } else { - return TRUE; - } -#endif - if (prefs_common.autochk_newmail) length = prefs_common.autochk_itv; /* minutes */ diff --git a/src/main.c b/src/main.c index 37b210ed6..f51b36f30 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -141,34 +141,6 @@ #include "timing.h" -#ifdef MAEMO -#ifdef CHINOOK -#include -#include -#else -#include -#include -#endif -#include -#include -#include -#include - -#define OSSO_NAME "claws_mail" -#define OSSO_SERVICE "com.nokia."OSSO_NAME -#define OSSO_OBJECT "/com/nokia/"OSSO_NAME -#define OSSO_IFACE "com.nokia."OSSO_NAME - -typedef struct _AppData AppData; -struct _AppData { - HildonProgram *program; - HildonWindow *window; - osso_context_t *osso_context; -}; - -static GnomeVFSVolumeMonitor *volmon; -#endif - #ifdef HAVE_NETWORKMANAGER_SUPPORT /* Went offline due to NetworkManager */ static gboolean went_offline_nm; @@ -185,10 +157,6 @@ static DBusGProxy *awn_proxy = NULL; gchar *prog_version; gchar *argv0; -#ifdef MAEMO -HildonProgram *hildon_program; -#endif - #ifdef HAVE_STARTUP_NOTIFICATION static SnLauncheeContext *sn_context = NULL; static SnDisplay *sn_display = NULL; @@ -281,51 +249,6 @@ static void networkmanager_state_change_cb(DBusGProxy *proxy, gchar *dev, static MainWindow *static_mainwindow; -#ifdef MAEMO -static osso_context_t *static_osso_context; - -void exit_event_handler(gboolean die_now, gpointer data) -{ - AppData *appdata; - appdata = (AppData *) data; - /* Do whatever application needs to do before exiting */ - exit_claws(static_mainwindow); - hildon_banner_show_information(GTK_WIDGET(appdata->window), NULL, - _("Exiting...")); - -} - -/* Callback for hardware D-BUS events */ -void hw_event_handler(osso_hw_state_t *state, gpointer data) -{ - AppData *appdata; - appdata = (AppData *) data; - - if (state->shutdown_ind) { - exit_claws(static_mainwindow); - hildon_banner_show_information(GTK_WIDGET(appdata->window), NULL, - _("Exiting...")); - } -} - -/* Callback for normal D-BUS messages */ -gint dbus_req_handler(const gchar * interface, const gchar * method, - GArray * arguments, gpointer data, - osso_rpc_t * retval) -{ - AppData *appdata; - appdata = (AppData *) data; - - if (!strcmp(method, "top_application")) { - osso_rpc_free_val(retval); - return OSSO_OK; - } - osso_system_note_infoprint(appdata->osso_context, method, retval); - osso_rpc_free_val(retval); - - return OSSO_OK; -} -#endif static gboolean emergency_exit = FALSE; #ifdef HAVE_STARTUP_NOTIFICATION @@ -736,35 +659,6 @@ void main_set_show_at_startup(gboolean show) show_at_startup = show; } -#ifdef MAEMO -static void main_vol_mount_cb(GnomeVFSVolumeMonitor *vfs, GnomeVFSVolume *vol, MainWindow *mainwin) -{ - gchar *uri = gnome_vfs_volume_get_activation_uri (vol); - gchar *mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL; - g_free (uri); - if (mount_path) { - if(!strcmp(mount_path, prefs_common.data_root)) { - gtk_widget_set_sensitive(mainwin->window, TRUE); - inc_unlock(); - } - } - g_free(mount_path); -} -static void main_vol_unmount_cb(GnomeVFSVolumeMonitor *vfs, GnomeVFSVolume *vol, MainWindow *mainwin) -{ - gchar *uri = gnome_vfs_volume_get_activation_uri (vol); - gchar *mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL; - g_free (uri); - if (mount_path) { - if(!strcmp(mount_path, prefs_common.data_root)) { - gtk_widget_set_sensitive(mainwin->window, FALSE); - inc_lock(); - } - } - g_free(mount_path); -} -#endif - #ifdef G_OS_WIN32 static FILE* win32_debug_fp=NULL; static guint win32_log_handler_app_id; @@ -1062,10 +956,6 @@ static void reset_statistics(void) int main(int argc, char *argv[]) { -#ifdef MAEMO - osso_context_t *osso_context; - osso_return_t result; -#endif #ifdef HAVE_DBUS_GLIB DBusGConnection *connection; GError *error; @@ -1202,15 +1092,6 @@ int main(int argc, char *argv[]) } #endif - -#ifdef MAEMO - osso_context = osso_initialize(OSSO_SERVICE, "2.8.1", TRUE, NULL); - if (osso_context == NULL) { - return OSSO_ERROR; - } - hildon_program = HILDON_PROGRAM(hildon_program_get_instance()); - static_osso_context = osso_context; -#endif #if !GTK_CHECK_VERSION(3, 0, 0) gtk_widget_set_default_colormap( gdk_screen_get_system_colormap( @@ -1398,33 +1279,6 @@ int main(int argc, char *argv[]) networkmanager_state_change_cb(nm_proxy,NULL,mainwin); #endif -#ifdef MAEMO - AppData *appdata; - appdata = g_new0(AppData, 1); - appdata->program = hildon_program; - appdata->window = HILDON_WINDOW(mainwin->window); - appdata->osso_context = osso_context; - result = osso_rpc_set_cb_f(appdata->osso_context, - OSSO_SERVICE, - OSSO_OBJECT, - OSSO_IFACE, - dbus_req_handler, appdata); - if (result != OSSO_OK) { - return OSSO_ERROR; - } - -#ifndef CHINOOK - /* Add handler for Exit D-BUS messages */ - result = osso_application_set_exit_cb(appdata->osso_context, - exit_event_handler, - (gpointer) appdata); - if (result != OSSO_OK) { - return OSSO_ERROR; - } -#endif - osso_hw_set_event_cb( appdata->osso_context, - NULL, hw_event_handler, (gpointer) appdata ); -#endif manage_window_focus_in(mainwin->window, NULL, NULL); folderview = mainwin->folderview; @@ -1620,36 +1474,6 @@ int main(int argc, char *argv[]) static_mainwindow = mainwin; -#ifdef MAEMO - if (prefs_common.data_root != NULL && *prefs_common.data_root != '\0') { - GnomeVFSVolume *vol = NULL; - gchar *uri, *mount_path; - - volmon = gnome_vfs_get_volume_monitor(); - vol = gnome_vfs_volume_monitor_get_volume_for_path(volmon, prefs_common.data_root); - - uri = gnome_vfs_volume_get_activation_uri (vol); - mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL; - g_free(uri); - - if (vol == NULL || !gnome_vfs_volume_is_mounted(vol) - || strcmp(mount_path, prefs_common.data_root)) { - alertpanel_error(_("Claws Mail can not start without its data volume (%s)."), - prefs_common.data_root); - g_free(mount_path); - gnome_vfs_volume_unref(vol); - exit_claws(mainwin); - exit(1); - } - g_free(mount_path); - gnome_vfs_volume_unref(vol); - g_signal_connect(G_OBJECT(volmon), - "volume-mounted", G_CALLBACK(main_vol_mount_cb), mainwin); - g_signal_connect(G_OBJECT(volmon), - "volume-unmounted", G_CALLBACK(main_vol_unmount_cb), mainwin); - } -#endif - #ifdef HAVE_STARTUP_NOTIFICATION startup_notification_complete(FALSE); #endif @@ -1720,9 +1544,6 @@ int main(int argc, char *argv[]) gtk_main(); -#ifdef MAEMO - osso_deinitialize(osso_context); -#endif #ifdef HAVE_NETWORKMANAGER_SUPPORT if(nm_proxy) g_object_unref(nm_proxy); @@ -2962,14 +2783,6 @@ static void install_memory_sighandler() } #endif /* linux && SIGIO */ -#ifdef MAEMO -osso_context_t *get_osso_context(void) -{ - return static_osso_context; -} -#endif - - #ifdef HAVE_NETWORKMANAGER_SUPPORT static void networkmanager_state_change_cb(DBusGProxy *proxy, gchar *dev, gpointer data) diff --git a/src/main.h b/src/main.h index 8b2d1bd75..b1fb2fd70 100644 --- a/src/main.h +++ b/src/main.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,23 +22,11 @@ #include #include -#ifdef MAEMO -#ifdef CHINOOK -#include -#else -#include -#include -#endif -#endif #include extern gchar *prog_version; extern gboolean debug_mode; -#ifdef MAEMO -extern HildonProgram *hildon_program; -#endif - typedef struct _SessionStats SessionStats; struct _SessionStats diff --git a/src/mainwindow.c b/src/mainwindow.c index 8b4ef16f9..7830646bf 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -812,9 +812,7 @@ static GtkToggleActionEntry mainwin_toggle_entries[] = { {"View/HideReadThreads", NULL, N_("Hide read threads"), NULL, NULL, G_CALLBACK(hide_read_threads) }, /* toggle */ {"View/HideReadMessages", NULL, N_("_Hide read messages"), NULL, NULL, G_CALLBACK(hide_read_messages) }, /* toggle */ {"View/HideDelMessages", NULL, N_("Hide deleted messages"), NULL, NULL, G_CALLBACK(hide_del_messages) }, /* toggle */ -#ifndef MAEMO {"View/FullScreen", NULL, N_("_Fullscreen"), "F11", NULL, G_CALLBACK(toggle_fullscreen_cb) }, /* toggle */ -#endif {"View/AllHeaders", NULL, N_("Show all _headers"), "H", NULL, G_CALLBACK(show_all_header_cb) }, /* toggle */ {"View/Quotes/CollapseAll", NULL, N_("_Collapse all"), "Q", NULL, G_CALLBACK(hide_quotes_cb) }, /* 1 toggle */ {"View/Quotes/Collapse2", NULL, N_("Collapse from level _2"), NULL, NULL, G_CALLBACK(hide_quotes_cb) }, /* 2 toggle */ @@ -1378,13 +1376,11 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event, switch (event->keyval) { case GDK_KEY_Q: /* Quit */ -#ifndef MAEMO BREAK_ON_MODIFIER_KEY(); if (gtk_window_is_active(GTK_WINDOW(mainwin->window))) { app_exit_cb(NULL, mainwin); } -#endif return FALSE; case GDK_KEY_space: BREAK_ON_MODIFIER_KEY(); @@ -1400,72 +1396,6 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event, } } break; - -#ifdef MAEMO - case GDK_KEY_F6: - if (maemo_mainwindow_is_fullscreen(widget)) { - gtk_window_unfullscreen(GTK_WINDOW(widget)); - } else { - gtk_window_fullscreen(GTK_WINDOW(widget)); - } - break; - case GDK_KEY_F7: - { - PangoFontDescription *font_desc; - int size; - font_desc = pango_font_description_from_string(prefs_common.normalfont); - size = pango_font_description_get_size(font_desc)/PANGO_SCALE; - if (size < 30) { - size++; pango_font_description_set_size(font_desc, size*PANGO_SCALE); - g_free(prefs_common.normalfont); - prefs_common.normalfont = pango_font_description_to_string(font_desc); - main_window_reflect_prefs_all(); - } - pango_font_description_free(font_desc); - font_desc = pango_font_description_from_string(prefs_common.textfont); - size = pango_font_description_get_size(font_desc)/PANGO_SCALE; - if (size < 30) { - size++; pango_font_description_set_size(font_desc, size*PANGO_SCALE); - g_free(prefs_common.textfont); - prefs_common.textfont = pango_font_description_to_string(font_desc); - main_window_reflect_prefs_all(); - } - pango_font_description_free(font_desc); - } - break; - case GDK_KEY_F8: - { - PangoFontDescription *font_desc; - int size; - font_desc = pango_font_description_from_string(prefs_common.normalfont); - size = pango_font_description_get_size(font_desc)/PANGO_SCALE; - if (size > 5) { - size--; pango_font_description_set_size(font_desc, size*PANGO_SCALE); - g_free(prefs_common.normalfont); - prefs_common.normalfont = pango_font_description_to_string(font_desc); - main_window_reflect_prefs_all(); - } - pango_font_description_free(font_desc); - font_desc = pango_font_description_from_string(prefs_common.textfont); - size = pango_font_description_get_size(font_desc)/PANGO_SCALE; - if (size > 5) { - size--; pango_font_description_set_size(font_desc, size*PANGO_SCALE); - g_free(prefs_common.textfont); - prefs_common.textfont = pango_font_description_to_string(font_desc); - main_window_reflect_prefs_all(); - } - pango_font_description_free(font_desc); - } - break; - case GDK_KEY_Escape: - if (mainwin->summaryview && - mainwin->summaryview->ext_messageview && - mainwin->summaryview->ext_messageview->window && - widget == mainwin->summaryview->ext_messageview->window) { - messageview_destroy(mainwin->summaryview->ext_messageview); - } - break; -#endif default: break; } @@ -1474,97 +1404,6 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event, #undef BREAK_ON_MODIFIER_KEY -#ifdef MAEMO -void mainwindow_maemo_led_set(gboolean state) { - static gint last_state = -1; - if (last_state == state) - return; - last_state = (gint)state; - if (prefs_common.maemo_show_led) { - if(state) { - execute_command_line("/usr/bin/dbus-send --system --type=method_call " - "--dest=com.nokia.mce " - "/com/nokia/mce/request com.nokia.mce.request.req_led_pattern_activate " - "string:PatternCommunicationEvent", TRUE); - execute_command_line("/usr/bin/dbus-send --system --type=method_call " - "--dest=com.nokia.mce " - "/com/nokia/mce/request com.nokia.mce.request.req_led_pattern_activate " - "string:PatternCommunicationEmail", TRUE); - } else { - execute_command_line("/usr/bin/dbus-send --system --type=method_call " - "--dest=com.nokia.mce " - "/com/nokia/mce/request com.nokia.mce.request.req_led_pattern_deactivate " - "string:PatternCommunicationEvent", TRUE); - execute_command_line("/usr/bin/dbus-send --system --type=method_call " - "--dest=com.nokia.mce " - "/com/nokia/mce/request com.nokia.mce.request.req_led_pattern_deactivate " - "string:PatternCommunicationEmail", TRUE); - } - } -} - -static void led_update(FolderItem *removed_item) -{ - guint new, unread, unreadmarked, marked, total, replied; - guint forwarded, locked, ignored, watched; - - folder_count_total_msgs(&new, &unread, &unreadmarked, &marked, &total, - &replied, &forwarded, &locked, &ignored, - &watched); - if (removed_item) { - total -= removed_item->total_msgs; - new -= removed_item->new_msgs; - unread -= removed_item->unread_msgs; - } - - if (new > 0) - mainwindow_maemo_led_set(TRUE); - else - mainwindow_maemo_led_set(FALSE); -} - -static gboolean maemo_folder_item_update_hook(gpointer source, gpointer data) -{ - led_update(NULL); - - return FALSE; -} - -static gboolean maemo_folder_update_hook(gpointer source, gpointer data) -{ - FolderUpdateData *hookdata; - hookdata = source; - if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM) - led_update(hookdata->item); - else - led_update(NULL); - - return FALSE; -} - -static void main_window_install_maemo_hooks(MainWindow *mainwin) -{ - gint maemo_item_hook_id, maemo_folder_hook_id; - - maemo_item_hook_id = hooks_register_hook (FOLDER_ITEM_UPDATE_HOOKLIST, maemo_folder_item_update_hook, NULL); - if (maemo_item_hook_id == -1) { - goto err_out_item; - } - - maemo_folder_hook_id = hooks_register_hook (FOLDER_UPDATE_HOOKLIST, maemo_folder_update_hook, NULL); - if (maemo_folder_hook_id == -1) { - goto err_out_folder; - } - - return; - -err_out_folder: - hooks_unregister_hook(FOLDER_ITEM_UPDATE_HOOKLIST, maemo_item_hook_id); -err_out_item: - return; -} -#endif - MainWindow *main_window_create() { MainWindow *mainwin; @@ -1659,11 +1498,7 @@ MainWindow *main_window_create() gtk_action_group_add_radio_actions(mainwin->action_group, mainwin_radio_dec_entries, G_N_ELEMENTS(mainwin_radio_dec_entries), C_AUTO, G_CALLBACK(set_decode_cb), (gpointer)mainwin); -#ifndef MAEMO MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR) -#else - MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP) -#endif MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "File", "File", GTK_UI_MANAGER_MENU) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "Edit", "Edit", GTK_UI_MANAGER_MENU) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "View", "View", GTK_UI_MANAGER_MENU) @@ -1725,9 +1560,7 @@ MainWindow *main_window_create() MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/SetColumns", "Messagelist", "View/SetColumns/Messagelist", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Separator1", "View/---", GTK_UI_MANAGER_SEPARATOR) -#ifndef MAEMO MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "FullScreen", "View/FullScreen", GTK_UI_MANAGER_MENUITEM) -#endif #ifndef GENERIC_UMPC MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Layout", "View/Layout", GTK_UI_MANAGER_MENU) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Layout", "Standard", "View/Layout/Standard", GTK_UI_MANAGER_MENUITEM) @@ -2043,11 +1876,7 @@ MainWindow *main_window_create() gtk_widget_show_all(menubar); gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(mainwin->ui_manager)); -#ifndef MAEMO gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0); -#else - hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar)); -#endif if (prefs_common.toolbar_detachable) { handlebox = gtk_handle_box_new(); @@ -2066,15 +1895,9 @@ MainWindow *main_window_create() mainwin->window = window; mainwin_list = g_list_append(mainwin_list, mainwin); -#ifdef MAEMO - mainwin->toolbar = toolbar_create(TOOLBAR_MAIN, - window, - (gpointer)mainwin); -#else mainwin->toolbar = toolbar_create(TOOLBAR_MAIN, handlebox, (gpointer)mainwin); -#endif toolbar_set_learn_button (mainwin->toolbar, LEARN_SPAM); @@ -2377,16 +2200,11 @@ MainWindow *main_window_create() mainwindow_colorlabel_menu_create(mainwin, FALSE); mainwindow_tags_menu_create(mainwin, FALSE); -#ifdef MAEMO - main_window_install_maemo_hooks(mainwin); -#endif -#ifndef MAEMO if (prefs_common.mainwin_fullscreen) { cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/FullScreen", TRUE); } -#endif return mainwin; } @@ -5621,25 +5439,3 @@ static void goto_prev_part_cb(GtkAction *action, gpointer data) && mainwin->messageview->mimeview) mimeview_select_prev_part(mainwin->messageview->mimeview); } - -#ifdef MAEMO -gboolean maemo_mainwindow_is_fullscreen(GtkWidget *widget) -{ - gint w, h; - gtk_window_get_size(GTK_WINDOW(widget), &w, &h); - return (w == 800); -} - -void maemo_window_full_screen_if_needed (GtkWindow *window) -{ - if (maemo_mainwindow_is_fullscreen(mainwindow_get_mainwindow()->window)) { - gtk_window_fullscreen(GTK_WINDOW(window)); - } -} - -void maemo_connect_key_press_to_mainwindow (GtkWindow *window) -{ - g_signal_connect(G_OBJECT(window), "key_press_event", - G_CALLBACK(mainwindow_key_pressed), mainwindow_get_mainwindow()); -} -#endif diff --git a/src/mainwindow.h b/src/mainwindow.h index 1f12a014f..6579f9e15 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -220,13 +220,6 @@ void mainwindow_exit_folder (MainWindow *mainwin); void mainwindow_enter_folder (MainWindow *mainwin); void mainwindow_reset_paned (GtkPaned *paned); -#ifdef MAEMO -gboolean maemo_mainwindow_is_fullscreen (GtkWidget *widget); -void maemo_window_full_screen_if_needed (GtkWindow *window); -void maemo_connect_key_press_to_mainwindow (GtkWindow *window); -void mainwindow_maemo_led_set(gboolean state); -#endif - void mainwin_accel_changed_cb (GtkAccelGroup *accelgroup, guint keyval, GdkModifierType modifier, GClosure *closure, GtkMenuItem *item); diff --git a/src/messageview.c b/src/messageview.c index be70c1fae..895c0e768 100644 --- a/src/messageview.c +++ b/src/messageview.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -80,11 +80,9 @@ 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, @@ -481,12 +479,7 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window) gtk_action_group_add_radio_actions(action_group, msgview_radio_dec_entries, G_N_ELEMENTS(msgview_radio_dec_entries), C_AUTO, G_CALLBACK(set_decode_cb), (gpointer)msgview); -#ifndef MAEMO MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR) -#else - MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP) -#endif - MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "File", "File", GTK_UI_MANAGER_MENU) MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "Edit", "Edit", GTK_UI_MANAGER_MENU) MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "View", "View", GTK_UI_MANAGER_MENU) @@ -670,11 +663,7 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window) gtk_widget_show_all(menubar); gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(msgview->ui_manager)); -#ifndef MAEMO gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0); -#else - hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar)); -#endif cm_toggle_menu_set_active_full(msgview->ui_manager, "Menu/View/AllHeaders", prefs_common.show_all_headers); @@ -686,12 +675,6 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window) } gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0); gtk_widget_realize(handlebox); -#ifdef MAEMO - msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, window, - (gpointer)msgview); - msgview->statusbar = NULL; - msgview->statusbar_cid = 0; -#else msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, handlebox, (gpointer)msgview); #ifndef GENERIC_UMPC @@ -705,7 +688,6 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window) msgview->statusbar = NULL; msgview->statusbar_cid = 0; #endif -#endif msgview->handlebox = handlebox; @@ -749,12 +731,8 @@ static MessageView *messageview_create_with_new_window_visible(MainWindow *mainw msgview); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(messageview_delete_cb), msgview); -#ifdef MAEMO - maemo_connect_key_press_to_mainwindow(GTK_WINDOW(window)); -#else g_signal_connect(G_OBJECT(window), "key_press_event", G_CALLBACK(key_pressed), msgview); -#endif messageview_add_toolbar(msgview, window); if (show) { @@ -1405,9 +1383,6 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo, messageview_register_nav(messageview); messageview_set_position(messageview, 0); -#ifdef MAEMO - maemo_window_full_screen_if_needed(GTK_WINDOW(messageview->window)); -#endif if (messageview->window) { gtk_window_set_title(GTK_WINDOW(messageview->window), _("Claws Mail - Message View")); @@ -1896,7 +1871,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) { @@ -1912,7 +1887,6 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, return mimeview_pass_key_press_event(messageview->mimeview, event); } -#endif static void messageview_show_partial_display_cb(NoticeView *noticeview, MessageView *messageview) { diff --git a/src/mh.c b/src/mh.c index bf2236de1..5b3bf72d9 100644 --- a/src/mh.c +++ b/src/mh.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1110,12 +1110,12 @@ static void mh_scan_tree_recursive(FolderItem *item) entry = mh_filename_from_utf8(utf8entry); if ( -#if !defined(G_OS_WIN32) && !defined(MAEMO) && defined(HAVE_DIRENT_D_TYPE) +#if !defined(G_OS_WIN32) && defined(HAVE_DIRENT_D_TYPE) d->d_type == DT_DIR || (d->d_type == DT_UNKNOWN && #endif g_stat(entry, &s) == 0 && S_ISDIR(s.st_mode) -#if !defined(G_OS_WIN32) && !defined(MAEMO) && defined(HAVE_DIRENT_D_TYPE) +#if !defined(G_OS_WIN32) && defined(HAVE_DIRENT_D_TYPE) ) #endif ) { diff --git a/src/mimeview.c b/src/mimeview.c index 8c328d024..c9c1fbcec 100644 --- a/src/mimeview.c +++ b/src/mimeview.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -58,15 +58,6 @@ #include "manage_window.h" #include "privacy.h" -#ifdef MAEMO -#include -#ifndef CHINOOK -#include -#else -#include -#endif -#endif - typedef enum { COL_MIMETYPE = 0, @@ -200,7 +191,7 @@ static void mimeview_select_prev_part_cb(GtkAction *action, gpointer data) static GtkActionEntry mimeview_menu_actions[] = { { "MimeView", NULL, "MimeView" }, { "MimeView/Open", NULL, N_("_Open"), NULL, "Open MIME part", G_CALLBACK(mimeview_launch_cb) }, -#if (!defined MAEMO && !defined G_OS_WIN32) +#if (!defined G_OS_WIN32) { "MimeView/OpenWith", NULL, N_("Open _with..."), NULL, "Open MIME part with...", G_CALLBACK(mimeview_open_with_cb) }, #endif { "MimeView/SendTo", NULL, N_("Send to..."), NULL, "Send to", G_CALLBACK(mimeview_send_to_cb) }, @@ -404,7 +395,7 @@ MimeView *mimeview_create(MainWindow *mainwin) MENUITEM_ADDUI_MANAGER(mimeview->ui_manager, "/Menus/MimeView/", "Open", "MimeView/Open", GTK_UI_MANAGER_MENUITEM); -#if (!defined MAEMO && !defined G_OS_WIN32) +#if (!defined G_OS_WIN32) MENUITEM_ADDUI_MANAGER(mimeview->ui_manager, "/Menus/MimeView/", "OpenWith", "MimeView/OpenWith", GTK_UI_MANAGER_MENUITEM); @@ -2069,9 +2060,6 @@ void mimeview_open_with(MimeView *mimeview) mimeview_open_part_with(mimeview, partinfo, FALSE); } -#ifdef MAEMO -osso_context_t *get_osso_context(void); -#endif static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboolean automatic) { gchar *filename; @@ -2079,11 +2067,7 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo gchar *mime_command = NULL; gchar *content_type = NULL; gint err; -#ifdef MAEMO - DBusConnection *dbusconn; - gchar *uri; - int r = 0; -#endif + cm_return_if_fail(partinfo != NULL); filename = procmime_get_tmp_file_name(partinfo); @@ -2110,23 +2094,6 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo partinfo->subtype); } -#ifdef MAEMO - if (content_type != NULL) { - uri = g_filename_to_uri(filename, NULL, NULL); - dbusconn = osso_get_dbus_connection (get_osso_context()); -#ifdef CHINOOK - r = hildon_mime_open_file_with_mime_type (dbusconn, uri, content_type); -#else - r = osso_mime_open_file_with_mime_type (dbusconn, uri, content_type); -#endif - g_free(uri); - } - if (r != 1) { - alertpanel_error(_("No registered viewer for this file type.")); - } - goto out; -#endif - if ((partinfo->type == MIMETYPE_TEXT && !strcmp(partinfo->subtype, "html")) && prefs_common_get_uri_cmd() && prefs_common.uri_cmd[0]) { mime_command = g_strdup(prefs_common_get_uri_cmd()); @@ -2180,9 +2147,7 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo prefs_common.mime_open_cmd_history = add_history(prefs_common.mime_open_cmd_history, cmd); } -#ifdef MAEMO -out: -#endif + g_free(content_type); g_free(filename); } @@ -2593,15 +2558,9 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo) gtk_widget_show_all(button); gtk_drag_source_set(button, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK, mimeview_mime_types, 1, GDK_ACTION_COPY); -#ifndef MAEMO + g_signal_connect(G_OBJECT(button), "popup-menu", G_CALLBACK(icon_popup_menu), mimeview); -#else - gtk_widget_tap_and_hold_setup(GTK_WIDGET(button), NULL, NULL, - GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS); - g_signal_connect(G_OBJECT(button), "tap-and-hold", - G_CALLBACK(icon_popup_menu), mimeview); -#endif g_signal_connect(G_OBJECT(button), "button_release_event", G_CALLBACK(icon_clicked_cb), mimeview); g_signal_connect(G_OBJECT(button), "key_press_event", diff --git a/src/plugins/bogofilter/Makefile.am b/src/plugins/bogofilter/Makefile.am index 7b74612df..7aaa09b13 100644 --- a/src/plugins/bogofilter/Makefile.am +++ b/src/plugins/bogofilter/Makefile.am @@ -17,8 +17,7 @@ else cygwin_export_lib = endif bogofilter_la_LIBADD = $(cygwin_export_lib) \ - $(GTK_LIBS) \ - $(MAEMO_LIBS) + $(GTK_LIBS) INCLUDES = \ -I$(top_srcdir)/src \ @@ -29,5 +28,4 @@ INCLUDES = \ AM_CPPFLAGS = \ $(ENCHANT_CFLAGS) \ $(GLIB_CFLAGS) \ - $(GTK_CFLAGS) \ - $(MAEMO_CFLAGS) + $(GTK_CFLAGS) diff --git a/src/plugins/pgpcore/Makefile.am b/src/plugins/pgpcore/Makefile.am index 63699b1e2..4d0a0a3f6 100644 --- a/src/plugins/pgpcore/Makefile.am +++ b/src/plugins/pgpcore/Makefile.am @@ -70,8 +70,6 @@ pgpcore_la_DEPENDENCIES = $(plugin_deps) pgpcore_la_LIBADD = $(cygwin_export_lib) $(plugin_ldadd) \ $(GTK_LIBS) \ $(GPGME_LIBS) \ - $(MAEMO_LIBS) \ - $(CONIC_LIBS) \ $(ENCHANT_LIBS) INCLUDES = \ @@ -84,8 +82,6 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(GTK_CFLAGS) \ $(GPGME_CFLAGS) \ - $(MAEMO_CFLAGS) \ - $(CONIC_CFLAGS) \ $(ENCHANT_CFLAGS) \ -Wno-deprecated-declarations diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c index cf9411544..8ab212018 100644 --- a/src/plugins/pgpcore/passphrase.c +++ b/src/plugins/pgpcore/passphrase.c @@ -1,5 +1,5 @@ /* passphrase.c - GTK+ based passphrase callback - * Copyright (C) 2001-2012 Werner Koch (dd9jn) and the Claws Mail team + * Copyright (C) 2001-2013 Werner Koch (dd9jn) and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -116,10 +116,6 @@ passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad, gi pass_entry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(vbox), pass_entry, FALSE, FALSE, 0); gtk_entry_set_visibility(GTK_ENTRY(pass_entry), FALSE); -#ifdef MAEMO - hildon_gtk_entry_set_input_mode(GTK_ENTRY(pass_entry), - HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE); -#endif gtk_widget_grab_focus(pass_entry); gtkut_stock_button_set_create(&confirm_box, diff --git a/src/plugins/pgpinline/Makefile.am b/src/plugins/pgpinline/Makefile.am index 231a96b92..810c1a69f 100644 --- a/src/plugins/pgpinline/Makefile.am +++ b/src/plugins/pgpinline/Makefile.am @@ -68,8 +68,7 @@ pgpinline_la_LDFLAGS = \ pgpinline_la_DEPENDENCIES = $(plugin_deps) pgpinline_la_LIBADD = $(plugin_ldadd) $(pgpcore_lib) $(cygwin_export_lib) \ $(GTK_LIBS) \ - $(GPGME_LIBS) \ - $(CONIC_LIBS) + $(GPGME_LIBS) INCLUDES = \ -I$(top_srcdir)/src \ @@ -81,8 +80,6 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(GTK_CFLAGS) \ $(GPGME_CFLAGS) \ - $(MAEMO_CFLAGS) \ - $(CONIC_CFLAGS) \ -Wno-deprecated-declarations clean-local: diff --git a/src/plugins/pgpmime/Makefile.am b/src/plugins/pgpmime/Makefile.am index 437314928..999e4e6bd 100644 --- a/src/plugins/pgpmime/Makefile.am +++ b/src/plugins/pgpmime/Makefile.am @@ -67,8 +67,6 @@ pgpmime_la_DEPENDENCIES = $(plugin_deps) pgpmime_la_LIBADD = $(plugin_ldadd) $(pgpcore_lib) $(cygwin_export_lib) \ $(GTK_LIBS) \ $(GPGME_LIBS) \ - $(MAEMO_LIBS) \ - $(CONIC_LIBS) \ $(ENCHANT_LIBS) INCLUDES = \ @@ -81,8 +79,6 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(GTK_CFLAGS) \ $(GPGME_CFLAGS) \ - $(MAEMO_CFLAGS) \ - $(CONIC_CFLAGS) \ $(ENCHANT_CFLAGS) \ -Wno-deprecated-declarations diff --git a/src/plugins/smime/Makefile.am b/src/plugins/smime/Makefile.am index ed0cb93c2..9b34c3b99 100644 --- a/src/plugins/smime/Makefile.am +++ b/src/plugins/smime/Makefile.am @@ -69,7 +69,6 @@ smime_la_DEPENDENCIES = $(plugin_deps) smime_la_LIBADD = $(plugin_ldadd) $(pgpcore_lib) $(cygwin_export_lib) \ $(GTK_LIBS) \ $(GPGME_LIBS) \ - $(CONIC_LIBS) \ $(ENCHANT_LIBS) INCLUDES = \ @@ -82,8 +81,6 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(GTK_CFLAGS) \ $(GPGME_CFLAGS) \ - $(MAEMO_CFLAGS) \ - $(CONIC_CFLAGS) \ $(ENCHANT_CFLAGS) \ -Wno-deprecated-declarations diff --git a/src/plugins/spamassassin/Makefile.am b/src/plugins/spamassassin/Makefile.am index 08492251a..4377260e6 100644 --- a/src/plugins/spamassassin/Makefile.am +++ b/src/plugins/spamassassin/Makefile.am @@ -19,8 +19,7 @@ else cygwin_export_lib = endif spamassassin_la_LIBADD = $(cygwin_export_lib) \ - $(GTK_LIBS) \ - $(MAEMO_LIBS) + $(GTK_LIBS) INCLUDES = \ -I$(top_srcdir)/src \ @@ -31,8 +30,7 @@ INCLUDES = \ AM_CPPFLAGS = \ $(ENCHANT_CFLAGS) \ $(GLIB_CFLAGS) \ - $(GTK_CFLAGS) \ - $(MAEMO_CFLAGS) + $(GTK_CFLAGS) EXTRA_DIST = \ README diff --git a/src/plugins/vcalendar/vcal_meeting_gtk.c b/src/plugins/vcalendar/vcal_meeting_gtk.c index 37fef6794..4fd3ef520 100644 --- a/src/plugins/vcalendar/vcal_meeting_gtk.c +++ b/src/plugins/vcalendar/vcal_meeting_gtk.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2007 Colin Leroy and + * Copyright (C) 1999-2013 Colin Leroy and * the Claws Mail team * * This program is free software; you can redistribute it and/or modify @@ -1774,9 +1774,6 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible) if (visible) { GSList *cur; gtk_widget_show_all(meet->window); -#ifdef MAEMO - maemo_window_full_screen_if_needed(GTK_WINDOW(meet->window)); -#endif for (cur = meet->attendees; cur; cur = cur->next) { gtk_widget_hide(((VCalAttendee *)cur->data)->avail_img); } diff --git a/src/prefs_account.c b/src/prefs_account.c index aff28aee1..b49ebea0f 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1212,10 +1212,6 @@ static void basic_create_widget_func(PrefsPage * _page, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); #endif gtk_entry_set_visibility (GTK_ENTRY (pass_entry), FALSE); -#ifdef MAEMO - hildon_gtk_entry_set_input_mode(GTK_ENTRY(pass_entry), - HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE); -#endif nntpserv_label = gtk_label_new (_("News server")); gtk_widget_show (nntpserv_label); @@ -1797,10 +1793,6 @@ static void send_create_widget_func(PrefsPage * _page, gtk_box_pack_start (GTK_BOX (hbox), smtp_pass_entry, TRUE, TRUE, 0); gtk_entry_set_visibility (GTK_ENTRY (smtp_pass_entry), FALSE); -#ifdef MAEMO - hildon_gtk_entry_set_input_mode(GTK_ENTRY(smtp_pass_entry), - HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE); -#endif PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2); hbox = gtk_hbox_new (FALSE, 8); diff --git a/src/prefs_actions.c b/src/prefs_actions.c index f32cd4c11..aa4b35904 100644 --- a/src/prefs_actions.c +++ b/src/prefs_actions.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto & The Claws Mail Team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto & The Claws Mail Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1179,15 +1179,8 @@ static GtkWidget *prefs_actions_list_view_create(void) list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model)); g_object_unref(model); -#ifndef MAEMO g_signal_connect(G_OBJECT(list_view), "popup-menu", G_CALLBACK(prefs_actions_list_popup_menu), list_view); -#else - gtk_widget_tap_and_hold_setup(GTK_WIDGET(list_view), NULL, NULL, - GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS); - g_signal_connect(G_OBJECT(list_view), "tap-and-hold", - G_CALLBACK(prefs_actions_list_popup_menu), list_view); -#endif g_signal_connect(G_OBJECT(list_view), "button-press-event", G_CALLBACK(prefs_actions_list_btn_pressed), list_view); diff --git a/src/prefs_common.c b/src/prefs_common.c index 5abdadcf5..ecc0ccf08 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -141,10 +141,6 @@ static PrefParam param_os_specific[] = { */ static PrefParam param[] = { -#ifdef MAEMO - {"data_root", "", &prefs_common.data_root, P_STRING, - NULL, NULL, NULL}, -#endif /* Receive */ {"use_ext_inc", "FALSE", &prefs_common.use_extinc, P_BOOL, NULL, NULL, NULL}, @@ -167,14 +163,6 @@ static PrefParam param[] = { P_BOOL, NULL, NULL, NULL}, {"newmail_notify_cmd", "", &SPECIFIC_PREFS.newmail_notify_cmd, P_STRING, NULL, NULL, NULL}, -#ifdef MAEMO - {"maemo_show_led", "TRUE", &prefs_common.maemo_show_led, P_BOOL, - NULL, NULL, NULL}, - {"maemo_play_sound", "FALSE", &prefs_common.maemo_play_sound, P_BOOL, - NULL, NULL, NULL}, - {"maemo_show_banner", "FALSE", &prefs_common.maemo_show_banner, P_BOOL, - NULL, NULL, NULL}, -#endif {"receive_dialog_mode", "2", &prefs_common.recv_dialog_mode, P_ENUM, NULL, NULL, NULL}, {"receivewin_width", "460", &prefs_common.receivewin_width, P_INT, @@ -1557,15 +1545,6 @@ gboolean prefs_common_enable_log_status(void) return prefs_common.enable_log_status; } -#ifdef MAEMO -const gchar *prefs_common_get_data_root(void) -{ - if (prefs_common.data_root && *prefs_common.data_root) - return prefs_common.data_root; - else - return NULL; -} -#endif /** return the translated name of a header, if the translate_header option is set, otherwise return the untranslated header name (header_name itself). diff --git a/src/prefs_common.h b/src/prefs_common.h index 02de404d3..9e4db9c97 100644 --- a/src/prefs_common.h +++ b/src/prefs_common.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -104,9 +104,6 @@ typedef enum struct _PrefsCommon { -#ifdef MAEMO - gchar *data_root; -#endif /* Receive */ gboolean use_extinc; gchar *extinc_cmd; @@ -118,11 +115,6 @@ struct _PrefsCommon gboolean newmail_notify_auto; gboolean newmail_notify_manu; gchar *newmail_notify_cmd; -#ifdef MAEMO - gboolean maemo_show_led; - gboolean maemo_play_sound; - gboolean maemo_show_banner; -#endif RecvDialogMode recv_dialog_mode; gint receivewin_width; gint receivewin_height; diff --git a/src/prefs_ext_prog.c b/src/prefs_ext_prog.c index d734885c9..4fbb81b18 100644 --- a/src/prefs_ext_prog.c +++ b/src/prefs_ext_prog.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2004-2012 Hiroyuki Yamamoto & the Claws Mail team + * Copyright (C) 2004-2013 Hiroyuki Yamamoto & the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -119,14 +119,9 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window, cmds_use_system_default_checkbtn = gtk_check_button_new_with_label( _("Use system defaults when possible")); -#ifndef MAEMO gtk_widget_show(cmds_use_system_default_checkbtn); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cmds_use_system_default_checkbtn), prefs_common.cmds_use_system_default); -#else - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cmds_use_system_default_checkbtn), - TRUE); -#endif tmp = g_find_program_in_path("xdg-open"); if (!tmp) { g_print("xdg-open not found\n"); @@ -145,9 +140,6 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window, #ifndef G_OS_WIN32 uri_label = gtk_label_new (_("Web browser")); gtk_widget_show(uri_label); -#ifdef MAEMO - gtk_widget_set_sensitive(uri_label, FALSE); -#endif i++; gtk_table_attach(GTK_TABLE (table2), uri_label, 0, 1, i, i+1, (GtkAttachOptions) (GTK_FILL), @@ -168,9 +160,6 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window, "rxvt -e w3m '%s'", "rxvt -e lynx '%s'", NULL); -#ifdef MAEMO - gtk_widget_set_sensitive(uri_combo, FALSE); -#endif gtk_table_attach (GTK_TABLE (table2), uri_combo, 1, 2, i, i+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c index 8be89d1d8..9ba59cc54 100644 --- a/src/prefs_filtering.c +++ b/src/prefs_filtering.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1800,15 +1800,8 @@ static GtkWidget *prefs_filtering_list_view_create(void) g_object_set(list_view, "allow-checkbox-mode", FALSE, NULL); #endif -#ifndef MAEMO g_signal_connect(G_OBJECT(list_view), "popup-menu", G_CALLBACK(prefs_filtering_list_popup_menu), list_view); -#else - gtk_widget_tap_and_hold_setup(GTK_WIDGET(list_view), NULL, NULL, - GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS); - g_signal_connect(G_OBJECT(list_view), "tap-and-hold", - G_CALLBACK(prefs_filtering_list_popup_menu), list_view); -#endif g_signal_connect(G_OBJECT(list_view), "button-press-event", G_CALLBACK(prefs_filtering_list_btn_pressed), list_view); diff --git a/src/prefs_receive.c b/src/prefs_receive.c index 0d885caf9..241b60ec1 100644 --- a/src/prefs_receive.c +++ b/src/prefs_receive.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005-2012 Colin Leroy & The Claws Mail Team + * Copyright (C) 2005-2013 Colin Leroy & The Claws Mail Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -56,16 +56,10 @@ typedef struct _ReceivePage GtkWidget *checkbtn_chkonstartup; GtkWidget *checkbtn_openinbox; GtkWidget *checkbtn_scan_after_inc; -#ifndef MAEMO GtkWidget *checkbtn_newmail_auto; GtkWidget *checkbtn_newmail_manu; GtkWidget *entry_newmail_notify_cmd; GtkWidget *hbox_newmail_notify; -#else - GtkWidget *checkbtn_maemo_show_led; - GtkWidget *checkbtn_maemo_play_sound; - GtkWidget *checkbtn_maemo_show_banner; -#endif GtkWidget *optmenu_recvdialog; GtkWidget *checkbtn_no_recv_err_panel; GtkWidget *checkbtn_close_recv_dialog; @@ -73,7 +67,6 @@ typedef struct _ReceivePage ReceivePage *prefs_receive; -#ifndef MAEMO static void prefs_common_recv_dialog_newmail_notify_toggle_cb(GtkWidget *w, gpointer data) { gboolean toggled; @@ -84,7 +77,6 @@ static void prefs_common_recv_dialog_newmail_notify_toggle_cb(GtkWidget *w, gpoi (GTK_TOGGLE_BUTTON(prefs_receive->checkbtn_newmail_auto)); gtk_widget_set_sensitive(prefs_receive->hbox_newmail_notify, toggled); } -#endif static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window, @@ -109,18 +101,12 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window, GtkWidget *checkbtn_scan_after_inc; GtkWidget *frame; -#ifndef MAEMO GtkWidget *vbox3; GtkWidget *hbox_newmail_notify; GtkWidget *checkbtn_newmail_auto; GtkWidget *checkbtn_newmail_manu; GtkWidget *entry_newmail_notify_cmd; GtkWidget *label_newmail_notify_cmd; -#else - GtkWidget *checkbtn_maemo_show_led; - GtkWidget *checkbtn_maemo_play_sound; - GtkWidget *checkbtn_maemo_show_banner; -#endif GtkWidget *label_recvdialog; GtkListStore *menu; @@ -216,7 +202,6 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window, PACK_CHECK_BUTTON (vbox2, checkbtn_scan_after_inc, _("Update all local folders")); -#ifndef MAEMO vbox3 = gtkut_get_options_frame(vbox2, &frame, _("Run command")); hbox = gtk_hbox_new (TRUE, 8); @@ -256,20 +241,6 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window, prefs_common.newmail_notify_manu); gtk_entry_set_text(GTK_ENTRY(entry_newmail_notify_cmd), prefs_common.newmail_notify_cmd); -#else - PACK_CHECK_BUTTON (vbox2, checkbtn_maemo_show_led, _("Blink LED")); - PACK_CHECK_BUTTON (vbox2, checkbtn_maemo_play_sound, _("Play sound")); - PACK_CHECK_BUTTON (vbox2, checkbtn_maemo_show_banner, - _("Show info banner")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_maemo_show_led), - prefs_common.maemo_show_led); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_maemo_play_sound), - prefs_common.maemo_play_sound); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_maemo_show_banner), - prefs_common.maemo_show_banner); - -#endif - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_autochk), prefs_common.autochk_newmail); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_incext), @@ -300,31 +271,22 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window, prefs_receive->checkbtn_chkonstartup = checkbtn_chkonstartup; prefs_receive->checkbtn_openinbox = checkbtn_openinbox; prefs_receive->checkbtn_scan_after_inc = checkbtn_scan_after_inc; - -#ifndef MAEMO prefs_receive->checkbtn_newmail_auto = checkbtn_newmail_auto; prefs_receive->checkbtn_newmail_manu = checkbtn_newmail_manu; prefs_receive->entry_newmail_notify_cmd = entry_newmail_notify_cmd; prefs_receive->hbox_newmail_notify = hbox_newmail_notify; -#else - prefs_receive->checkbtn_maemo_show_led = checkbtn_maemo_show_led; - prefs_receive->checkbtn_maemo_play_sound = checkbtn_maemo_play_sound; - prefs_receive->checkbtn_maemo_show_banner = checkbtn_maemo_show_banner; -#endif prefs_receive->optmenu_recvdialog = optmenu_recvdialog; prefs_receive->checkbtn_no_recv_err_panel = checkbtn_no_recv_err_panel; prefs_receive->checkbtn_close_recv_dialog = checkbtn_close_recv_dialog; prefs_receive->page.widget = vbox1; -#ifndef MAEMO g_signal_connect(G_OBJECT(checkbtn_newmail_auto), "toggled", G_CALLBACK(prefs_common_recv_dialog_newmail_notify_toggle_cb), NULL); g_signal_connect(G_OBJECT(checkbtn_newmail_manu), "toggled", G_CALLBACK(prefs_common_recv_dialog_newmail_notify_toggle_cb), NULL); -#endif } static void prefs_receive_save(PrefsPage *_page) @@ -345,23 +307,10 @@ static void prefs_receive_save(PrefsPage *_page) prefs_common.scan_all_after_inc = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->checkbtn_scan_after_inc)); -#ifndef MAEMO prefs_common.newmail_notify_auto = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->checkbtn_newmail_auto)); prefs_common.newmail_notify_manu = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->checkbtn_newmail_manu)); -#else - prefs_common.maemo_show_led = TRUE; - if (!gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(page->checkbtn_maemo_show_led))) { - mainwindow_maemo_led_set(FALSE); - prefs_common.maemo_show_led = FALSE; - } - prefs_common.maemo_play_sound = gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(page->checkbtn_maemo_play_sound)); - prefs_common.maemo_show_banner = gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(page->checkbtn_maemo_show_banner)); -#endif prefs_common.autochk_newmail = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->checkbtn_autochk)); prefs_common.autochk_itv = gtk_spin_button_get_value_as_int( @@ -371,12 +320,9 @@ static void prefs_receive_save(PrefsPage *_page) g_free(prefs_common.extinc_cmd); prefs_common.extinc_cmd = tmp; -#ifndef MAEMO tmp = gtk_editable_get_chars(GTK_EDITABLE(page->entry_newmail_notify_cmd), 0, -1); g_free(prefs_common.newmail_notify_cmd); prefs_common.newmail_notify_cmd = tmp; -#endif - prefs_common.recv_dialog_mode = combobox_get_active_data(GTK_COMBO_BOX(page->optmenu_recvdialog)); diff --git a/src/prefs_template.c b/src/prefs_template.c index 4b731a9d3..93354729d 100644 --- a/src/prefs_template.c +++ b/src/prefs_template.c @@ -1,7 +1,7 @@ /* * Claws Mail templates subsystem * Copyright (C) 2001 Alexander Barinov - * Copyright (C) 2001-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 2001-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1188,15 +1188,8 @@ static GtkWidget *prefs_template_list_view_create(void) list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model)); g_object_unref(model); -#ifndef MAEMO g_signal_connect(G_OBJECT(list_view), "popup-menu", G_CALLBACK(prefs_template_list_popup_menu), list_view); -#else - gtk_widget_tap_and_hold_setup(GTK_WIDGET(list_view), NULL, NULL, - GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS); - g_signal_connect(G_OBJECT(list_view), "tap-and-hold", - G_CALLBACK(prefs_template_list_popup_menu), list_view); -#endif g_signal_connect(G_OBJECT(list_view), "button-press-event", G_CALLBACK(prefs_template_list_btn_pressed), list_view); diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c index 907b80a48..8dd7a421a 100644 --- a/src/prefs_toolbar.c +++ b/src/prefs_toolbar.c @@ -1704,9 +1704,7 @@ static void icon_chooser_create(GtkButton *button, ToolbarPage *prefs_toolbar) icon_chooser_win = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_toolbar"); gtk_window_set_title(GTK_WINDOW(icon_chooser_win), _("Toolbar item icon")); -#ifndef MAEMO gtk_window_set_decorated(GTK_WINDOW(icon_chooser_win), FALSE); -#endif gdk_window_get_origin(gtk_widget_get_window( GTK_WIDGET(prefs_toolbar->icon_button)), &x, &y); diff --git a/src/statusbar.c b/src/statusbar.c index 3d826b972..48a2284e0 100644 --- a/src/statusbar.c +++ b/src/statusbar.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,15 +34,6 @@ #include "log.h" #include "hooks.h" -#ifdef MAEMO -#ifdef CHINOOK -#include -#else -#include -#endif -#endif - - #define BUFFSIZE 1024 static GList *statusbar_list = NULL; @@ -114,69 +105,6 @@ void statusbar_print(GtkStatusbar *statusbar, const gchar *format, ...) statusbar_puts(statusbar, buf); } -#ifdef MAEMO -static GSList *banner_texts = NULL; -static GtkWidget *banner = NULL; -void statuswindow_print_all(const gchar *format, ...) -{ - va_list args; - gchar buf[BUFFSIZE]; - GList *cur; - - va_start(args, format); - g_vsnprintf(buf, sizeof(buf), format, args); - va_end(args); - - for (cur = statusbar_list; cur != NULL; cur = cur->next) - statusbar_puts(GTK_STATUSBAR(cur->data), buf); - if (mainwindow_get_mainwindow()) { - if (banner != NULL) { - gchar *last_text = (gchar *)banner_texts->data; - if (!strcmp2(last_text, buf)) - return; - } - statusbar_pop_all(); - if (banner == NULL) { - banner = hildon_banner_show_animation( - mainwindow_get_mainwindow()->window, - NULL, - buf); - g_object_ref(banner); - banner_texts = g_slist_prepend(banner_texts, g_strdup(buf)); - } else { - hildon_banner_set_text(HILDON_BANNER(banner), buf); - banner_texts = g_slist_prepend(banner_texts, g_strdup(buf)); - } - } -} - -void statuswindow_pop_all(void) -{ - GList *cur; - gint cid; - - for (cur = statusbar_list; cur != NULL; cur = cur->next) { - cid = gtk_statusbar_get_context_id(GTK_STATUSBAR(cur->data), - "Standard Output"); - gtk_statusbar_pop(GTK_STATUSBAR(cur->data), cid); - } - if (banner && banner_texts) { - gchar *old_text = (gchar *)banner_texts->data; - gchar *prev_text = NULL; - banner_texts = g_slist_remove(banner_texts, old_text); - g_free(old_text); - if (banner_texts) { - prev_text = (gchar *)banner_texts->data; - hildon_banner_set_text(HILDON_BANNER(banner), prev_text); - } else { - gtk_widget_destroy(banner); - g_object_unref(banner); - banner = NULL; - } - } -} -#endif - void statusbar_print_all(const gchar *format, ...) { va_list args; diff --git a/src/statusbar.h b/src/statusbar.h index 8d21995f4..5b6626797 100644 --- a/src/statusbar.h +++ b/src/statusbar.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,14 +34,8 @@ void statusbar_print_all (const gchar *format, ...) G_GNUC_PRINTF(1, 2); void statusbar_pop_all (void); -#ifdef MAEMO -void statuswindow_print_all (const gchar *format, ...) - G_GNUC_PRINTF(1, 2); -void statuswindow_pop_all (void); -#else #define statuswindow_print_all statusbar_print_all #define statuswindow_pop_all statusbar_pop_all -#endif void statusbar_verbosity_set (gboolean verbose); diff --git a/src/summary_search.c b/src/summary_search.c index e4ff06d8e..ac14f3175 100644 --- a/src/summary_search.c +++ b/src/summary_search.c @@ -145,11 +145,9 @@ 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 #if !GTK_CHECK_VERSION(2,14,0) /* Work around http://bugzilla.gnome.org/show_bug.cgi?id=56070 */ @@ -275,12 +273,8 @@ static void summary_search_create(void) gtk_container_set_border_width(GTK_CONTAINER (window), 8); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(gtk_widget_hide_on_delete), NULL); -#ifdef MAEMO - maemo_connect_key_press_to_mainwindow(GTK_WINDOW(window)); -#else g_signal_connect(G_OBJECT(window), "key_press_event", G_CALLBACK(key_pressed), NULL); -#endif MANAGE_WINDOW_SIGNALS_CONNECT(window); vbox1 = gtk_vbox_new (FALSE, 0); @@ -577,9 +571,6 @@ static void summary_search_create(void) search_window.search_in_progress = FALSE; search_window.matched_msgnums = NULL; search_window.is_searching = is_searching; -#ifdef MAEMO - maemo_window_full_screen_if_needed(GTK_WINDOW(search_window.window)); -#endif } static gboolean summary_search_verify_match(MsgInfo *msg) @@ -1050,7 +1041,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) { @@ -1107,4 +1098,3 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, return FALSE; } -#endif diff --git a/src/summaryview.c b/src/summaryview.c index 7aae3e4c6..bbfc0230c 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -3682,10 +3682,6 @@ void summary_view_source(SummaryView * summaryview) msginfo = gtk_cmctree_node_get_row_data(ctree, summaryview->selected); source_window_show_msg(srcwin, msginfo); source_window_show(srcwin); -#ifdef MAEMO - maemo_window_full_screen_if_needed(GTK_WINDOW(srcwin->window)); - maemo_connect_key_press_to_mainwindow(GTK_WINDOW(srcwin->window)); -#endif } void summary_reedit(SummaryView *summaryview) @@ -6527,15 +6523,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview) g_signal_connect(G_OBJECT(ctree), "button_press_event", G_CALLBACK(summary_button_pressed), summaryview); -#ifndef MAEMO g_signal_connect(G_OBJECT(ctree), "popup-menu", G_CALLBACK(summary_popup_menu), summaryview); -#else - gtk_widget_tap_and_hold_setup(GTK_WIDGET(ctree), NULL, NULL, - GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS); - g_signal_connect(G_OBJECT(ctree), "tap-and-hold", - G_CALLBACK(summary_popup_menu), summaryview); -#endif g_signal_connect(G_OBJECT(ctree), "button_release_event", G_CALLBACK(summary_button_released), summaryview); diff --git a/src/toolbar.c b/src/toolbar.c index eddf724e7..690073a48 100644 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -2224,18 +2224,9 @@ Toolbar *toolbar_create(ToolbarType type, activate_learn_button(toolbar_data, prefs_common.toolbar_style, LEARN_SPAM); -#ifndef MAEMO gtk_container_add(GTK_CONTAINER(container), toolbar); gtk_container_set_border_width(GTK_CONTAINER(container), 0); -#else - if ( GTK_IS_WINDOW(container) ) { - hildon_window_add_toolbar (HILDON_WINDOW(container), GTK_TOOLBAR(toolbar)); - gtk_widget_show_all (container); - } else { - gtk_container_add(GTK_CONTAINER(container), toolbar); - gtk_container_set_border_width(GTK_CONTAINER(container), 2); - } -#endif + return toolbar_data; } @@ -2296,9 +2287,6 @@ 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 diff --git a/src/wizard.c b/src/wizard.c index 32fabe8f5..70a071d93 100644 --- a/src/wizard.c +++ b/src/wizard.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Colin Leroy + * Copyright (C) 1999-2013 Colin Leroy * and the Claws Mail team * * This program is free software; you can redistribute it and/or modify @@ -57,12 +57,6 @@ #include "prefs_common.h" #include "combobox.h" -#ifdef MAEMO -#include -#include -#include -#endif - typedef enum { GO_BACK, @@ -123,17 +117,6 @@ typedef struct GtkWidget *smtp_cert_table; GtkWidget *recv_cert_table; #endif - -#ifdef MAEMO - GtkWidget *data_root_nokia_radiobtn; - GtkWidget *data_root_mmc1_radiobtn; - GtkWidget *data_root_mmc2_radiobtn; - GnomeVFSVolumeMonitor *volmon; - gulong volmon_mount_sigid; - gulong volmon_unmount_sigid; - GnomeVFSVolume *vol_mmc1; - GnomeVFSVolume *vol_mmc2; -#endif gboolean create_mailbox; gboolean finished; gboolean result; @@ -643,21 +626,6 @@ static gboolean wizard_write_config(WizardWindow *wizard) return FALSE; } -#ifdef MAEMO - if (wizard->create_mailbox) { - g_free(prefs_common.data_root); - if (gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(wizard->data_root_nokia_radiobtn))) - prefs_common.data_root = NULL; - else if (gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(wizard->data_root_mmc1_radiobtn))) - prefs_common.data_root = g_strdup(MMC1_PATH); - else if (gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(wizard->data_root_mmc2_radiobtn))) - prefs_common.data_root = g_strdup(MMC2_PATH); - } -#endif - if (!mailbox_ok) { if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4) { mailbox_ok = setup_write_mailbox_path(wizard->mainwin, @@ -855,17 +823,6 @@ static gboolean wizard_write_config(WizardWindow *wizard) if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4) write_welcome_email(wizard); -#ifdef MAEMO - if (wizard->volmon_mount_sigid) - g_signal_handler_disconnect( - G_OBJECT(wizard->volmon), - wizard->volmon_mount_sigid); - if (wizard->volmon_unmount_sigid) - g_signal_handler_disconnect( - G_OBJECT(wizard->volmon), - wizard->volmon_unmount_sigid); -#endif - #ifndef G_OS_WIN32 plugin_load_standard_plugins(); #endif @@ -1045,85 +1002,10 @@ static GtkWidget* user_page (WizardWindow * wizard) return table; } -#ifdef MAEMO -static void wizard_vol_mount_cb(GnomeVFSVolumeMonitor *vfs, GnomeVFSVolume *vol, WizardWindow *wizard) -{ - gchar *uri = gnome_vfs_volume_get_activation_uri (vol); - gchar *mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL; - g_free (uri); - if (mount_path) { - if(!strcmp(mount_path, MMC1_PATH)) { - gtk_widget_set_sensitive(wizard->data_root_mmc1_radiobtn, TRUE); - } - if(!strcmp(mount_path, MMC2_PATH)) { - gtk_widget_set_sensitive(wizard->data_root_mmc2_radiobtn, TRUE); - } - } - g_free(mount_path); -} -static void wizard_vol_unmount_cb(GnomeVFSVolumeMonitor *vfs, GnomeVFSVolume *vol, WizardWindow *wizard) -{ - gchar *uri = gnome_vfs_volume_get_activation_uri (vol); - gchar *mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL; - g_free (uri); - if (mount_path) { - if(!strcmp(mount_path, MMC1_PATH)) { - gtk_widget_set_sensitive(wizard->data_root_mmc1_radiobtn, FALSE); - if (gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(wizard->data_root_mmc1_radiobtn))) { - gtk_toggle_button_set_active( - GTK_TOGGLE_BUTTON(wizard->data_root_nokia_radiobtn), TRUE); - } - } - if(!strcmp(mount_path, MMC2_PATH)) { - gtk_widget_set_sensitive(wizard->data_root_mmc2_radiobtn, FALSE); - if (gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(wizard->data_root_mmc2_radiobtn))) { - gtk_toggle_button_set_active( - GTK_TOGGLE_BUTTON(wizard->data_root_nokia_radiobtn), TRUE); - } - } - } - g_free(mount_path); -} - -void data_root_changed (GtkToggleButton *toggle_btn, - WizardWindow *wizard) -{ - gchar *name = g_path_get_basename(gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name))); - gchar *path = NULL; - if (gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(wizard->data_root_nokia_radiobtn))) - gtk_entry_set_text(GTK_ENTRY(wizard->mailbox_name), name); - else if (gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(wizard->data_root_mmc1_radiobtn))) { - path = g_strconcat(MMC1_PATH, G_DIR_SEPARATOR_S, - "Claws", G_DIR_SEPARATOR_S, - g_get_user_name(), G_DIR_SEPARATOR_S, - name, NULL); - gtk_entry_set_text(GTK_ENTRY(wizard->mailbox_name), path); - g_free(path); - } else if (gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(wizard->data_root_mmc2_radiobtn))) { - path = g_strconcat(MMC2_PATH, G_DIR_SEPARATOR_S, - "Claws", G_DIR_SEPARATOR_S, - g_get_user_name(), G_DIR_SEPARATOR_S, - name, NULL); - gtk_entry_set_text(GTK_ENTRY(wizard->mailbox_name), path); - g_free(path); - } - g_free(name); -} -#endif - static GtkWidget* mailbox_page (WizardWindow * wizard) { GtkWidget *table = gtk_table_new(1,1, FALSE); GtkWidget *vbox; -#ifdef MAEMO - GtkWidget *vbox2; - gchar *uri, *mount_path; -#endif GtkWidget *hbox; gtk_table_set_row_spacings(GTK_TABLE(table), 4); @@ -1152,67 +1034,6 @@ static GtkWidget* mailbox_page (WizardWindow * wizard) gtk_box_pack_start(GTK_BOX(hbox), wizard->mailbox_label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), wizard->mailbox_name, TRUE, TRUE, 0); -#ifdef MAEMO - wizard->data_root_nokia_radiobtn = gtk_radio_button_new_with_label(NULL, - _("on internal memory")); - wizard->data_root_mmc1_radiobtn = gtk_radio_button_new_with_label_from_widget( - GTK_RADIO_BUTTON(wizard->data_root_nokia_radiobtn), - _("on external memory card")); - wizard->data_root_mmc2_radiobtn = gtk_radio_button_new_with_label_from_widget( - GTK_RADIO_BUTTON(wizard->data_root_nokia_radiobtn), - _("on internal memory card")); - - g_signal_connect(G_OBJECT(wizard->data_root_nokia_radiobtn), "toggled", - G_CALLBACK(data_root_changed), wizard); - g_signal_connect(G_OBJECT(wizard->data_root_mmc1_radiobtn), "toggled", - G_CALLBACK(data_root_changed), wizard); - g_signal_connect(G_OBJECT(wizard->data_root_mmc2_radiobtn), "toggled", - G_CALLBACK(data_root_changed), wizard); - - wizard->volmon = gnome_vfs_get_volume_monitor(); - wizard->vol_mmc1 = gnome_vfs_volume_monitor_get_volume_for_path(wizard->volmon, MMC1_PATH); - wizard->vol_mmc2 = gnome_vfs_volume_monitor_get_volume_for_path(wizard->volmon, MMC2_PATH); - - uri = gnome_vfs_volume_get_activation_uri (wizard->vol_mmc1); - mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL; - g_free(uri); - if (wizard->vol_mmc1 == NULL || !gnome_vfs_volume_is_mounted(wizard->vol_mmc1) - || strcmp(mount_path, MMC1_PATH)) { - gtk_widget_set_sensitive(wizard->data_root_mmc1_radiobtn, FALSE); - } - g_free(mount_path); - - uri = gnome_vfs_volume_get_activation_uri (wizard->vol_mmc2); - mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL; - g_free(uri); - if (wizard->vol_mmc2 == NULL || !gnome_vfs_volume_is_mounted(wizard->vol_mmc2) - || strcmp(mount_path, MMC2_PATH)) { - gtk_widget_set_sensitive(wizard->data_root_mmc2_radiobtn, FALSE); - } else { - gtk_toggle_button_set_active(wizard->data_root_mmc2_radiobtn, TRUE); - } - g_free(mount_path); - - gnome_vfs_volume_unref(wizard->vol_mmc1); - gnome_vfs_volume_unref(wizard->vol_mmc2); - wizard->vol_mmc1 = NULL; - wizard->vol_mmc2 = NULL; - - wizard->volmon_mount_sigid = g_signal_connect(G_OBJECT(wizard->volmon), - "volume-mounted", G_CALLBACK(wizard_vol_mount_cb), wizard); - wizard->volmon_unmount_sigid = g_signal_connect(G_OBJECT(wizard->volmon), - "volume-unmounted", G_CALLBACK(wizard_vol_unmount_cb), wizard); - - vbox2 = gtk_vbox_new(FALSE, VSPACING_NARROW); - gtk_box_pack_start (GTK_BOX(vbox2), wizard->data_root_nokia_radiobtn, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(vbox2), wizard->data_root_mmc1_radiobtn, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(vbox2), wizard->data_root_mmc2_radiobtn, FALSE, FALSE, 0); - - hbox = gtk_hbox_new(FALSE, VSPACING_NARROW); - gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - PACK_BOX(hbox, _("Store data"), vbox2); -#endif - return table; } @@ -1327,10 +1148,6 @@ static GtkWidget* smtp_page (WizardWindow * wizard) wizard->smtp_password = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(wizard->smtp_password), tmpl.smtppass?tmpl.smtppass:""); gtk_entry_set_visibility(GTK_ENTRY(wizard->smtp_password), FALSE); -#ifdef MAEMO - hildon_gtk_entry_set_input_mode(GTK_ENTRY(wizard->smtp_password), - HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE); -#endif gtk_table_attach(GTK_TABLE(smtp_auth_table), wizard->smtp_password, 1,2,1,2, GTK_EXPAND|GTK_FILL, 0, 0, 0); #ifdef USE_GNUTLS @@ -1606,12 +1423,7 @@ static GtkWidget* recv_page (WizardWindow * wizard) gtk_entry_set_text(GTK_ENTRY(wizard->recv_password), tmpl.recvpass?tmpl.recvpass:""); gtk_entry_set_visibility(GTK_ENTRY(wizard->recv_password), FALSE); gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_password, 1,2,3,4, - GTK_EXPAND|GTK_FILL, 0, 0, 0); -#ifdef MAEMO - hildon_gtk_entry_set_input_mode(GTK_ENTRY(wizard->recv_password), - HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE); -#endif - + GTK_EXPAND|GTK_FILL, 0, 0, 0); #ifdef USE_GNUTLS hbox = gtk_hbox_new(FALSE, VSPACING_NARROW); gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0); @@ -1714,13 +1526,11 @@ 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 gint protocol = combobox_get_active_data(GTK_COMBO_BOX(wizard->recv_type)); if (protocol == A_IMAP4) { skip_mailbox_page = TRUE; } -#endif num_pages = g_slist_length(wizard->pages); @@ -1869,17 +1679,7 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) { "Claws Mail in less than five minutes.")); widget = gtk_label_new(text); gtk_label_set_line_wrap(GTK_LABEL(widget), TRUE); -#ifndef MAEMO gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0); -#else - scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start(GTK_BOX(page), scrolled_window, TRUE, TRUE, 0); - - gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window), - widget); -#endif g_free(text); /* user page: 1 */