commit 6a4b0c1a8e690013ebbc6f91d60407d72a7c2a96
parent 9fad9840cf03d94be473e71ed2a86a6b5fd289b5
Author: Oliver Lowe <o@olowe.co>
Date: Fri, 8 Aug 2025 15:56:21 +1000
Delete ultra mini PC custom build
Doing this via conditional compilation is too smart for me.
Diffstat:
25 files changed, 91 insertions(+), 1000 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -258,10 +258,6 @@ AC_ARG_ENABLE(crash-dialog,
[ --enable-crash-dialog Build crash dialog],
[enable_crash_dialog=$enableval], [enable_crash_dialog=no])
-AC_ARG_ENABLE(generic-umpc,
- [ --enable-generic-umpc Build generic UMPC code],
- [enable_generic_umpc=$enableval], [enable_generic_umpc=no])
-
AC_ARG_ENABLE(pthread,
[ --disable-pthread Do not build pthread support],
[enable_pthread=$enableval], [enable_pthread=yes])
@@ -540,12 +536,6 @@ dnl check if GDB is somewhere
AC_MSG_RESULT($enable_crash_dialog)
fi
-dnl generic umpc
-if test $enable_generic_umpc = yes; then
- AC_DEFINE(GENERIC_UMPC, 1, Generic UMPC code)
- AC_MSG_RESULT($enable_generic_umpc)
-fi
-
dnl check for pthread support
AC_MSG_CHECKING([whether to use pthread])
if test x$enable_pthread = xno; then
@@ -973,7 +963,6 @@ echo "IMAP4 (libetpan) : $enable_libetpan"
echo "NNTP (libetpan) : $enable_libetpan"
echo "Crash dialog : $enable_crash_dialog"
echo "Manual : $enable_manual"
-echo "Generic UMPC code : $enable_generic_umpc"
echo "SVG support : $enable_svg"
echo "Unit tests : $enable_tests"
echo "pthread : $enable_pthread"
diff --git a/src/account.c b/src/account.c
@@ -1575,11 +1575,8 @@ static GtkWidget *account_list_view_create(void)
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)));
g_object_unref(G_OBJECT(store));
-#ifdef GENERIC_UMPC
- g_object_set(list_view, "allow-checkbox-mode", FALSE, NULL);
-#endif
gtk_tree_view_set_reorderable(list_view, TRUE);
-
+
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
@@ -1591,14 +1588,14 @@ static GtkWidget *account_list_view_create(void)
G_CALLBACK(account_double_clicked),
list_view);
- g_signal_connect(G_OBJECT(list_view), "drag_begin",
+ g_signal_connect(G_OBJECT(list_view), "drag_begin",
G_CALLBACK(drag_begin),
list_view);
-
- g_signal_connect(G_OBJECT(list_view), "drag_end",
+
+ g_signal_connect(G_OBJECT(list_view), "drag_end",
G_CALLBACK(drag_end),
list_view);
-
+
gtk_tree_view_set_reorderable(list_view, TRUE);
return GTK_WIDGET(list_view);
}
diff --git a/src/action.c b/src/action.c
@@ -1210,18 +1210,13 @@ static void update_io_dialog(Children *children)
if (children->progress_bar) {
gchar *text;
-#ifdef GENERIC_UMPC
- /* use a more compact format */
- const gchar *format = "%s %d/%d";
-#else
const gchar *format = "%s %d / %d";
-#endif
-
+
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(children->progress_bar),
(children->initial_nb == 0) ? 0 :
(gdouble) (children->initial_nb - children->nb) /
(gdouble) children->initial_nb);
- text = g_strdup_printf(format, _("Completed"),
+ text = g_strdup_printf(format, _("Completed"),
children->initial_nb - children->nb,
children->initial_nb);
gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(children->progress_bar), TRUE);
@@ -1382,20 +1377,15 @@ static void create_io_dialog(Children *children)
if (children->initial_nb > 1) {
gchar *text;
-#ifdef GENERIC_UMPC
- /* use a more compact format */
- const gchar *format = "%s 0/%d\n";
-#else
const gchar *format = "%s 0 / %d\n";
-#endif
-
+
progress_bar = gtk_progress_bar_new();
gtk_orientable_set_orientation(GTK_ORIENTABLE(progress_bar),
GTK_ORIENTATION_HORIZONTAL);
gtk_progress_bar_set_inverted(GTK_PROGRESS_BAR(progress_bar),
FALSE);
- text = g_strdup_printf(format, _("Completed"),
+ text = g_strdup_printf(format, _("Completed"),
children->initial_nb);
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress_bar),
text);
diff --git a/src/addr_compl.c b/src/addr_compl.c
@@ -1409,7 +1409,6 @@ static gboolean address_completion_complete_address_in_entry(GtkEntry *entry,
new = get_next_complete_address();
g_free( new );
}
-#if (!defined(USE_LDAP) && !defined(GENERIC_UMPC))
/* Select the address if there is only one match */
if (ncount == 2) {
/* Display selected address in entry field */
@@ -1422,9 +1421,7 @@ static gboolean address_completion_complete_address_in_entry(GtkEntry *entry,
g_free(addr);
}
/* Make sure that drop-down appears uniform! */
- else
-#endif
- if( ncount == 0 ) {
+ else if( ncount == 0 ) {
addrcompl_add_queue( searchTerm );
} else {
g_free( searchTerm );
diff --git a/src/compose.c b/src/compose.c
@@ -4884,15 +4884,11 @@ static void compose_set_title(Compose *compose)
subject = gtk_editable_get_chars(
GTK_EDITABLE(compose->subject_entry), 0, -1);
-#ifndef GENERIC_UMPC
if (subject && strlen(subject))
str = g_strdup_printf(_("%s - Write message%s"),
subject, edited);
else
str = g_strdup_printf(_("[no subject] - Write message%s"), edited);
-#else
- str = g_strdup(_("Write message"));
-#endif
gtk_window_set_title(GTK_WINDOW(compose->window), str);
g_free(str);
@@ -7791,11 +7787,9 @@ static Compose *compose_create(PrefsAccount *account,
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
&geometry, GDK_HINT_MIN_SIZE);
-#ifndef GENERIC_UMPC
if (compose_force_window_origin)
gtk_window_move(GTK_WINDOW(window), prefs_common.compose_x,
prefs_common.compose_y);
-#endif
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(compose_delete_cb), compose);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
@@ -11069,22 +11063,14 @@ static void entry_allsel(GtkWidget *entry)
static void compose_cut_cb(GtkAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
- if (compose->focused_editable
-#ifndef GENERIC_UMPC
- && gtk_widget_has_focus(compose->focused_editable)
-#endif
- )
+ if (compose->focused_editable && gtk_widget_has_focus(compose->focused_editable))
entry_cut_clipboard(compose->focused_editable);
}
static void compose_copy_cb(GtkAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
- if (compose->focused_editable
-#ifndef GENERIC_UMPC
- && gtk_widget_has_focus(compose->focused_editable)
-#endif
- )
+ if (compose->focused_editable && gtk_widget_has_focus(compose->focused_editable))
entry_copy_clipboard(compose->focused_editable);
}
@@ -11094,21 +11080,14 @@ static void compose_paste_cb(GtkAction *action, gpointer data)
gint prev_autowrap;
GtkTextBuffer *buffer;
BLOCK_WRAP();
- if (compose->focused_editable
-#ifndef GENERIC_UMPC
- && gtk_widget_has_focus(compose->focused_editable)
-#endif
- )
+ if (compose->focused_editable && gtk_widget_has_focus(compose->focused_editable))
entry_paste_clipboard(compose, compose->focused_editable,
prefs_common.linewrap_pastes,
GDK_SELECTION_CLIPBOARD, NULL);
UNBLOCK_WRAP();
#ifdef USE_ENCHANT
- if (
-#ifndef GENERIC_UMPC
- gtk_widget_has_focus(compose->text) &&
-#endif
+ if (gtk_widget_has_focus(compose->text) &&
compose->gtkaspell &&
compose->gtkaspell->check_while_typing)
gtkaspell_highlight_all(compose->gtkaspell);
@@ -11119,11 +11098,7 @@ static void compose_paste_as_quote_cb(GtkAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
gint wrap_quote = prefs_common.linewrap_quote;
- if (compose->focused_editable
-#ifndef GENERIC_UMPC
- && gtk_widget_has_focus(compose->focused_editable)
-#endif
- ) {
+ if (compose->focused_editable && gtk_widget_has_focus(compose->focused_editable)) {
/* let text_insert() (called directly or at a later time
* after the gtk_editable_paste_clipboard) know that
* text is to be inserted as a quotation. implemented
@@ -11148,20 +11123,13 @@ static void compose_paste_no_wrap_cb(GtkAction *action, gpointer data)
gint prev_autowrap;
GtkTextBuffer *buffer;
BLOCK_WRAP();
- if (compose->focused_editable
-#ifndef GENERIC_UMPC
- && gtk_widget_has_focus(compose->focused_editable)
-#endif
- )
+ if (compose->focused_editable && gtk_widget_has_focus(compose->focused_editable))
entry_paste_clipboard(compose, compose->focused_editable, FALSE,
GDK_SELECTION_CLIPBOARD, NULL);
UNBLOCK_WRAP();
#ifdef USE_ENCHANT
- if (
-#ifndef GENERIC_UMPC
- gtk_widget_has_focus(compose->text) &&
-#endif
+ if (gtk_widget_has_focus(compose->text) &&
compose->gtkaspell &&
compose->gtkaspell->check_while_typing)
gtkaspell_highlight_all(compose->gtkaspell);
@@ -11174,20 +11142,13 @@ static void compose_paste_wrap_cb(GtkAction *action, gpointer data)
gint prev_autowrap;
GtkTextBuffer *buffer;
BLOCK_WRAP();
- if (compose->focused_editable
-#ifndef GENERIC_UMPC
- && gtk_widget_has_focus(compose->focused_editable)
-#endif
- )
+ if (compose->focused_editable && gtk_widget_has_focus(compose->focused_editable))
entry_paste_clipboard(compose, compose->focused_editable, TRUE,
GDK_SELECTION_CLIPBOARD, NULL);
UNBLOCK_WRAP();
#ifdef USE_ENCHANT
- if (
-#ifndef GENERIC_UMPC
- gtk_widget_has_focus(compose->text) &&
-#endif
+ if (gtk_widget_has_focus(compose->text) &&
compose->gtkaspell &&
compose->gtkaspell->check_while_typing)
gtkaspell_highlight_all(compose->gtkaspell);
@@ -11197,11 +11158,7 @@ static void compose_paste_wrap_cb(GtkAction *action, gpointer data)
static void compose_allsel_cb(GtkAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
- if (compose->focused_editable
-#ifndef GENERIC_UMPC
- && gtk_widget_has_focus(compose->focused_editable)
-#endif
- )
+ if (compose->focused_editable && gtk_widget_has_focus(compose->focused_editable))
entry_allsel(compose->focused_editable);
}
@@ -11554,53 +11511,12 @@ static void compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
if (GTK_IS_EDITABLE(widget) || GTK_IS_TEXT_VIEW(widget))
compose->focused_editable = widget;
-
-#ifdef GENERIC_UMPC
- if (GTK_IS_TEXT_VIEW(widget)
- && gtk_paned_get_child1(GTK_PANED(compose->paned)) != compose->edit_vbox) {
- g_object_ref(compose->notebook);
- g_object_ref(compose->edit_vbox);
- gtk_container_remove(GTK_CONTAINER(compose->paned), compose->notebook);
- gtk_container_remove(GTK_CONTAINER(compose->paned), compose->edit_vbox);
- gtk_paned_add1(GTK_PANED(compose->paned), compose->edit_vbox);
- gtk_paned_add2(GTK_PANED(compose->paned), compose->notebook);
- g_object_unref(compose->notebook);
- g_object_unref(compose->edit_vbox);
- g_signal_handlers_block_by_func(G_OBJECT(widget),
- G_CALLBACK(compose_grab_focus_cb),
- compose);
- gtk_widget_grab_focus(widget);
- g_signal_handlers_unblock_by_func(G_OBJECT(widget),
- G_CALLBACK(compose_grab_focus_cb),
- compose);
- } else if (!GTK_IS_TEXT_VIEW(widget)
- && gtk_paned_get_child1(GTK_PANED(compose->paned)) != compose->notebook) {
- g_object_ref(compose->notebook);
- g_object_ref(compose->edit_vbox);
- gtk_container_remove(GTK_CONTAINER(compose->paned), compose->notebook);
- gtk_container_remove(GTK_CONTAINER(compose->paned), compose->edit_vbox);
- gtk_paned_add1(GTK_PANED(compose->paned), compose->notebook);
- gtk_paned_add2(GTK_PANED(compose->paned), compose->edit_vbox);
- g_object_unref(compose->notebook);
- g_object_unref(compose->edit_vbox);
- g_signal_handlers_block_by_func(G_OBJECT(widget),
- G_CALLBACK(compose_grab_focus_cb),
- compose);
- gtk_widget_grab_focus(widget);
- g_signal_handlers_unblock_by_func(G_OBJECT(widget),
- G_CALLBACK(compose_grab_focus_cb),
- compose);
- }
-#endif
}
static void compose_changed_cb(GtkTextBuffer *textbuf, Compose *compose)
{
compose->modified = TRUE;
-/* compose_beautify_paragraph(compose, NULL, TRUE); */
-#ifndef GENERIC_UMPC
compose_set_title(compose);
-#endif
}
static void compose_wrap_cb(GtkAction *action, gpointer data)
diff --git a/src/editaddress.c b/src/editaddress.c
@@ -63,23 +63,12 @@ typedef enum {
#define EDITPERSON_WIDTH 520
#define EDITPERSON_HEIGHT 320
-#ifndef GENERIC_UMPC
-# define EMAIL_N_COLS 4
-# define EMAIL_COL_WIDTH_EMAIL 180
-# define EMAIL_COL_WIDTH_ALIAS 80
-#else
-# define EMAIL_N_COLS 2
-# define EMAIL_COL_WIDTH_EMAIL 130
-# define EMAIL_COL_WIDTH_ALIAS 130
-#endif
+#define EMAIL_N_COLS 4
+#define EMAIL_COL_WIDTH_EMAIL 180
+#define EMAIL_COL_WIDTH_ALIAS 80
-#ifndef GENERIC_UMPC
-# define ATTRIB_COL_WIDTH_NAME 240
-# define ATTRIB_COL_WIDTH_VALUE 0
-#else
-# define ATTRIB_COL_WIDTH_NAME 120
-# define ATTRIB_COL_WIDTH_VALUE 120
-#endif
+#define ATTRIB_COL_WIDTH_NAME 240
+#define ATTRIB_COL_WIDTH_VALUE 0
#define PAGE_BASIC 0
#define PAGE_EMAIL 1
@@ -93,7 +82,6 @@ static gchar* edit_person_get_common_name_from_widgets(void)
{
gchar *cn = NULL; /* cn must be freed by caller */
-#ifndef GENERIC_UMPC
{
cn = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_name), 0, -1 );
if ( cn == NULL || *cn == '\0' ) {
@@ -108,15 +96,6 @@ static gchar* edit_person_get_common_name_from_widgets(void)
cn = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_nick), 0, -1 );
}
}
-#else
- {
- gchar *first = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_first), 0, -1 );
- gchar *last = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_last), 0, -1 );
- cn = g_strdup_printf("%s%s%s", first?first:"", (first && last && *first && *last)?" ":"", last?last:"");
- g_free(first);
- g_free(last);
- }
-#endif
if ( cn != NULL )
g_strstrip(cn);
return cn;
@@ -148,7 +127,6 @@ static void edit_person_ok(GtkWidget *widget, gboolean *cancelled) {
gint val;
val = alertpanel( _("Add New Person"),
-#ifndef GENERIC_UMPC
_("Adding a new person requires at least one of the\n"
"following values to be set:\n"
" - Display Name\n"
@@ -159,16 +137,6 @@ static void edit_person_ok(GtkWidget *widget, gboolean *cancelled) {
" - any additional attribute\n\n"
"Click OK to keep editing this contact.\n"
"Click Cancel to close without saving."),
-#else
- _("Adding a new person requires at least one of the\n"
- "following values to be set:\n"
- " - First Name\n"
- " - Last Name\n"
- " - any email address\n"
- " - any additional attribute\n\n"
- "Click OK to keep editing this contact.\n"
- "Click Cancel to close without saving."),
-#endif
NULL, _("_Cancel"), NULL, _("_OK"), NULL, NULL, ALERTFOCUS_SECOND );
if( val == G_ALERTDEFAULT ) {
edit_person_cancel(widget, cancelled);
@@ -361,10 +329,8 @@ static void edit_person_load_email( ItemPerson *person ) {
gtk_list_store_append(GTK_LIST_STORE(model), &iter);
gtk_list_store_set(GTK_LIST_STORE(model), &iter,
EMAIL_COL_EMAIL, email->address,
-#ifndef GENERIC_UMPC
EMAIL_COL_ALIAS, email->obj.name,
EMAIL_COL_REMARKS, email->remarks,
-#endif
EMAIL_COL_PTR, email,
-1);
@@ -529,10 +495,8 @@ static void edit_person_email_modify( gpointer data ) {
if( ! errFlg ) {
gtk_list_store_set(GTK_LIST_STORE(model), &iter,
EMAIL_COL_EMAIL, email->address,
-#ifndef GENERIC_UMPC
EMAIL_COL_ALIAS, email->obj.name,
EMAIL_COL_REMARKS, email->remarks,
-#endif
-1);
edit_person_email_clear( NULL );
}
@@ -561,10 +525,8 @@ static void edit_person_email_add( gpointer data ) {
gtk_list_store_set(GTK_LIST_STORE(model), &iter,
EMAIL_COL_EMAIL, email->address,
-#ifndef GENERIC_UMPC
EMAIL_COL_ALIAS, email->obj.name,
EMAIL_COL_REMARKS, email->remarks,
-#endif
EMAIL_COL_PTR, email,
-1);
gtk_tree_selection_select_iter(sel, &iter);
@@ -1092,11 +1054,7 @@ static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) {
entry = gtk_entry_new(); \
}
-#ifndef GENERIC_UMPC
ATTACH_ROW(_("Display Name"), entry_name);
-#else
- ATTACH_HIDDEN_ROW(_("Display Name"), entry_name);
-#endif
locale = conv_get_current_locale();
if (locale &&
(!g_ascii_strncasecmp(locale, "hu", 2) ||
@@ -1110,12 +1068,7 @@ static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) {
ATTACH_ROW(_("First Name"), entry_fn);
ATTACH_ROW(_("Last Name"), entry_ln);
}
-#ifndef GENERIC_UMPC
ATTACH_ROW(_("Nickname"), entry_nn);
-#else
- ATTACH_HIDDEN_ROW(_("Nickname"), entry_nn);
-#endif
-
#undef ATTACH_ROW
#undef ATTACH_HIDDEN_ROW
gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0);
@@ -1226,20 +1179,14 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
store = gtk_list_store_new(EMAIL_N_COLS,
G_TYPE_STRING,
-#ifndef GENERIC_UMPC
G_TYPE_STRING,
G_TYPE_STRING,
-#endif
G_TYPE_POINTER,
-1);
view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
g_object_unref(store);
-#ifndef GENERIC_UMPC
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), TRUE);
-#else
- gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), FALSE);
-#endif
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
gtk_tree_selection_set_mode(sel, GTK_SELECTION_BROWSE);
@@ -1249,7 +1196,6 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
gtk_tree_view_column_set_min_width(col, EMAIL_COL_WIDTH_EMAIL);
gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
-#ifndef GENERIC_UMPC
col = gtk_tree_view_column_new_with_attributes(_("Alias"), rdr,
"markup", EMAIL_COL_ALIAS, NULL);
gtk_tree_view_column_set_min_width(col, EMAIL_COL_WIDTH_ALIAS);
@@ -1258,20 +1204,14 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
col = gtk_tree_view_column_new_with_attributes(_("Remarks"), rdr,
"markup", EMAIL_COL_REMARKS, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
-#endif
gtk_container_add( GTK_CONTAINER(scrollwin), view );
/* Data entry area */
table = gtk_grid_new();
-#ifndef GENERIC_UMPC
gtk_container_add( GTK_CONTAINER(vboxl), scrollwin );
gtk_box_pack_start(GTK_BOX(vboxl), table, FALSE, FALSE, 0);
-#else
- gtk_box_pack_start(GTK_BOX(vboxl), table, FALSE, FALSE, 0);
- gtk_container_add( GTK_CONTAINER(vboxl), scrollwin );
-#endif
gtk_container_set_border_width( GTK_CONTAINER(table), 4 );
gtk_grid_set_row_spacing(GTK_GRID(table), 4);
gtk_grid_set_column_spacing(GTK_GRID(table), 4);
@@ -1289,7 +1229,6 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
gtk_widget_set_hexpand(entry_email, TRUE);
gtk_widget_set_halign(entry_email, GTK_ALIGN_FILL);
-#ifndef GENERIC_UMPC
/* Next row */
label = gtk_label_new(_("Alias"));
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
@@ -1307,7 +1246,6 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
gtk_grid_attach(GTK_GRID(table), entry_remarks, 1, 2, 1, 1);
gtk_widget_set_hexpand(entry_remarks, TRUE);
gtk_widget_set_halign(entry_remarks, GTK_ALIGN_FILL);
-#endif
/* Button box */
vboxb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4 );
@@ -1319,23 +1257,16 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
gtk_container_set_border_width( GTK_CONTAINER(vbuttonbox), 4 );
gtk_container_add( GTK_CONTAINER(vboxb), vbuttonbox );
- /* Buttons */
buttonUp = gtkut_stock_button("go-up", _("_Up"));
buttonDown = gtkut_stock_button("go-down", _("_Down"));
buttonDel = gtkut_stock_button("edit-delete", _("D_elete"));
buttonMod = gtkut_stock_button("document-save", _("_Save"));
buttonAdd = gtkut_stock_button("list-add", _("_Add"));
-
-#ifndef GENERIC_UMPC
gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonUp );
-
gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonDown );
-#endif
gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonDel );
-
gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonMod );
-
gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonAdd );
gtk_widget_show_all(vbox);
@@ -1496,7 +1427,6 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
gtk_grid_set_column_spacing(GTK_GRID(table), 4);
/* First row */
-#ifndef GENERIC_UMPC
label = gtk_label_new(_("Name"));
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 1);
@@ -1515,26 +1445,7 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
gtk_grid_attach(GTK_GRID(table), entry_value, 1, 1, 1, 1);
gtk_widget_set_hexpand(entry_value, TRUE);
gtk_widget_set_halign(entry_value, GTK_ALIGN_FILL);
-#else
- label = gtk_label_new(_("Name"));
- gtk_label_set_xalign(GTK_LABEL(label), 0.0);
- gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 1);
-
- entry_name = gtk_combo_box_text_new_with_entry ();
- gtk_grid_attach(GTK_GRID(table), entry_name, 1, 0, 1, 1);
- gtk_widget_set_hexpand(entry_name, TRUE);
- gtk_widget_set_halign(entry_name, GTK_ALIGN_FILL);
-
- /* Next row */
- label = gtk_label_new(_("Value"));
- gtk_label_set_xalign(GTK_LABEL(label), 0.0);
- gtk_grid_attach(GTK_GRID(table), label, 2, 0, 1, 1);
- entry_value = gtk_entry_new();
- gtk_grid_attach(GTK_GRID(table), entry_value, 3, 0, 1, 1);
- gtk_widget_set_hexpand(entry_value, TRUE);
- gtk_widget_set_halign(entry_value, GTK_ALIGN_FILL);
-#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(entry_name), -1);
if (prefs_common.addressbook_custom_attributes)
combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(entry_name),
diff --git a/src/folderview.c b/src/folderview.c
@@ -213,10 +213,8 @@ static void folderview_drag_received_cb (GtkWidget *widget,
guint info,
guint time,
FolderView *folderview);
-#ifndef GENERIC_UMPC
static void folderview_start_drag (GtkWidget *widget, gint button, GdkEvent *event,
FolderView *folderview);
-#endif
static void folderview_drag_data_get (GtkWidget *widget,
GdkDragContext *drag_context,
GtkSelectionData *selection_data,
@@ -389,21 +387,11 @@ static void folderview_column_set_titles(FolderView *folderview)
gtk_widget_show_all(hbox_unread);
gtk_widget_show_all(hbox_total);
-#ifdef GENERIC_UMPC
- gtk_widget_set_size_request(hbox_new, -1, 20);
- gtk_widget_set_size_request(hbox_unread, -1, 20);
- gtk_widget_set_size_request(hbox_total, -1, 20);
-#endif
-
gtk_cmclist_set_column_widget(GTK_CMCLIST(ctree),col_pos[F_COL_FOLDER],hbox_folder);
gtk_cmclist_set_column_widget(GTK_CMCLIST(ctree),col_pos[F_COL_NEW],hbox_new);
gtk_cmclist_set_column_widget(GTK_CMCLIST(ctree),col_pos[F_COL_UNREAD],hbox_unread);
gtk_cmclist_set_column_widget(GTK_CMCLIST(ctree),col_pos[F_COL_TOTAL],hbox_total);
-#ifdef GENERIC_UMPC
- GTK_EVENTS_FLUSH();
-#endif
-
gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_NEW], _("New"));
gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_UNREAD], _("Unread"));
gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_TOTAL], _("Total"));
@@ -510,12 +498,8 @@ static GtkWidget *folderview_ctree_create(FolderView *folderview)
folderview);
g_signal_connect(G_OBJECT(ctree), "tree_select_row",
G_CALLBACK(folderview_selected), folderview);
-#ifndef GENERIC_UMPC
- /* drag-n-dropping folders on maemo is impractical as this
- * opens the folder almost everytime */
g_signal_connect(G_OBJECT(ctree), "start_drag",
G_CALLBACK(folderview_start_drag), folderview);
-#endif
g_signal_connect(G_OBJECT(ctree), "drag_data_get",
G_CALLBACK(folderview_drag_data_get),
folderview);
@@ -2136,21 +2120,11 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
folderview->selected);
}
break;
-#ifdef GENERIC_UMPC
- case GDK_KEY_Return:
- if (folderview->selected && GTK_CMCTREE_ROW(folderview->selected)->children) {
- gtk_cmctree_toggle_expansion(
- GTK_CMCTREE(folderview->ctree),
- folderview->selected);
- }
- break;
-#else
case GDK_KEY_Return:
case GDK_KEY_KP_Enter:
if (folderview->selected)
folderview_select_node(folderview, folderview->selected);
break;
-#endif
case GDK_KEY_space:
BREAK_ON_MODIFIER_KEY();
if (folderview->selected) {
@@ -2898,14 +2872,14 @@ static void drag_state_start(FolderView *folderview, GtkCMCTreeNode *node, Folde
drag_state_stop(folderview);
/* request expansion */
if (0 != (folderview->drag_timer_id = g_timeout_add
- (prefs_common.hover_timeout,
+ (prefs_common.hover_timeout,
(GSourceFunc)folderview_defer_expand,
folderview))) {
folderview->drag_node = node;
folderview->drag_item = item;
- }
+ }
}
-#ifndef GENERIC_UMPC
+
static void folderview_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
FolderView *folderview)
{
diff --git a/src/gtk/about.c b/src/gtk/about.c
@@ -159,11 +159,6 @@ static GtkWidget *about_create_child_page_info(void)
gtk_text_buffer_create_tag(buffer, "underlined-list-title",
"underline", PANGO_UNDERLINE_SINGLE,
NULL);
-#ifdef GENERIC_UMPC
- ADD_TEXT("\n\n");
- ADD_TEXT(_("Copyright (C) 1999-2025\nThe Claws Mail Team\n"
- "and Hiroyuki Yamamoto"));
-#endif
ADD_TEXT("\n\n");
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter,
(_("System Information\n")), -1, "underlined-list-title", NULL);
@@ -836,7 +831,6 @@ static void about_create(void)
button = gtk_link_button_new(HOMEPAGE_URI);
gtk_container_add(GTK_CONTAINER(grid2), button);
-#ifndef GENERIC_UMPC
label = gtk_label_new
(_("Copyright (C) 1999-2025\nThe Claws Mail Team\n"
"and Hiroyuki Yamamoto"));
@@ -844,7 +838,6 @@ static void about_create(void)
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_container_add(GTK_CONTAINER(grid2), label);
-#endif
notebook = gtk_notebook_new();
gtk_widget_show(notebook);
diff --git a/src/gtk/gtksctree.c b/src/gtk/gtksctree.c
@@ -449,9 +449,8 @@ sctree_is_hot_spot (GtkSCTree *sctree,
yu = (ROW_TOP_YPIXEL (clist, row) + (clist->row_height/2 - hotspot_size) / 2 -
(clist->row_height/2 - 1) % 2);
-#ifndef GENERIC_UMPC
if (clist->column[ctree->tree_column].justification == GTK_JUSTIFY_RIGHT)
- xl = clist->column[ctree->tree_column].area.x +
+ xl = clist->column[ctree->tree_column].area.x +
clist->column[ctree->tree_column].area.width - 1 + clist->hoffset -
(tree_row->level - 1) * ctree->tree_indent - hotspot_size;
else
@@ -459,35 +458,18 @@ sctree_is_hot_spot (GtkSCTree *sctree,
(tree_row->level - 1) * ctree->tree_indent;
xmax = xl + hotspot_size;
-#else
- if (clist->column[ctree->tree_column].justification == GTK_JUSTIFY_RIGHT) {
- xl = clist->column[ctree->tree_column].area.x +
- clist->column[ctree->tree_column].area.width - 1 + clist->hoffset -
- (tree_row->level - 1) * ctree->tree_indent - hotspot_size;
- xmax = xl + hotspot_size;
- } else if (ctree->tree_column == 0) {
- xl = clist->column[ctree->tree_column].area.x + clist->hoffset;
- xmax = clist->column[ctree->tree_column].area.x + clist->hoffset +
- (tree_row->level - 1) * ctree->tree_indent +
- hotspot_size;
- } else {
- xl = clist->column[ctree->tree_column].area.x + clist->hoffset +
- (tree_row->level - 1) * ctree->tree_indent;
- xmax = xl + hotspot_size;
- }
-#endif
return (x >= xl && x <= xmax && y >= yu && y <= yu + hotspot_size);
}
gboolean
-gtk_sctree_is_hot_spot (GtkSCTree *ctree,
- gint x,
+gtk_sctree_is_hot_spot (GtkSCTree *ctree,
+ gint x,
gint y)
{
GtkCMCTreeNode *node;
gint column;
gint row;
-
+
cm_return_val_if_fail (GTK_IS_SCTREE (ctree), FALSE);
if (gtk_cmclist_get_selection_info (GTK_CMCLIST (ctree), x, y, &row, &column))
@@ -673,14 +655,9 @@ gtk_sctree_motion (GtkWidget *widget, GdkEventMotion *event)
return FALSE;
/* This is the same threshold value that is used in gtkdnd.c */
-
-#ifndef GENERIC_UMPC
-#define THRESHOLD 3
-#else
-#define THRESHOLD 8
-#endif
+ int threshold = 3;
if (MAX (ABS (sctree->dnd_press_x - event->x),
- ABS (sctree->dnd_press_y - event->y)) <= THRESHOLD)
+ ABS (sctree->dnd_press_y - event->y)) <= threshold)
return FALSE;
/* Handle any pending selections */
diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
@@ -82,38 +82,8 @@ static void close_all_pages(GSList *prefs_pages)
page->destroy_widget(page);
page->page_open = FALSE;
}
- }
-}
-
-#ifdef GENERIC_UMPC
-static void prefs_show_sections(PrefsWindow *prefswindow)
-{
- gint max;
- GtkWidget *paned = prefswindow->paned;
-
- g_object_get (G_OBJECT(paned),
- "max-position",
- &max, NULL);
-
- gtk_widget_show(gtk_paned_get_child1(GTK_PANED(paned)));
- gtk_widget_hide(gtk_paned_get_child2(GTK_PANED(paned)));
- gtk_paned_set_position(GTK_PANED(paned), max);
-}
-
-static void prefs_show_page(PrefsWindow *prefswindow)
-{
- gint min;
- GtkWidget *paned = prefswindow->paned;
-
- g_object_get (G_OBJECT(paned),
- "min-position",
- &min, NULL);
-
- gtk_widget_hide(gtk_paned_get_child1(GTK_PANED(paned)));
- gtk_widget_show(gtk_paned_get_child2(GTK_PANED(paned)));
- gtk_paned_set_position(GTK_PANED(paned), min);
+ }
}
-#endif
static void apply_button_clicked(GtkButton *button, gpointer user_data)
{
@@ -122,10 +92,6 @@ static void apply_button_clicked(GtkButton *button, gpointer user_data)
prefswindow->dialog_response = PREFSWINDOW_RESPONSE_APPLY;
save_all_pages(prefswindow->prefs_pages);
-#ifdef GENERIC_UMPC
- prefs_show_sections(prefswindow);
-#endif
-
if (prefswindow->apply_cb)
prefswindow->apply_cb(prefswindow);
}
@@ -169,11 +135,7 @@ static gboolean window_closed(GtkWidget *widget, GdkEvent *event, gpointer user_
{
PrefsWindow *prefswindow = (PrefsWindow *) user_data;
-#ifdef GENERIC_UMPC
- save_all_pages(prefswindow->prefs_pages);
-#endif
close_prefs_window(prefswindow);
-
return FALSE;
}
@@ -292,10 +254,8 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
(GTK_TREE_VIEW(tree_view)));
GSList *cur;
gint index; /* index in pages list */
-#ifndef GENERIC_UMPC
GtkTreeSelection *selection;
GtkTreeIter iter;
-#endif
for (cur = prefs_pages, index = 0; cur != NULL; cur = g_slist_next(cur), index++) {
PrefsPage *page = (PrefsPage *)cur->data;
@@ -377,7 +337,6 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
prefs_pages = prefswindow_build_all_pages(prefswindow, prefs_pages);
/* select first one or its first child if necessary */
-#ifndef GENERIC_UMPC
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) {
if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter)) {
@@ -387,7 +346,6 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
}
gtk_tree_selection_select_iter(selection, &iter);
}
-#endif
}
void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
@@ -501,38 +459,23 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
gtk_widget_grab_focus(prefswindow->tree_view);
-#ifndef GENERIC_UMPC
gtkut_stock_button_set_create(&prefswindow->confirm_area,
&prefswindow->apply_btn, NULL, _("_Apply"),
&prefswindow->cancel_btn, NULL, _("_Cancel"),
&prefswindow->ok_btn, NULL, _("_OK"));
-#else
- gtkut_stock_button_set_create(&prefswindow->confirm_area,
- &prefswindow->apply_btn, NULL, _("_Apply"),
- &prefswindow->ok_btn, "window-close", _("_Close"),
- NULL, NULL, NULL);
-#endif
gtk_widget_show_all(prefswindow->confirm_area);
gtk_widget_show(prefswindow->vbox);
gtk_widget_show(prefswindow->scrolledwindow1);
gtk_box_pack_start(GTK_BOX(prefswindow->vbox), prefswindow->confirm_area, FALSE, FALSE, 0);
-#ifndef GENERIC_UMPC
- g_signal_connect(G_OBJECT(prefswindow->ok_btn), "clicked",
+ g_signal_connect(G_OBJECT(prefswindow->ok_btn), "clicked",
G_CALLBACK(ok_button_clicked), prefswindow);
- g_signal_connect(G_OBJECT(prefswindow->cancel_btn), "clicked",
+ g_signal_connect(G_OBJECT(prefswindow->cancel_btn), "clicked",
G_CALLBACK(cancel_button_clicked), prefswindow);
- g_signal_connect(G_OBJECT(prefswindow->apply_btn), "clicked",
- G_CALLBACK(apply_button_clicked), prefswindow);
-#else
- g_signal_connect(G_OBJECT(prefswindow->ok_btn), "clicked",
- G_CALLBACK(ok_button_clicked), prefswindow);
- g_signal_connect(G_OBJECT(prefswindow->apply_btn), "clicked",
+ g_signal_connect(G_OBJECT(prefswindow->apply_btn), "clicked",
G_CALLBACK(apply_button_clicked), prefswindow);
-#endif
-
- g_signal_connect(G_OBJECT(prefswindow->window), "delete_event",
+ g_signal_connect(G_OBJECT(prefswindow->window), "delete_event",
G_CALLBACK(window_closed), prefswindow);
g_signal_connect(G_OBJECT(prefswindow->window), "key_press_event",
G_CALLBACK(prefswindow_key_pressed), &(prefswindow->window));
@@ -568,9 +511,6 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
*(prefswindow->save_height));
}
-#ifdef GENERIC_UMPC
- prefs_show_sections(prefswindow);
-#endif
gtk_widget_show(prefswindow->window);
adj = gtk_scrolled_window_get_vadjustment(
GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1));
@@ -666,10 +606,8 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
GtkAdjustment *adj;
gchar *markup;
-#ifndef GENERIC_UMPC
- if (currently_selected)
+ if (currently_selected)
return TRUE;
-#endif
if (!gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &iter, path))
return TRUE;
@@ -710,10 +648,5 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
adj = gtk_scrolled_window_get_hadjustment(
GTK_SCROLLED_WINDOW(page->widget));
gtk_adjustment_set_value(adj, lower);
-
-#ifdef GENERIC_UMPC
- prefs_show_page(prefswindow);
-#endif
return TRUE;
}
-
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -109,18 +109,17 @@ static void main_window_menu_callback_block (MainWindow *mainwin);
static void main_window_menu_callback_unblock (MainWindow *mainwin);
static void main_window_show_cur_account (MainWindow *mainwin);
-#ifndef GENERIC_UMPC
+
static void main_window_separation_change (MainWindow *mainwin,
LayoutType layout_mode);
-#endif
+
static void main_window_set_widgets (MainWindow *mainwin,
LayoutType layout_mode);
-#ifndef GENERIC_UMPC
static gboolean ac_label_button_pressed (GtkWidget *widget,
GdkEventButton *event,
gpointer data);
-#endif
+
static gint main_window_close_cb (GtkWidget *widget,
GdkEventAny *event,
gpointer data);
@@ -169,11 +168,11 @@ static void toggle_message_cb (GtkAction *action,
static void toggle_toolbar_cb (GtkAction *action, GtkRadioAction *current, gpointer data);
static void toggle_col_headers_cb(GtkAction *action,
gpointer data);
-#ifndef GENERIC_UMPC
+
static void toggle_statusbar_cb (GtkAction *action,
gpointer data);
static void set_layout_cb (GtkAction *action, GtkRadioAction *current, gpointer data);
-#endif
+
static void addressbook_open_cb (GtkAction *action,
gpointer data);
static void log_window_show_cb (GtkAction *action,
@@ -386,10 +385,10 @@ static void account_selector_menu_cb (GtkMenuItem *menuitem,
gpointer data);
static void account_receive_menu_cb (GtkMenuItem *menuitem,
gpointer data);
-#ifndef GENERIC_UMPC
+
static void account_compose_menu_cb (GtkMenuItem *menuitem,
gpointer data);
-#endif
+
static void prefs_open_cb (GtkAction *action,
gpointer data);
@@ -547,7 +546,6 @@ static GtkActionEntry mainwin_entries[] =
{"Edit/SearchFolder", NULL, N_("_Search folder..."), "<shift><control>F", NULL, G_CALLBACK(search_folder_cb) },
{"Edit/QuickSearch", NULL, N_("_Quick search"), "slash", NULL, G_CALLBACK(mainwindow_quicksearch) },
-/* View menu */
{"View/ShowHide", NULL, N_("Show or hi_de"), NULL, NULL, NULL },
{"View/ShowHide/Toolbar", NULL, N_("_Toolbar"), NULL, NULL, NULL },
@@ -556,10 +554,7 @@ static GtkActionEntry mainwin_entries[] =
{"View/SetColumns/Messagelist", NULL, N_("In _message list..."), NULL, NULL, G_CALLBACK(set_summary_display_item_cb) },
{"View/---", NULL, "---", NULL, NULL, NULL },
-
-#ifndef GENERIC_UMPC
{"View/Layout", NULL, N_("La_yout"), NULL, NULL, NULL },
-#endif
{"View/Sort", NULL, N_("_Sort"), NULL, NULL, NULL },
{"View/Sort/---", NULL, "---", NULL, NULL, NULL },
{"View/Sort/AttractSubj", NULL, N_("_Attract by subject"), NULL, NULL, G_CALLBACK(attract_by_subject_cb) },
@@ -811,9 +806,7 @@ static GtkToggleActionEntry mainwin_toggle_entries[] = {
{"File/OfflineMode", NULL, N_("Offline _mode"), "<control>W", NULL, G_CALLBACK(toggle_work_offline_cb), FALSE }, /*toggle*/
{"View/ShowHide/MenuBar", NULL, N_("Men_ubar"), "<control>F12", NULL, G_CALLBACK(toggle_menubar_cb), FALSE }, /* toggle */
{"View/ShowHide/MessageView", NULL, N_("_Message view"), "V", NULL, G_CALLBACK(toggle_message_cb), FALSE }, /* toggle */
-#ifndef GENERIC_UMPC
{"View/ShowHide/StatusBar", NULL, N_("Status _bar"), NULL, NULL, G_CALLBACK(toggle_statusbar_cb), FALSE }, /* toggle */
-#endif
{"View/ShowHide/ColumnHeaders", NULL, N_("Column headers"), NULL, NULL, G_CALLBACK(toggle_col_headers_cb), FALSE }, /* toggle */
{"View/ThreadView", NULL, N_("Th_read view"), "<control>T", NULL, G_CALLBACK(thread_cb), FALSE }, /* toggle */
{"View/HideReadThreads", NULL, N_("Hide read threads"), NULL, NULL, G_CALLBACK(hide_read_threads), FALSE }, /* toggle */
@@ -831,11 +824,9 @@ static GtkRadioActionEntry mainwin_showhide_radio_entries[] = { /* toggle_toolba
{"View/ShowHide/Toolbar/TextBesideIcon", NULL, N_("Text be_side icons"), NULL, NULL, TOOLBAR_BOTH_HORIZ }, /* radio TOOLBAR_BOTH_HORIZ */
{"View/ShowHide/Toolbar/IconOnly", NULL, N_("_Icons only"), NULL, NULL, TOOLBAR_ICON }, /* radio TOOLBAR_ICON */
{"View/ShowHide/Toolbar/TextOnly", NULL, N_("_Text only"), NULL, NULL, TOOLBAR_TEXT }, /* radio TOOLBAR_TEXT */
-#ifndef GENERIC_UMPC
{"View/ShowHide/Toolbar/Hide", NULL, N_("_Hide"), NULL, NULL, TOOLBAR_NONE }, /* radio TOOLBAR_NONE */
-#endif
};
-#ifndef GENERIC_UMPC
+
static GtkRadioActionEntry mainwin_layout_radio_entries[] = { /* set_layout_cb */
{"View/Layout/Standard", NULL, N_("_Standard"), NULL, NULL, NORMAL_LAYOUT }, /* radio NORMAL_LAYOUT */
{"View/Layout/ThreeColumns", NULL, N_("_Three columns"), NULL, NULL, VERTICAL_LAYOUT }, /* radio VERTICAL_LAYOUT */
@@ -843,7 +834,7 @@ static GtkRadioActionEntry mainwin_layout_radio_entries[] = { /* set_layout_cb *
{"View/Layout/WideMessageList", NULL, N_("W_ide message list"), NULL, NULL, WIDE_MSGLIST_LAYOUT }, /* radio WIDE_MSGLIST_LAYOUT */
{"View/Layout/SmallScreen", NULL, N_("S_mall screen"), NULL, NULL, SMALL_LAYOUT }, /* radio SMALL_LAYOUT */
};
-#endif
+
static GtkRadioActionEntry mainwin_sort_radio_entries[] = { /* sort_summary_cb */
{"View/Sort/Number", NULL, N_("By _number"), NULL, NULL, SORT_BY_NUMBER }, /* radio SORT_BY_NUMBER */
{"View/Sort/Size", NULL, N_("By s_ize"), NULL, NULL, SORT_BY_SIZE }, /* radio SORT_BY_SIZE */
@@ -1298,7 +1289,7 @@ static void mainwindow_tags_menu_create(MainWindow *mainwin, gboolean refresh)
gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menuitem), menu);
mainwin->tags_menu = menu;
}
-#ifndef GENERIC_UMPC
+
static void warning_btn_pressed(GtkButton *btn, gpointer data)
{
MainWindow *mainwin = (MainWindow *)data;
@@ -1330,7 +1321,7 @@ static gboolean warning_enter_notify(GtkWidget *widget,
gdk_window_set_cursor(gtk_widget_get_window(mainwindow->warning_btn), hand_cursor);
return FALSE;
}
-#endif
+
void mainwindow_show_error(void)
{
MainWindow *mainwin = mainwindow_get_mainwindow();
@@ -1403,7 +1394,6 @@ MainWindow *main_window_create()
GtkWidget *handlebox;
GtkWidget *vbox_body;
GtkWidget *menuitem;
-#ifndef GENERIC_UMPC
GtkWidget *hbox_stat;
GtkWidget *statusbar;
GtkWidget *progressbar;
@@ -1413,7 +1403,6 @@ MainWindow *main_window_create()
GtkWidget *online_pixmap;
GtkWidget *offline_pixmap;
GtkWidget *warning_btn;
-#endif
GtkWidget *online_switch;
GtkWidget *offline_switch;
FolderView *folderview;
@@ -1431,9 +1420,6 @@ MainWindow *main_window_create()
window = GTK_WIDGET(gtkut_window_new(GTK_WINDOW_TOPLEVEL, "mainwindow"));
gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
-#ifdef GENERIC_UMPC
- prefs_common.layout_mode = SMALL_LAYOUT;
-#endif
if (!geometry.min_height) {
geometry.min_width = 320;
geometry.min_height = 200;
@@ -1474,10 +1460,10 @@ MainWindow *main_window_create()
G_N_ELEMENTS(mainwin_toggle_entries), (gpointer)mainwin);
gtk_action_group_add_radio_actions(mainwin->action_group, mainwin_showhide_radio_entries,
G_N_ELEMENTS(mainwin_showhide_radio_entries), C_AUTO, G_CALLBACK(toggle_toolbar_cb), (gpointer)mainwin);
-#ifndef GENERIC_UMPC
+
gtk_action_group_add_radio_actions(mainwin->action_group, mainwin_layout_radio_entries,
G_N_ELEMENTS(mainwin_layout_radio_entries), C_AUTO, G_CALLBACK(set_layout_cb), (gpointer)mainwin);
-#endif
+
gtk_action_group_add_radio_actions(mainwin->action_group, mainwin_sort_radio_entries,
G_N_ELEMENTS(mainwin_sort_radio_entries), C_AUTO, G_CALLBACK(sort_summary_cb), (gpointer)mainwin);
gtk_action_group_add_radio_actions(mainwin->action_group, mainwin_sorttype_radio_entries,
@@ -1536,13 +1522,9 @@ MainWindow *main_window_create()
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/ShowHide/Toolbar", "TextBesideIcon", "View/ShowHide/Toolbar/TextBesideIcon", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/ShowHide/Toolbar", "IconOnly", "View/ShowHide/Toolbar/IconOnly", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/ShowHide/Toolbar", "TextOnly", "View/ShowHide/Toolbar/TextOnly", GTK_UI_MANAGER_MENUITEM)
-#ifndef GENERIC_UMPC
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/ShowHide/Toolbar", "Hide", "View/ShowHide/Toolbar/Hide", GTK_UI_MANAGER_MENUITEM)
-#endif
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/ShowHide", "MessageView", "View/ShowHide/MessageView", GTK_UI_MANAGER_MENUITEM)
-#ifndef GENERIC_UMPC
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/ShowHide", "StatusBar", "View/ShowHide/StatusBar", GTK_UI_MANAGER_MENUITEM)
-#endif
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/ShowHide", "ColumnHeaders", "View/ShowHide/ColumnHeaders", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "SetColumns", "View/SetColumns", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/SetColumns", "Folderlist", "View/SetColumns/Folderlist", GTK_UI_MANAGER_MENUITEM)
@@ -1550,7 +1532,6 @@ MainWindow *main_window_create()
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Separator1", "View/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "FullScreen", "View/FullScreen", GTK_UI_MANAGER_MENUITEM)
-#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)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Layout", "ThreeColumns", "View/Layout/ThreeColumns", GTK_UI_MANAGER_MENUITEM)
@@ -1558,8 +1539,6 @@ MainWindow *main_window_create()
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Layout", "WideMessageList", "View/Layout/WideMessageList", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Layout", "SmallScreen", "View/Layout/SmallScreen", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Separator2", "View/---", GTK_UI_MANAGER_SEPARATOR)
-#endif
-
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Sort", "View/Sort", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Sort", "Number", "View/Sort/Number", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Sort", "Size", "View/Sort/Size", GTK_UI_MANAGER_MENUITEM)
@@ -1901,7 +1880,6 @@ MainWindow *main_window_create()
gtk_container_set_border_width(GTK_CONTAINER(vbox_body), BORDER_WIDTH);
gtk_box_pack_start(GTK_BOX(vbox), vbox_body, TRUE, TRUE, 0);
-#ifndef GENERIC_UMPC
hbox_stat = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
gtk_widget_set_name(GTK_WIDGET(hbox_stat), "hbox_stat");
gtk_box_pack_end(GTK_BOX(vbox_body), hbox_stat, FALSE, FALSE, 0);
@@ -1972,12 +1950,7 @@ MainWindow *main_window_create()
gtk_widget_hide(offline_switch);
gtk_widget_hide(progressbar);
gtk_widget_hide(warning_btn);
-#else
- online_switch = gtk_button_new ();
- offline_switch = gtk_button_new ();
- g_signal_connect (G_OBJECT(online_switch), "clicked", G_CALLBACK(online_switch_clicked), mainwin);
- g_signal_connect (G_OBJECT(offline_switch), "clicked", G_CALLBACK(online_switch_clicked), mainwin);
-#endif
+
/* create views */
mainwin->folderview = folderview = folderview_create(mainwin);
mainwin->summaryview = summaryview = summary_create(mainwin);
@@ -2025,7 +1998,6 @@ MainWindow *main_window_create()
mainwin->vbox_body = vbox_body;
mainwin->online_switch = online_switch;
mainwin->offline_switch = offline_switch;
-#ifndef GENERIC_UMPC
messageview->statusbar = statusbar;
mainwin->statusbar = statusbar;
mainwin->hbox_stat = hbox_stat;
@@ -2046,18 +2018,6 @@ MainWindow *main_window_create()
(GTK_STATUSBAR(statusbar), "Message View");
messageview->statusbar_cid = mainwin->messageview_cid;
-#else
- messageview->statusbar = NULL;
- mainwin->statusbar = NULL;
- mainwin->hbox_stat = NULL;
- /* mainwin->progressbar is set in toolbar.c */
- mainwin->statuslabel = NULL;
- mainwin->online_pixmap = NULL;
- mainwin->offline_pixmap = NULL;
- mainwin->ac_button = NULL;
- mainwin->ac_label = NULL;
-#endif
-
/* allocate colors for summary view and folder view */
summaryview->color_marked.red = summaryview->color_marked.green = 0;
summaryview->color_marked.blue = (guint16)65535;
@@ -2103,12 +2063,12 @@ MainWindow *main_window_create()
toolbar_set_style(mainwin->toolbar->toolbar,
mainwin->handlebox,
prefs_common.toolbar_style);
-#ifndef GENERIC_UMPC
+
gtk_widget_hide(mainwin->hbox_stat);
menuitem = gtk_ui_manager_get_widget(mainwin->ui_manager, "/Menu/View/ShowHide/StatusBar");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
prefs_common.show_statusbar);
-#endif
+
menuitem = gtk_ui_manager_get_widget(mainwin->ui_manager, "/Menu/View/ShowHide/ColumnHeaders");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
prefs_common.show_col_headers);
@@ -2266,9 +2226,8 @@ static gboolean reflect_prefs_timeout_cb(gpointer data)
gboolean pixmap_theme_changed = GPOINTER_TO_INT(data);
GList *cur;
MainWindow *mainwin;
-#ifndef GENERIC_UMPC
GtkWidget *pixmap;
-#endif
+
for (cur = mainwin_list; cur != NULL; cur = cur->next) {
mainwin = (MainWindow *)cur->data;
@@ -2286,7 +2245,6 @@ static gboolean reflect_prefs_timeout_cb(gpointer data)
summary_reflect_prefs_pixmap_theme(mainwin->summaryview);
foldersel_reflect_prefs_pixmap_theme();
addressbook_reflect_prefs_pixmap_theme();
-#ifndef GENERIC_UMPC
pixmap = stock_pixmap_widget(STOCK_PIXMAP_ONLINE);
gtk_container_remove(GTK_CONTAINER(mainwin->online_switch),
mainwin->online_pixmap);
@@ -2299,7 +2257,6 @@ static gboolean reflect_prefs_timeout_cb(gpointer data)
gtk_container_add (GTK_CONTAINER(mainwin->offline_switch), pixmap);
gtk_widget_show(pixmap);
mainwin->offline_pixmap = pixmap;
-#endif
hooks_invoke(THEME_CHANGED_HOOKLIST, NULL);
}
@@ -2309,9 +2266,7 @@ static gboolean reflect_prefs_timeout_cb(gpointer data)
textview_reflect_prefs(mainwin->messageview->mimeview->textview);
folderview_reflect_prefs();
summary_reflect_prefs();
-#ifndef GENERIC_UMPC
summary_redisplay_msg(mainwin->summaryview);
-#endif
if (prefs_common.layout_mode == SMALL_LAYOUT) {
if (mainwin->in_folder) {
mainwindow_enter_folder(mainwin);
@@ -2532,7 +2487,6 @@ static void main_window_set_toolbar_combo_receive_menu(MainWindow *mainwin,
static void main_window_set_toolbar_combo_compose_menu(MainWindow *mainwin,
GList *account_list)
{
-#ifndef GENERIC_UMPC
GList *cur_ac;
GtkWidget *menuitem;
PrefsAccount *ac_prefs;
@@ -2559,7 +2513,6 @@ static void main_window_set_toolbar_combo_compose_menu(MainWindow *mainwin,
ac_prefs);
}
gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(mainwin->toolbar->compose_mail_btn), menu);
-#endif
}
void main_window_set_account_menu(GList *account_list)
@@ -2613,7 +2566,7 @@ static void main_window_show_cur_account(MainWindow *mainwin)
g_free(ac_name);
}
-#ifndef GENERIC_UMPC
+
static void main_window_separation_change(MainWindow *mainwin, LayoutType layout_mode)
{
GtkWidget *folder_wid = GTK_WIDGET_PTR(mainwin->folderview);
@@ -2645,7 +2598,7 @@ static void main_window_separation_change(MainWindow *mainwin, LayoutType layout
g_object_unref(summary_wid);
g_object_unref(message_wid);
}
-#endif
+
void mainwindow_reset_paned(GtkPaned *paned)
{
gint min, max, mid;
@@ -3583,11 +3536,9 @@ void main_window_show(MainWindow *mainwin)
{
gtk_widget_show(mainwin->window);
gtk_widget_show(mainwin->vbox_body);
-#ifndef GENERIC_UMPC
gtk_window_move(GTK_WINDOW(mainwin->window),
prefs_common.mainwin_x,
prefs_common.mainwin_y);
-#endif
}
void main_window_hide(MainWindow *mainwin)
@@ -3609,10 +3560,8 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
gboolean first_set = (mainwin->hpaned == NULL);
debug_print("Setting widgets...\n");
-#ifndef GENERIC_UMPC
mainwin->messageview->statusbar = mainwin->statusbar;
mainwin->messageview->statusbar_cid = mainwin->messageview_cid;
-#endif
/* clean top-most container */
if (mainwin->hpaned) {
if (gtk_widget_get_parent(mainwin->hpaned) == mainwin->vpaned)
@@ -3780,7 +3729,6 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/ShowHide/MessageView",
messageview_is_visible(mainwin->messageview));
-#ifndef GENERIC_UMPC
switch (prefs_common.layout_mode) {
case NORMAL_LAYOUT:
cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Layout/Standard", TRUE);
@@ -3798,7 +3746,6 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Layout/SmallScreen", TRUE);
break;
}
-#endif
if (folderwin) {
g_signal_connect
@@ -3838,7 +3785,6 @@ void main_window_destroy_all(void)
mainwin_list = NULL;
}
-#ifndef GENERIC_UMPC
static gboolean ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
gpointer data)
{
@@ -3855,7 +3801,7 @@ static gboolean ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event
return TRUE;
}
-#endif
+
static gint main_window_close_cb(GtkWidget *widget, GdkEventAny *event,
gpointer data)
{
@@ -4080,7 +4026,6 @@ static void toggle_col_headers_cb(GtkAction *gaction, gpointer data)
}
}
-#ifndef GENERIC_UMPC
static void toggle_statusbar_cb(GtkAction *gaction, gpointer data)
{
MainWindow *mainwin = (MainWindow *)data;
@@ -4129,7 +4074,6 @@ static void set_layout_cb(GtkAction *action, GtkRadioAction *current, gpointer d
summary_relayout(mainwin->summaryview);
summary_update_unread(mainwin->summaryview, NULL);
}
-#endif
void main_window_toggle_work_offline (MainWindow *mainwin, gboolean offline,
gboolean ask_sync)
@@ -4199,10 +4143,8 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
cm_return_if_fail(mainwin != NULL);
if (btn == GTK_BUTTON(mainwin->online_switch)) {
-#ifndef GENERIC_UMPC
gtk_widget_hide (mainwin->online_switch);
gtk_widget_show (mainwin->offline_switch);
-#endif
cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/File/OfflineMode", TRUE);
inc_autocheck_timer_remove();
@@ -4220,10 +4162,8 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
/*go online */
if (!prefs_common.work_offline)
return;
-#ifndef GENERIC_UMPC
gtk_widget_hide (mainwin->offline_switch);
gtk_widget_show (mainwin->online_switch);
-#endif
cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/File/OfflineMode", FALSE);
prefs_common.work_offline = FALSE;
inc_autocheck_timer_set();
@@ -5068,14 +5008,14 @@ static void account_receive_menu_cb(GtkMenuItem *menuitem, gpointer data)
inc_account_mail(mainwin, account);
}
-#ifndef GENERIC_UMPC
+
static void account_compose_menu_cb(GtkMenuItem *menuitem, gpointer data)
{
PrefsAccount *account = (PrefsAccount *)data;
compose_new_with_folderitem(account, NULL, NULL);
}
-#endif
+
static void prefs_open_cb(GtkAction *action, gpointer data)
{
prefs_gtk_open();
diff --git a/src/messageview.c b/src/messageview.c
@@ -462,12 +462,9 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
GtkWidget *handlebox;
GtkWidget *vbox;
GtkWidget *menubar;
-#ifndef GENERIC_UMPC
GtkWidget *statusbar = NULL;
-#endif
GtkActionGroup *action_group;
-
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(window), vbox);
@@ -679,17 +676,12 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
gtk_widget_realize(handlebox);
msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, handlebox,
(gpointer)msgview);
-#ifndef GENERIC_UMPC
statusbar = gtk_statusbar_new();
gtk_widget_show(statusbar);
gtk_box_pack_end(GTK_BOX(vbox), statusbar, FALSE, FALSE, 0);
msgview->statusbar = statusbar;
msgview->statusbar_cid = gtk_statusbar_get_context_id
(GTK_STATUSBAR(statusbar), "Message View");
-#else
- msgview->statusbar = NULL;
- msgview->statusbar_cid = 0;
-#endif
msgview->handlebox = handlebox;
@@ -1442,9 +1434,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
summary_open_msg(messageview->mainwin->summaryview, FALSE, TRUE);
-#ifndef GENERIC_UMPC
messageview_set_position(messageview, 0);
-#endif
if (messageview->window && msginfo->subject) {
subject = g_strdup(msginfo->subject);
@@ -1702,11 +1692,6 @@ void messageview_delete(MessageView *msgview)
procmsg_msginfo_free(&msginfo);
}
-#ifdef GENERIC_UMPC
- if (msgview->window && !prefs_common.always_show_msg) {
- messageview_destroy(msgview);
- }
-#endif
}
/*
@@ -2386,13 +2371,11 @@ static void prev_cb(GtkAction *action, gpointer data)
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
messageview_show(messageview, msginfo,
messageview->all_headers);
-#endif
} else {
gtk_widget_destroy(messageview->window);
}
@@ -2411,13 +2394,11 @@ static void next_cb(GtkAction *action, gpointer data)
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
messageview_show(messageview, msginfo,
messageview->all_headers);
-#endif
} else {
gtk_widget_destroy(messageview->window);
}
@@ -2436,13 +2417,11 @@ static void prev_unread_cb(GtkAction *action, gpointer data)
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
messageview_show(messageview, msginfo,
messageview->all_headers);
-#endif
} else {
gtk_widget_destroy(messageview->window);
}
@@ -2461,13 +2440,11 @@ static void next_unread_cb(GtkAction *action, gpointer data)
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
messageview_show(messageview, msginfo,
messageview->all_headers);
-#endif
} else {
gtk_widget_destroy(messageview->window);
}
@@ -2486,13 +2463,11 @@ static void prev_new_cb(GtkAction *action, gpointer data)
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
messageview_show(messageview, msginfo,
messageview->all_headers);
-#endif
} else {
gtk_widget_destroy(messageview->window);
}
@@ -2511,13 +2486,11 @@ static void next_new_cb(GtkAction *action, gpointer data)
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
messageview_show(messageview, msginfo,
messageview->all_headers);
-#endif
} else {
gtk_widget_destroy(messageview->window);
}
@@ -2536,13 +2509,11 @@ static void prev_marked_cb(GtkAction *action, gpointer data)
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
messageview_show(messageview, msginfo,
messageview->all_headers);
-#endif
} else {
gtk_widget_destroy(messageview->window);
}
@@ -2561,13 +2532,11 @@ static void next_marked_cb(GtkAction *action, gpointer data)
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
messageview_show(messageview, msginfo,
messageview->all_headers);
-#endif
} else {
gtk_widget_destroy(messageview->window);
}
@@ -2586,13 +2555,11 @@ static void prev_labeled_cb(GtkAction *action, gpointer data)
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
messageview_show(messageview, msginfo,
messageview->all_headers);
-#endif
} else {
gtk_widget_destroy(messageview->window);
}
@@ -2611,13 +2578,11 @@ static void next_labeled_cb(GtkAction *action, gpointer data)
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
messageview_show(messageview, msginfo,
messageview->all_headers);
-#endif
} else {
gtk_widget_destroy(messageview->window);
}
@@ -2672,13 +2637,11 @@ static void parent_cb(GtkAction *action, gpointer data)
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
messageview_show(messageview, msginfo,
messageview->all_headers);
-#endif
} else {
gtk_widget_destroy(messageview->window);
}
@@ -2698,13 +2661,11 @@ static void goto_unread_folder_cb(GtkAction *action, gpointer data)
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
messageview_show(messageview, msginfo,
messageview->all_headers);
-#endif
} else {
gtk_widget_destroy(messageview->window);
}
@@ -2727,13 +2688,11 @@ static void goto_folder_cb(GtkAction *action, gpointer data)
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
messageview_show(messageview, msginfo,
messageview->all_headers);
-#endif
} else {
gtk_widget_destroy(messageview->window);
}
diff --git a/src/mimeview.c b/src/mimeview.c
@@ -491,9 +491,6 @@ MimeView *mimeview_create(MainWindow *mainwin)
gtk_widget_show(hbox);
gtk_widget_hide(ctree_mainbox);
-#ifdef GENERIC_UMPC
- gtk_widget_set_size_request(mime_toggle, -1, r.height + 8);
-#endif
mimeview->hbox = hbox;
mimeview->paned = paned;
mimeview->scrolledwin = scrolledwin;
@@ -2466,24 +2463,21 @@ static gboolean icon_popup_menu(GtkWidget *widget, gpointer data)
return TRUE;
}
-static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
+static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
{
GtkWidget *pixmap = NULL;
GtkWidget *grid;
GtkWidget *button;
gchar *tip;
gchar *tiptmp;
- const gchar *desc = NULL;
+ const gchar *desc = NULL;
gchar *sigshort = NULL;
gchar *content_type;
StockPixmap stockp;
MimeInfo *partinfo;
MimeInfo *siginfo = NULL;
MimeInfo *encrypted = NULL;
-#ifdef GENERIC_UMPC
- GtkRequisition r;
-#endif
-
+
if (!prefs_common.show_inline_attachments && mimeinfo->id)
return;
@@ -2635,33 +2629,28 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
gtk_widget_set_tooltip_markup(button, tip);
g_free(tip);
gtk_widget_show_all(button);
- gtk_drag_source_set(button, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK,
+ gtk_drag_source_set(button, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK,
mimeview_mime_types, 1, GDK_ACTION_COPY);
g_signal_connect(G_OBJECT(button), "popup-menu",
G_CALLBACK(icon_popup_menu), mimeview);
- g_signal_connect(G_OBJECT(button), "button_release_event",
+ g_signal_connect(G_OBJECT(button), "button_release_event",
G_CALLBACK(icon_clicked_cb), mimeview);
- g_signal_connect(G_OBJECT(button), "key_press_event",
+ g_signal_connect(G_OBJECT(button), "key_press_event",
G_CALLBACK(icon_key_pressed), mimeview);
g_signal_connect(G_OBJECT(button), "drag_data_get",
G_CALLBACK(mimeview_drag_data_get), mimeview);
gtk_container_add(GTK_CONTAINER(grid), button);
-#ifdef GENERIC_UMPC
- gtk_widget_get_preferred_size(pixmap, &r, NULL);
- gtk_widget_set_size_request(button, -1, r.height + 4);
-#endif
-
}
static void icon_list_clear (MimeView *mimeview)
{
GList *child, *orig;
GtkAdjustment *adj;
-
+
orig = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_grid));
for (child = orig; child != NULL; child = g_list_next(child)) {
- gtk_container_remove(GTK_CONTAINER(mimeview->icon_grid),
+ gtk_container_remove(GTK_CONTAINER(mimeview->icon_grid),
GTK_WIDGET(child->data));
}
g_list_free(orig);
diff --git a/src/prefs_account.c b/src/prefs_account.c
@@ -551,15 +551,9 @@ static PrefParam receive_param[] = {
&receive_page.rmmail_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
-#ifndef GENERIC_UMPC
{"message_leave_time", "7", &tmp_ac_prefs.msg_leave_time, P_INT,
&receive_page.leave_time_spinbtn,
prefs_set_data_from_spinbtn, prefs_set_spinbtn},
-#else
- {"message_leave_time", "30", &tmp_ac_prefs.msg_leave_time, P_INT,
- &receive_page.leave_time_spinbtn,
- prefs_set_data_from_spinbtn, prefs_set_spinbtn},
-#endif
{"message_leave_hour", "0", &tmp_ac_prefs.msg_leave_hour, P_INT,
&receive_page.leave_hour_spinbtn,
prefs_set_data_from_spinbtn, prefs_set_spinbtn},
@@ -1240,12 +1234,8 @@ static void basic_create_widget_func(PrefsPage * _page,
default_checkbtn = gtk_check_button_new_with_label (_("Set as default"));
gtk_widget_show (default_checkbtn);
-#ifndef GENERIC_UMPC
gtk_box_pack_end (GTK_BOX (hbox), default_checkbtn, TRUE, FALSE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (vbox1), default_checkbtn, FALSE, FALSE, 0);
-
-#endif
+
PACK_FRAME (vbox1, frame1, _("Personal information"));
table1 = gtk_grid_new();
@@ -2104,17 +2094,6 @@ static void send_create_widget_func(PrefsPage * _page,
G_CALLBACK(prefs_account_entry_changed_newline_check_cb),
GINT_TO_POINTER(ac_prefs->protocol));
-#ifdef GENERIC_UMPC
- PACK_SPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
- hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
- gtk_widget_show (hbox);
- gtk_box_pack_start (GTK_BOX (vbox4), hbox, FALSE, FALSE, 0);
-
- hbox_spc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_show (hbox_spc);
- gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
- gtk_widget_set_size_request (hbox_spc, 12, -1);
-#endif
label = gtk_label_new (_("Password"));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
diff --git a/src/prefs_common.c b/src/prefs_common.c
@@ -194,13 +194,8 @@ static PrefParam param[] = {
NULL, NULL, NULL},
{"confirm_send_queued_messages", "FALSE", &prefs_common.confirm_send_queued_messages,
P_BOOL, NULL, NULL, NULL},
-#ifndef GENERIC_UMPC
{"send_dialog_mode", "0", &prefs_common.send_dialog_invisible, P_BOOL,
NULL, NULL, NULL},
-#else
- {"send_dialog_mode", "1", &prefs_common.send_dialog_invisible, P_BOOL,
- NULL, NULL, NULL},
-#endif
{"sendwin_width", "460", &prefs_common.sendwin_width, P_INT,
NULL, NULL, NULL},
{"sendwin_height", "-1", &prefs_common.sendwin_height, P_INT,
@@ -305,13 +300,8 @@ static PrefParam param[] = {
{"default_reply_list", "TRUE", &prefs_common.default_reply_list, P_BOOL,
NULL, NULL, NULL},
-#ifndef GENERIC_UMPC
{"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL,
NULL, NULL, NULL},
-#else
- {"show_ruler", "FALSE", &prefs_common.show_ruler, P_BOOL,
- NULL, NULL, NULL},
-#endif
/* Quote */
{"reply_quote_mark", "> ", &prefs_common.quotemark, P_STRING,
@@ -331,8 +321,6 @@ static PrefParam param[] = {
NULL, NULL, NULL},
/* Display */
- /* fonts */
-#ifndef GENERIC_UMPC
{"message_font_gtk2", "Monospace 9",
&SPECIFIC_PREFS.textfont, P_STRING, NULL, NULL, NULL},
{"print_font_gtk2", "Monospace 9",
@@ -343,18 +331,6 @@ static PrefParam param[] = {
&SPECIFIC_PREFS.normalfont, P_STRING, NULL, NULL, NULL},
{"bold_font_gtk2", "Sans Bold 9",
&SPECIFIC_PREFS.boldfont, P_STRING, NULL, NULL, NULL},
-#else
- {"message_font_gtk2", "Monospace 8",
- &SPECIFIC_PREFS.textfont, P_STRING, NULL, NULL, NULL},
- {"print_font_gtk2", "Monospace 8",
- &SPECIFIC_PREFS.printfont, P_STRING, NULL, NULL, NULL},
- {"small_font_gtk2", "Sans 8",
- &SPECIFIC_PREFS.smallfont, P_STRING, NULL, NULL, NULL},
- {"normal_font_gtk2", "Sans 8",
- &SPECIFIC_PREFS.normalfont, P_STRING, NULL, NULL, NULL},
- {"bold_font_gtk2", "Sans Bold 8",
- &SPECIFIC_PREFS.boldfont, P_STRING, NULL, NULL, NULL},
-#endif
{"use_different_print_font", "FALSE", &prefs_common.use_different_print_font, P_BOOL,
NULL, NULL, NULL},
@@ -470,26 +446,14 @@ static PrefParam param[] = {
{"bold_marked", "FALSE", &prefs_common.bold_marked, P_BOOL,
NULL, NULL, NULL},
-#ifndef GENERIC_UMPC
{"toolbar_style", "3", &prefs_common.toolbar_style, P_ENUM,
NULL, NULL, NULL},
-#else
- {"toolbar_style", "1", &prefs_common.toolbar_style, P_ENUM,
- NULL, NULL, NULL},
-#endif
{"show_col_headers", "TRUE", &prefs_common.show_col_headers, P_BOOL,
NULL, NULL, NULL},
-#ifndef GENERIC_UMPC
{"show_statusbar", "TRUE", &prefs_common.show_statusbar, P_BOOL,
NULL, NULL, NULL},
{"show_searchbar", "TRUE", &prefs_common.show_searchbar, P_BOOL,
NULL, NULL, NULL},
-#else
- {"show_statusbar", "FALSE", &prefs_common.show_statusbar, P_BOOL,
- NULL, NULL, NULL},
- {"show_searchbar", "FALSE", &prefs_common.show_searchbar, P_BOOL,
- NULL, NULL, NULL},
-#endif
{"summary_col_show_mark", "TRUE",
&prefs_common.summary_col_visible[S_COL_MARK], P_BOOL, NULL, NULL, NULL},
@@ -550,22 +514,12 @@ static PrefParam param[] = {
&prefs_common.summary_col_size[S_COL_STATUS], P_INT, NULL, NULL, NULL},
{"summary_col_size_mime", "10",
&prefs_common.summary_col_size[S_COL_MIME], P_INT, NULL, NULL, NULL},
-#ifndef GENERIC_UMPC
{"summary_col_size_subject", "200",
&prefs_common.summary_col_size[S_COL_SUBJECT], P_INT, NULL, NULL, NULL},
{"summary_col_size_from", "120",
&prefs_common.summary_col_size[S_COL_FROM], P_INT, NULL, NULL, NULL},
{"summary_col_size_to", "120",
&prefs_common.summary_col_size[S_COL_TO], P_INT, NULL, NULL, NULL},
-#else
- {"summary_col_size_subject", "300",
- &prefs_common.summary_col_size[S_COL_SUBJECT], P_INT, NULL, NULL, NULL},
- {"summary_col_size_from", "150",
- &prefs_common.summary_col_size[S_COL_FROM], P_INT, NULL, NULL, NULL},
- {"summary_col_size_to", "150",
- &prefs_common.summary_col_size[S_COL_TO], P_INT, NULL, NULL, NULL},
-
-#endif
{"summary_col_size_date", "118",
&prefs_common.summary_col_size[S_COL_DATE], P_INT, NULL, NULL, NULL},
{"summary_col_size_size", "45",
@@ -609,7 +563,6 @@ static PrefParam param[] = {
{"folder_col_pos_total", "3",
&prefs_common.folder_col_pos[F_COL_TOTAL], P_INT, NULL, NULL, NULL},
-#ifndef GENERIC_UMPC
{"folder_col_size_folder", "120",
&prefs_common.folder_col_size[F_COL_FOLDER], P_INT, NULL, NULL, NULL},
{"folder_col_size_new", "32",
@@ -618,16 +571,6 @@ static PrefParam param[] = {
&prefs_common.folder_col_size[F_COL_UNREAD], P_INT, NULL, NULL, NULL},
{"folder_col_size_total", "32",
&prefs_common.folder_col_size[F_COL_TOTAL], P_INT, NULL, NULL, NULL},
-#else
- {"folder_col_size_folder", "400",
- &prefs_common.folder_col_size[F_COL_FOLDER], P_INT, NULL, NULL, NULL},
- {"folder_col_size_new", "32",
- &prefs_common.folder_col_size[F_COL_NEW], P_INT, NULL, NULL, NULL},
- {"folder_col_size_unread", "32",
- &prefs_common.folder_col_size[F_COL_UNREAD], P_INT, NULL, NULL, NULL},
- {"folder_col_size_total", "32",
- &prefs_common.folder_col_size[F_COL_TOTAL], P_INT, NULL, NULL, NULL},
-#endif
{"folder_default_thread", "TRUE", &prefs_common.folder_default_thread, P_BOOL,
NULL, NULL, NULL},
@@ -674,7 +617,6 @@ static PrefParam param[] = {
NULL, NULL, NULL},
{"mainwin_menubar", "TRUE", &prefs_common.mainwin_menubar, P_BOOL,
NULL, NULL, NULL},
-#ifndef GENERIC_UMPC
{"mainwin_width", "800", &prefs_common.mainwin_width, P_INT,
NULL, NULL, NULL},
{"mainwin_height", "600", &prefs_common.mainwin_height, P_INT,
@@ -693,24 +635,6 @@ static PrefParam param[] = {
NULL, NULL, NULL},
{"compose_height", "560", &prefs_common.compose_height, P_INT,
NULL, NULL, NULL},
-#else
- {"mainwin_width", "700", &prefs_common.mainwin_width, P_INT,
- NULL, NULL, NULL},
- {"mainwin_height", "470", &prefs_common.mainwin_height, P_INT,
- NULL, NULL, NULL},
- {"messagewin_width", "700", &prefs_common.msgwin_width, P_INT,
- NULL, NULL, NULL},
- {"messagewin_height", "470", &prefs_common.msgwin_height, P_INT,
- NULL, NULL, NULL},
- {"sourcewin_width", "700", &prefs_common.sourcewin_width, P_INT,
- NULL, NULL, NULL},
- {"sourcewin_height", "470", &prefs_common.sourcewin_height, P_INT,
- NULL, NULL, NULL},
- {"compose_width", "700", &prefs_common.compose_width, P_INT,
- NULL, NULL, NULL},
- {"compose_height", "470", &prefs_common.compose_height, P_INT,
- NULL, NULL, NULL},
-#endif
{"compose_notebook_height", "180", &prefs_common.compose_notebook_height, P_INT,
NULL, NULL, NULL},
{"compose_x", "0", &prefs_common.compose_x, P_INT,
@@ -818,13 +742,8 @@ static PrefParam param[] = {
&prefs_common.show_inline_attachments, P_BOOL, NULL, NULL, NULL},
/* Interface */
-#ifndef GENERIC_UMPC
{"layout_mode", "0", &prefs_common.layout_mode, P_INT,
NULL, NULL, NULL},
-#else
- {"layout_mode", "5", &prefs_common.layout_mode, P_INT,
- NULL, NULL, NULL},
-#endif
/* {"emulate_emacs", "FALSE", &prefs_common.emulate_emacs, P_BOOL,
NULL, NULL, NULL}, */
{"open_selected_message_on_folder_open", "FALSE",
@@ -951,21 +870,13 @@ static PrefParam param[] = {
NULL, NULL, NULL},
{"summary_quicksearch_type", "0", &prefs_common.summary_quicksearch_type, P_INT,
NULL, NULL, NULL},
-#ifndef GENERIC_UMPC
+
{"summary_quicksearch_recurse", "1", &prefs_common.summary_quicksearch_recurse, P_INT,
NULL, NULL, NULL},
-#else
- {"summary_quicksearch_recurse", "0", &prefs_common.summary_quicksearch_recurse, P_INT,
- NULL, NULL, NULL},
-#endif
-#if defined(__OpenBSD__)
- {"io_timeout_secs", "80", &prefs_common.io_timeout_secs,
- P_INT, NULL, NULL, NULL},
-#else
{"io_timeout_secs", "60", &prefs_common.io_timeout_secs,
P_INT, NULL, NULL, NULL},
-#endif
+
{"hide_score", "-9999", &prefs_common.kill_score, P_INT,
NULL, NULL, NULL},
{"important_score", "1", &prefs_common.important_score, P_INT,
@@ -975,7 +886,6 @@ static PrefParam param[] = {
NULL, NULL, NULL},
{"log_length", "500", &prefs_common.loglength, P_INT,
NULL, NULL, NULL},
-#ifndef GENERIC_UMPC
{"enable_log_standard", "TRUE", &prefs_common.enable_log_standard, P_BOOL,
NULL, NULL, NULL},
{"enable_log_warning", "TRUE", &prefs_common.enable_log_warning, P_BOOL,
@@ -984,16 +894,6 @@ static PrefParam param[] = {
NULL, NULL, NULL},
{"enable_log_status", "TRUE", &prefs_common.enable_log_status, P_BOOL,
NULL, NULL, NULL},
-#else
- {"enable_log_standard", "FALSE", &prefs_common.enable_log_standard, P_BOOL,
- NULL, NULL, NULL},
- {"enable_log_warning", "FALSE", &prefs_common.enable_log_warning, P_BOOL,
- NULL, NULL, NULL},
- {"enable_log_error", "FALSE", &prefs_common.enable_log_error, P_BOOL,
- NULL, NULL, NULL},
- {"enable_log_status", "FALSE", &prefs_common.enable_log_status, P_BOOL,
- NULL, NULL, NULL},
-#endif
{"log_msg_color", "#00af00", &prefs_common.color[COL_LOG_MSG],
P_COLOR, NULL, NULL, NULL},
{"log_warn_color", "#af0000", &prefs_common.color[COL_LOG_WARN],
@@ -1190,13 +1090,10 @@ static PrefParam param[] = {
NULL, NULL, NULL},
{"stripes_color_offset", "4000", &prefs_common.stripes_color_offset, P_INT,
NULL, NULL, NULL},
-#ifndef GENERIC_UMPC
+
{"enable_hscrollbar", "FALSE", &prefs_common.enable_hscrollbar, P_BOOL,
NULL, NULL, NULL},
-#else
- {"enable_hscrollbar", "TRUE", &prefs_common.enable_hscrollbar, P_BOOL,
- NULL, NULL, NULL},
-#endif
+
{"folderview_vscrollbar_policy", "0",
&prefs_common.folderview_vscrollbar_policy, P_ENUM,
NULL, NULL, NULL},
@@ -1205,17 +1102,12 @@ static PrefParam param[] = {
NULL, NULL, NULL},
{"hover_timeout", "500", &prefs_common.hover_timeout, P_INT,
NULL, NULL, NULL},
-#ifndef GENERIC_UMPC
+
{"cache_max_mem_usage", "4096", &prefs_common.cache_max_mem_usage, P_INT,
NULL, NULL, NULL},
{"cache_min_keep_time", "15", &prefs_common.cache_min_keep_time, P_INT,
NULL, NULL, NULL},
-#else
- {"cache_max_mem_usage", "4096", &prefs_common.cache_max_mem_usage, P_INT,
- NULL, NULL, NULL},
- {"cache_min_keep_time", "0", &prefs_common.cache_min_keep_time, P_INT,
- NULL, NULL, NULL},
-#endif
+
{"thread_by_subject_max_age", "10", &prefs_common.thread_by_subject_max_age,
P_INT, NULL, NULL, NULL },
{"last_opened_folder", "", &prefs_common.last_opened_folder,
@@ -1246,13 +1138,8 @@ static PrefParam param[] = {
NULL, NULL, NULL},
{"unsafe_ssl_certs", "FALSE", &prefs_common.unsafe_ssl_certs, P_BOOL,
NULL, NULL, NULL},
-#ifndef GENERIC_UMPC
{"real_time_sync", "FALSE", &prefs_common.real_time_sync, P_BOOL,
NULL, NULL, NULL},
-#else
- {"real_time_sync", "TRUE", &prefs_common.real_time_sync, P_BOOL,
- NULL, NULL, NULL},
-#endif
{"print_paper_type", NULL, &prefs_common.print_paper_type, P_STRING,
NULL, NULL, NULL},
diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
@@ -92,19 +92,18 @@ static void prefs_display_header_insert_header (GtkListStore *store,
gchar *name,
DisplayHeaderProp *dp);
static GtkWidget *prefs_display_header_list_view_create (const gchar *name);
-static void prefs_filtering_create_list_view_columns (GtkWidget *list_view,
+static void prefs_filtering_create_list_view_columns (GtkWidget *list_view,
const gchar *name);
static void headers_list_model_rows_reordered (GtkTreeModel *model,
- GtkTreePath *path,
+ GtkTreePath *path,
GtkTreeIter *iter,
gpointer arg,
GtkTreeView *list_view);
-
+
static void drag_end (GtkTreeView *list_view,
GdkDragContext *context,
gpointer data);
-#ifndef GENERIC_UMPC
static gchar *defaults[] =
{
"From",
@@ -134,37 +133,7 @@ static gchar *defaults[] =
"-Priority",
"-X-Face"
};
-#else
-static gchar *defaults[] =
-{
- "From",
- "To",
- "Cc",
- "Bcc",
- "Subject",
- "Date",
- "Newsgroups",
- "Followup-To",
- "-Reply-To",
- "-Sender",
- "-User-Agent",
- "-X-Mailer",
- "-Organization",
- "-X-Newsreader",
- "-Received",
- "-Message-ID",
- "-In-Reply-To",
- "-References",
- "-MIME-Version",
- "-Content-Type",
- "-Content-Transfer-Encoding",
- "-X-UIDL",
- "-Precedence",
- "-Status",
- "-Priority",
- "-X-Face"
-};
-#endif
+
static void prefs_display_header_set_default(void)
{
gint i;
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
@@ -327,10 +327,8 @@ static void prefs_filtering_create(void)
GtkWidget *top_btn;
GtkWidget *up_btn;
GtkWidget *down_btn;
-#ifndef GENERIC_UMPC
GtkWidget *page_up_btn;
GtkWidget *page_down_btn;
-#endif
GtkWidget *bottom_btn;
GtkWidget *table;
static GdkGeometry geometry;
@@ -515,7 +513,6 @@ static void prefs_filtering_create(void)
CLAWS_SET_TIP(top_btn,
_("Move the selected rule to the top"));
-#ifndef GENERIC_UMPC
page_up_btn = gtk_button_new_with_mnemonic (_("Page u_p"));
gtk_button_set_image(GTK_BUTTON(page_up_btn),
gtk_image_new_from_icon_name("go-up-symbolic",GTK_ICON_SIZE_BUTTON));
@@ -525,7 +522,6 @@ static void prefs_filtering_create(void)
G_CALLBACK(prefs_filtering_page_up), NULL);
CLAWS_SET_TIP(page_up_btn,
_("Move the selected rule one page up"));
-#endif
up_btn = gtkut_stock_button("go-up", _("_Up"));
gtk_widget_show (up_btn);
@@ -543,7 +539,6 @@ static void prefs_filtering_create(void)
CLAWS_SET_TIP(down_btn,
_("Move the selected rule down"));
-#ifndef GENERIC_UMPC
page_down_btn = gtk_button_new_with_mnemonic (_("Page dow_n"));
gtk_button_set_image(GTK_BUTTON(page_down_btn),
gtk_image_new_from_icon_name("go-down-symbolic",GTK_ICON_SIZE_BUTTON));
@@ -553,7 +548,6 @@ static void prefs_filtering_create(void)
G_CALLBACK(prefs_filtering_page_down), NULL);
CLAWS_SET_TIP(page_down_btn,
_("Move the selected rule one page down"));
-#endif
bottom_btn = gtkut_stock_button("go-bottom", _("_Bottom"));
gtk_widget_show (bottom_btn);
@@ -1689,11 +1683,6 @@ static GtkActionEntry prefs_filtering_popup_entries[] =
{"PrefsFilteringPopup/Delete", NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(prefs_filtering_delete_cb) },
{"PrefsFilteringPopup/DeleteAll", NULL, N_("Delete _all"), NULL, NULL, G_CALLBACK(prefs_filtering_delete_all_cb) },
{"PrefsFilteringPopup/Duplicate", NULL, N_("D_uplicate"), NULL, NULL, G_CALLBACK(prefs_filtering_duplicate_cb) },
-#ifdef GENERIC_UMPC
- {"PrefsFilteringPopup/---", NULL, "---", NULL, NULL, NULL },
- {"PrefsFilteringPopup/PageUp", NULL, N_("Move one page up"), NULL, NULL, G_CALLBACK(prefs_filtering_page_up) },
- {"PrefsFilteringPopup/PageDown", NULL, N_("Move one page down"), NULL, NULL, G_CALLBACK(prefs_filtering_page_down) },
-#endif
};
static void prefs_filtering_row_selected(GtkTreeSelection *selection,
@@ -1741,11 +1730,6 @@ static gint prefs_filtering_list_btn_pressed(GtkWidget *widget, GdkEventButton *
MENUITEM_ADDUI("/Menus/PrefsFilteringPopup", "Delete", "PrefsFilteringPopup/Delete", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI("/Menus/PrefsFilteringPopup", "DeleteAll", "PrefsFilteringPopup/DeleteAll", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI("/Menus/PrefsFilteringPopup", "Duplicate", "PrefsFilteringPopup/Duplicate", GTK_UI_MANAGER_MENUITEM)
-#ifdef GENERIC_UMPC
- MENUITEM_ADDUI("/Menus/PrefsFilteringPopup", "Separator1", "PrefsFilteringPopup/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI("/Menus/PrefsFilteringPopup", "PageUp", "PrefsFilteringPopup/PageUp", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI("/Menus/PrefsFilteringPopup", "PageDown", "PrefsFilteringPopup/PageDown", GTK_UI_MANAGER_MENUITEM)
-#endif
prefs_filtering_popup_menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
gtk_ui_manager_get_widget(gtkut_ui_manager(), "/Menus/PrefsFilteringPopup")) );
}
@@ -1793,9 +1777,6 @@ static GtkWidget *prefs_filtering_list_view_create(void)
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(
GTK_TREE_MODEL(store)));
g_object_unref(store);
-#ifdef GENERIC_UMPC
- g_object_set(list_view, "allow-checkbox-mode", FALSE, NULL);
-#endif
g_signal_connect(G_OBJECT(list_view), "popup-menu",
G_CALLBACK(prefs_filtering_list_popup_menu), list_view);
diff --git a/src/prefs_template.c b/src/prefs_template.c
@@ -267,11 +267,7 @@ static void prefs_template_window_create(void)
}
}
gtk_widget_show(text_value);
-#ifndef GENERIC_UMPC
gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(scroll2), 120);
-#else
- gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(scroll2), 60);
-#endif
gtk_container_add(GTK_CONTAINER(scroll2), text_value);
gtk_text_view_set_editable(GTK_TEXT_VIEW(text_value), TRUE);
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text_value), GTK_WRAP_WORD);
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
@@ -789,9 +789,6 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
GtkWidget *reg_hbox;
GtkWidget *arrow;
GtkWidget *btn_hbox;
-#ifdef GENERIC_UMPC
- GtkWidget *hbox;
-#endif
GtkWidget *reg_btn;
GtkWidget *subst_btn;
GtkWidget *del_btn;
@@ -929,13 +926,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
prefs_toolbar);
default_btn = gtk_button_new_with_label(_(" Use default "));
-#ifndef GENERIC_UMPC
gtk_box_pack_end(GTK_BOX(reg_hbox), default_btn, FALSE, TRUE, 0);
-#else
- hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start(GTK_BOX(main_vbox), hbox, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), default_btn, FALSE, FALSE, 0);
-#endif
g_signal_connect(G_OBJECT(default_btn), "clicked",
G_CALLBACK(prefs_toolbar_default),
prefs_toolbar);
diff --git a/src/statusbar.c b/src/statusbar.c
@@ -148,19 +148,14 @@ void statusbar_verbosity_set(gboolean verbose)
}
}
-void statusbar_progress_all (gint done, gint total, gint step)
+void statusbar_progress_all (gint done, gint total, gint step)
{
GtkProgressBar *progressbar = GTK_PROGRESS_BAR(
mainwindow_get_mainwindow()->progressbar);
gchar buf[32];
-
+
if (total && done % step == 0) {
-#ifdef GENERIC_UMPC
- /* use a more compact format */
- const gchar *format = "%d/%d";
-#else
const gchar *format = "%d / %d";
-#endif
g_snprintf(buf, sizeof(buf), format, done, total);
gtk_progress_bar_set_show_text(progressbar, TRUE);
gtk_progress_bar_set_text(progressbar, buf);
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
@@ -94,11 +94,7 @@
#include "pixmaps/claws_mail_icon.xpm"
#include "pixmaps/claws_mail_icon_64.xpm"
#include "pixmaps/claws_mail_compose_logo.xpm"
-#ifndef GENERIC_UMPC
#include "pixmaps/claws_mail_logo.xpm"
-#else
-#include "pixmaps/claws_mail_logo_small.xpm"
-#endif
#include "pixmaps/address_book.xpm"
#include "pixmaps/unread.xpm"
#include "pixmaps/read.xpm"
@@ -280,11 +276,7 @@ static PrivPixmapData privpixmaps[] =
{
{claws_mail_icon_xpm , NULL, NULL, "claws_mail_icon", NULL, NULL},
{claws_mail_icon_64_xpm , NULL, NULL, "claws_mail_icon_64", NULL, NULL},
-#ifndef GENERIC_UMPC
{claws_mail_logo_xpm , NULL, NULL, "claws_mail_logo", NULL, NULL},
-#else
- {claws_mail_logo_small_xpm , NULL, NULL, "claws_mail_logo_small", NULL, NULL},
-#endif
{empty_xpm , NULL, NULL, "empty", NULL, NULL}
};
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -249,11 +249,7 @@ static GtkWidget *summary_ctree_create (SummaryView *summaryview);
static gint summary_toggle_pressed (GtkWidget *eventbox,
GdkEventButton *event,
SummaryView *summaryview);
-#ifdef GENERIC_UMPC
-static void summary_toggle_multiple_pressed
- (GtkWidget *widget,
- SummaryView *summaryview);
-#endif
+
static gint summary_folder_eventbox_pressed
(GtkWidget *eventbox,
GdkEventButton *event,
@@ -433,9 +429,7 @@ static GtkActionEntry summary_popup_entries[] =
{"SummaryViewPopup/ColorLabel", NULL, N_("Color la_bel"), NULL, NULL, NULL },
{"SummaryViewPopup/Tags", NULL, N_("Ta_gs"), NULL, NULL, NULL },
{"SummaryViewPopup/CreateFilterRule", NULL, N_("Create _filter rule"), NULL, NULL, NULL },
-#ifndef GENERIC_UMPC
{"SummaryViewPopup/CreateProcessingRule", NULL, N_("Create processing rule"), NULL, NULL, NULL },
-#endif
{"SummaryViewPopup/View", NULL, N_("_View"), NULL, NULL, NULL },
};
@@ -555,9 +549,6 @@ SummaryView *summary_create(MainWindow *mainwin)
GtkWidget *statlabel_msgs;
GtkWidget *hbox_spc;
GtkWidget *toggle_eventbox;
-#ifdef GENERIC_UMPC
- GtkWidget *multiple_sel_togbtn;
-#endif
GtkWidget *toggle_arrow;
GtkWidget *toggle_search;
QuickSearch *quicksearch;
@@ -620,17 +611,6 @@ SummaryView *summary_create(MainWindow *mainwin)
G_CALLBACK(summary_toggle_pressed),
summaryview);
-#ifdef GENERIC_UMPC
- multiple_sel_togbtn = gtk_toggle_button_new();
- gtk_widget_show(multiple_sel_togbtn);
- gtk_box_pack_end(GTK_BOX(hbox), multiple_sel_togbtn, FALSE, FALSE, HSPACING_NARROW);
- CLAWS_SET_TIP(multiple_sel_togbtn,
- _("Toggle multiple selection"));
- g_signal_connect(G_OBJECT(multiple_sel_togbtn), "toggled",
- G_CALLBACK(summary_toggle_multiple_pressed),
- summaryview);
-#endif
-
statlabel_msgs = gtk_label_new("");
gtk_widget_show(statlabel_msgs);
gtk_box_pack_end(GTK_BOX(stat_box), statlabel_msgs, FALSE, FALSE, HSPACING_NARROW);
@@ -647,11 +627,10 @@ SummaryView *summary_create(MainWindow *mainwin)
summaryview->mainwidget_book = gtk_notebook_new();
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(summaryview->mainwidget_book), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(summaryview->mainwidget_book), FALSE);
-#ifndef GENERIC_UMPC
+
gtk_container_add(GTK_CONTAINER(summaryview->mainwidget_book),
scrolledwin);
gtk_box_pack_start(GTK_BOX(vbox), summaryview->mainwidget_book, TRUE, TRUE, 0);
-#endif
ctree = summary_ctree_create(summaryview);
gtk_widget_show(ctree);
@@ -666,15 +645,9 @@ SummaryView *summary_create(MainWindow *mainwin)
gtk_widget_show_all(stat_vbox);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- /* quick search */
quicksearch = quicksearch_new();
gtk_box_pack_start(GTK_BOX(vbox), quicksearch_get_widget(quicksearch), FALSE, FALSE, 0);
-#ifdef GENERIC_UMPC
- gtk_container_add(GTK_CONTAINER(summaryview->mainwidget_book),
- scrolledwin);
- gtk_box_pack_start(GTK_BOX(vbox), summaryview->mainwidget_book, TRUE, TRUE, 0);
-#endif
quicksearch_set_execute_callback(quicksearch, quicksearch_execute_cb, summaryview);
g_signal_connect (G_OBJECT(toggle_search), "toggled",
@@ -704,41 +677,29 @@ SummaryView *summary_create(MainWindow *mainwin)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus", "SummaryViewPopup", "SummaryViewPopup", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Reedit", "SummaryViewPopup/Reedit", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Reply", "SummaryViewPopup/Reply", GTK_UI_MANAGER_MENUITEM)
-#ifndef GENERIC_UMPC
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "ReplyTo", "SummaryViewPopup/ReplyTo", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Separator1", "Message/---", GTK_UI_MANAGER_SEPARATOR)
-#endif
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Forward", "SummaryViewPopup/Forward", GTK_UI_MANAGER_MENUITEM)
-#ifndef GENERIC_UMPC
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "ForwardAtt", "SummaryViewPopup/ForwardAtt", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Redirect", "SummaryViewPopup/Redirect", GTK_UI_MANAGER_MENUITEM)
-#endif
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Separator2", "Message/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Move", "Message/Move", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Copy", "Message/Copy", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Trash", "Message/Trash", GTK_UI_MANAGER_MENUITEM)
-#ifndef GENERIC_UMPC
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Delete", "Message/Delete", GTK_UI_MANAGER_MENUITEM)
-#endif
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Separator3", "Message/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Marks", "SummaryViewPopup/Marks", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "ColorLabel", "SummaryViewPopup/ColorLabel", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Tags", "SummaryViewPopup/Tags", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Separator4", "Message/---", GTK_UI_MANAGER_SEPARATOR)
-#ifndef GENERIC_UMPC
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "AddSenderToAB", "Tools/AddSenderToAB", GTK_UI_MANAGER_MENUITEM)
-#endif
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "CreateFilterRule", "SummaryViewPopup/CreateFilterRule", GTK_UI_MANAGER_MENU)
-#ifndef GENERIC_UMPC
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "CreateProcessingRule", "SummaryViewPopup/CreateProcessingRule", GTK_UI_MANAGER_MENU)
-#endif
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Separator5", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "View", "SummaryViewPopup/View", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "SaveAs", "File/SaveAs", GTK_UI_MANAGER_MENUITEM)
-#ifndef GENERIC_UMPC
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Print", "File/Print", GTK_UI_MANAGER_MENUITEM)
-#endif
/* submenus - replyto */
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/ReplyTo", "All", "SummaryViewPopup/ReplyTo/All", GTK_UI_MANAGER_MENUITEM)
@@ -774,21 +735,17 @@ SummaryView *summary_create(MainWindow *mainwin)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/CreateFilterRule", "BySubject", "Tools/CreateFilterRule/BySubject", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/CreateFilterRule", "BySender", "Tools/CreateFilterRule/BySender", GTK_UI_MANAGER_MENUITEM)
-#ifndef GENERIC_UMPC
/* submenus - createprocessingrule */
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/CreateProcessingRule", "Automatically", "Tools/CreateProcessingRule/Automatically", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/CreateProcessingRule", "ByFrom", "Tools/CreateProcessingRule/ByFrom", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/CreateProcessingRule", "ByTo", "Tools/CreateProcessingRule/ByTo", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/CreateProcessingRule", "BySubject", "Tools/CreateProcessingRule/BySubject", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/CreateProcessingRule", "BySender", "Tools/CreateProcessingRule/BySender", GTK_UI_MANAGER_MENUITEM)
-#endif
/* submenus - view */
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/View", "OpenNewWindow", "View/OpenNewWindow", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/View", "MessageSource", "View/MessageSource", GTK_UI_MANAGER_MENUITEM)
-#ifndef GENERIC_UMPC
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/View", "AllHeaders", "View/AllHeaders", GTK_UI_MANAGER_MENUITEM)
-#endif
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus", "SummaryViewHeaderPopup", "SummaryViewHeaderPopup", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewHeaderPopup", "LockColumnHeaders", "SummaryViewHeaderPopup/LockColumnHeaders", GTK_UI_MANAGER_MENUITEM)
@@ -812,9 +769,6 @@ SummaryView *summary_create(MainWindow *mainwin)
summaryview->statlabel_msgs = statlabel_msgs;
summaryview->toggle_eventbox = toggle_eventbox;
summaryview->toggle_arrow = toggle_arrow;
-#ifdef GENERIC_UMPC
- summaryview->multiple_sel_togbtn = multiple_sel_togbtn;
-#endif
summaryview->toggle_search = toggle_search;
summaryview->lock_count = 0;
summaryview->msginfo_update_callback_id =
@@ -1013,13 +967,6 @@ void summary_init(SummaryView *summaryview)
gtk_widget_show(pixmap);
summaryview->quick_search_pixmap = pixmap;
-#ifdef GENERIC_UMPC
- pixmap = stock_pixmap_widget(STOCK_PIXMAP_SELECTION);
- gtk_container_add(GTK_CONTAINER(summaryview->multiple_sel_togbtn), pixmap);
- gtk_widget_show(pixmap);
- summaryview->multiple_sel_image = pixmap;
-#endif
-
/* Init summaryview prefs */
summaryview->sort_key = SORT_BY_NONE;
summaryview->sort_type = SORT_ASCENDING;
@@ -1822,25 +1769,21 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
}
SET_SENSITIVE("Menus/SummaryViewPopup/Reedit", M_ALLOW_REEDIT);
SET_SENSITIVE("Menus/SummaryViewPopup/Reply", M_HAVE_ACCOUNT, M_TARGET_EXIST);
-#ifndef GENERIC_UMPC
+
SET_SENSITIVE("Menus/SummaryViewPopup/ReplyTo", M_HAVE_ACCOUNT, M_TARGET_EXIST);
SET_SENSITIVE("Menus/SummaryViewPopup/ReplyTo/All", M_HAVE_ACCOUNT, M_TARGET_EXIST);
SET_SENSITIVE("Menus/SummaryViewPopup/ReplyTo/Sender", M_HAVE_ACCOUNT, M_TARGET_EXIST);
SET_SENSITIVE("Menus/SummaryViewPopup/ReplyTo/MailingList", M_HAVE_ACCOUNT, M_TARGET_EXIST);
-#endif
SET_SENSITIVE("Menus/SummaryViewPopup/Forward", M_HAVE_ACCOUNT, M_TARGET_EXIST);
-#ifndef GENERIC_UMPC
+
SET_SENSITIVE("Menus/SummaryViewPopup/ForwardAtt", M_HAVE_ACCOUNT, M_TARGET_EXIST);
SET_SENSITIVE("Menus/SummaryViewPopup/Redirect", M_HAVE_ACCOUNT, M_TARGET_EXIST);
-#endif
SET_SENSITIVE("Menus/SummaryViewPopup/Move", M_TARGET_EXIST, M_ALLOW_DELETE, M_NOT_NEWS);
SET_SENSITIVE("Menus/SummaryViewPopup/Copy", M_TARGET_EXIST, M_EXEC);
SET_SENSITIVE("Menus/SummaryViewPopup/Trash", M_TARGET_EXIST, M_ALLOW_DELETE, M_NOT_NEWS, M_NOT_TRASH);
-#ifndef GENERIC_UMPC
SET_SENSITIVE("Menus/SummaryViewPopup/Delete", M_TARGET_EXIST, M_ALLOW_DELETE);
-#endif
SET_SENSITIVE("Menus/SummaryViewPopup/Marks", M_TARGET_EXIST);
SET_SENSITIVE("Menus/SummaryViewPopup/Marks/Mark", M_TARGET_EXIST);
@@ -1860,36 +1803,27 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
SET_SENSITIVE("Menus/SummaryViewPopup/ColorLabel", M_TARGET_EXIST);
SET_SENSITIVE("Menus/SummaryViewPopup/Tags", M_TARGET_EXIST);
-#ifndef GENERIC_UMPC
SET_SENSITIVE("Menus/SummaryViewPopup/AddSenderToAB", M_SINGLE_TARGET_EXIST);
-#endif
SET_SENSITIVE("Menus/SummaryViewPopup/CreateFilterRule", M_SINGLE_TARGET_EXIST, M_UNLOCKED);
-#ifndef GENERIC_UMPC
SET_SENSITIVE("Menus/SummaryViewPopup/CreateProcessingRule", M_SINGLE_TARGET_EXIST, M_UNLOCKED);
-#endif
SET_SENSITIVE("Menus/SummaryViewPopup/View", M_SINGLE_TARGET_EXIST);
SET_SENSITIVE("Menus/SummaryViewPopup/View/OpenNewWindow", M_SINGLE_TARGET_EXIST);
SET_SENSITIVE("Menus/SummaryViewPopup/View/MessageSource", M_SINGLE_TARGET_EXIST);
-#ifndef GENERIC_UMPC
SET_SENSITIVE("Menus/SummaryViewPopup/View/AllHeaders", M_SINGLE_TARGET_EXIST);
-#endif
SET_SENSITIVE("Menus/SummaryViewPopup/SaveAs", M_TARGET_EXIST);
-#ifndef GENERIC_UMPC
SET_SENSITIVE("Menus/SummaryViewPopup/Print", M_TARGET_EXIST);
-#endif
#undef SET_SENSITIVE
summary_lock(summaryview);
-#ifndef GENERIC_UMPC
if (summaryview->messageview
&& summaryview->messageview->mimeview
&& summaryview->messageview->mimeview->textview)
cm_toggle_menu_set_active_full(summaryview->mainwin->ui_manager, "Menus/SummaryViewPopup/View/AllHeaders",
prefs_common.show_all_headers);
-#endif
summary_unlock(summaryview);
}
+
void summary_select_prev(SummaryView *summaryview)
{
GtkCMCTreeNode *node = summaryview->selected;
@@ -2894,9 +2828,6 @@ static void summary_set_column_titles(SummaryView *summaryview)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
label = gtk_label_new(title);
-#ifdef GENERIC_UMPC
- gtk_widget_set_size_request(hbox, -1, 20);
-#endif
if (justify == GTK_JUSTIFY_RIGHT)
gtk_box_pack_end(GTK_BOX(hbox), label,
@@ -6511,7 +6442,6 @@ static gboolean summary_popup_menu(GtkWidget *widget, gpointer data)
return TRUE;
}
-#if !GENERIC_UMPC
static gchar *summaryview_get_tooltip_text(SummaryView *summaryview, MsgInfo *info, gint column)
{
MsgFlags flags;
@@ -6577,6 +6507,7 @@ static gchar *summaryview_get_tooltip_text(SummaryView *summaryview, MsgInfo *in
return NULL;
}
}
+
static gboolean tooltip_cb (GtkWidget *widget,
gint x,
gint y,
@@ -6650,7 +6581,6 @@ static gboolean tooltip_cb (GtkWidget *widget,
return TRUE;
}
-#endif
static gboolean summary_header_button_pressed(GtkWidget *widget,
GdkEvent *_event,
@@ -6851,12 +6781,10 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
G_CALLBACK(summary_drag_motion_cb),
summaryview);
-#if !GENERIC_UMPC
g_object_set (G_OBJECT(ctree), "has-tooltip", TRUE, NULL);
g_signal_connect(G_OBJECT(ctree), "query-tooltip",
G_CALLBACK(tooltip_cb),
summaryview);
-#endif
return ctree;
}
@@ -6924,14 +6852,7 @@ static gint summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
summary_toggle_view(summaryview);
return TRUE;
}
-#ifdef GENERIC_UMPC
-static void summary_toggle_multiple_pressed(GtkWidget *widget,
- SummaryView *summaryview)
-{
- GTK_SCTREE(summaryview->ctree)->force_additive_sel =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-}
-#endif
+
static gboolean summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
SummaryView *summaryview)
{
@@ -7028,12 +6949,8 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
case GDK_KEY_KP_Enter:
handled = TRUE;
if (summaryview->displayed != summaryview->selected) {
-#ifndef GENERIC_UMPC
summary_display_msg(summaryview,
summaryview->selected);
-#else
- summary_open_row(NULL, summaryview);
-#endif
break;
}
mimeview_scroll_one_line(messageview->mimeview, mod_pressed);
@@ -8225,15 +8142,6 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
gtk_widget_show(pixmap);
summaryview->quick_search_pixmap = pixmap;
-#ifdef GENERIC_UMPC
- pixmap = stock_pixmap_widget(STOCK_PIXMAP_SELECTION);
- gtk_container_remove (GTK_CONTAINER(summaryview->multiple_sel_togbtn),
- summaryview->multiple_sel_image);
- gtk_container_add(GTK_CONTAINER(summaryview->multiple_sel_togbtn), pixmap);
- gtk_widget_show(pixmap);
- summaryview->multiple_sel_togbtn = pixmap;
-#endif
-
folderview_unselect(summaryview->folderview);
folderview_select(summaryview->folderview, summaryview->folder_item);
summary_set_column_titles(summaryview);
diff --git a/src/summaryview.h b/src/summaryview.h
@@ -97,10 +97,6 @@ struct _SummaryView
GtkWidget *statlabel_msgs;
GtkWidget *toggle_eventbox;
GtkWidget *toggle_arrow;
-#ifdef GENERIC_UMPC
- GtkWidget *multiple_sel_togbtn;
- GtkWidget *multiple_sel_image;
-#endif
GtkWidget *toggle_search;
GtkWidget *quick_search_pixmap;
GtkWidget *popupmenu;
diff --git a/src/textview.c b/src/textview.c
@@ -799,9 +799,6 @@ static void recursive_add_parts(TextView *textview, GNode *node)
mimeinfo = (MimeInfo *) node->data;
textview_add_part(textview, mimeinfo);
-#ifdef GENERIC_UMPC
- textview_set_position(textview, 0);
-#endif
if ((mimeinfo->type != MIMETYPE_MULTIPART) &&
(mimeinfo->type != MIMETYPE_MESSAGE)) {
END_TIMING();
@@ -910,9 +907,7 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
const gchar *name;
gchar *content_type;
GtkUIManager *ui_manager;
-#ifndef GENERIC_UMPC
gchar *shortcut;
-#endif
if (!partinfo) return;
@@ -947,38 +942,31 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
g_free(content_type);
}
TEXTVIEW_INSERT(_(" The following can be performed on this part\n"));
-#ifndef GENERIC_UMPC
TEXTVIEW_INSERT(_(" by right-clicking the icon or list item:"));
-#endif
TEXTVIEW_INSERT("\n");
TEXTVIEW_INSERT(_(" - To save, select "));
TEXTVIEW_INSERT_LINK(_("'Save as...'"), "cm://save_as", NULL);
-#ifndef GENERIC_UMPC
TEXTVIEW_INSERT(_(" (Shortcut key: '"));
shortcut = cm_menu_item_get_shortcut(ui_manager, "Menu/File/SavePartAs");
TEXTVIEW_INSERT(shortcut);
g_free(shortcut);
TEXTVIEW_INSERT(_("')"));
-#endif
TEXTVIEW_INSERT("\n");
TEXTVIEW_INSERT(_(" - To display as text, select "));
TEXTVIEW_INSERT_LINK(_("'Display as text'"), "cm://display_as_text", NULL);
-#ifndef GENERIC_UMPC
TEXTVIEW_INSERT(_(" (Shortcut key: '"));
shortcut = cm_menu_item_get_shortcut(ui_manager, "Menu/View/Part/AsText");
TEXTVIEW_INSERT(shortcut);
g_free(shortcut);
TEXTVIEW_INSERT(_("')"));
-#endif
TEXTVIEW_INSERT("\n");
TEXTVIEW_INSERT(_(" - To open with an external program, select "));
TEXTVIEW_INSERT_LINK(_("'Open'"), "cm://open", NULL);
-#ifndef GENERIC_UMPC
TEXTVIEW_INSERT(_(" (Shortcut key: '"));
shortcut = cm_menu_item_get_shortcut(ui_manager, "Menu/View/Part/Open");
TEXTVIEW_INSERT(shortcut);
@@ -995,7 +983,6 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
g_free(shortcut);
TEXTVIEW_INSERT(_("')"));
#endif
-#endif
TEXTVIEW_INSERT("\n");
textview_show_icon(textview, "dialog-information");
diff --git a/src/toolbar.c b/src/toolbar.c
@@ -647,43 +647,28 @@ static void toolbar_set_default_generic(ToolbarType toolbar_type, DefaultToolbar
void toolbar_set_default(ToolbarType source)
{
DefaultToolbar default_toolbar_main[] = {
-#ifdef GENERIC_UMPC
- { A_GO_FOLDERS},
- { A_OPEN_MAIL},
- { A_SEPARATOR},
-#endif
{ A_RECEIVE_ALL},
{ A_SEPARATOR},
{ A_SEND_QUEUED},
{ A_COMPOSE_EMAIL},
{ A_SEPARATOR},
{ A_REPLY_MESSAGE},
-#ifndef GENERIC_UMPC
{ A_REPLY_ALL},
{ A_REPLY_SENDER},
-#endif
{ A_FORWARD},
{ A_SEPARATOR},
{ A_TRASH},
-#ifndef GENERIC_UMPC
{ A_LEARN_SPAM},
-#endif
{ A_SEPARATOR},
{ A_GOTO_NEXT},
{ N_ACTION_VAL}
};
DefaultToolbar default_toolbar_compose[] = {
-#ifdef GENERIC_UMPC
- { A_CLOSE},
- { A_SEPARATOR},
-#endif
{ A_SEND},
{ A_SEND_LATER},
{ A_DRAFT},
{ A_SEPARATOR},
-#ifndef GENERIC_UMPC
{ A_INSERT},
-#endif
{ A_ATTACH},
{ A_SEPARATOR},
{ A_ADDRBOOK},
@@ -691,19 +676,13 @@ void toolbar_set_default(ToolbarType source)
};
DefaultToolbar default_toolbar_msgview[] = {
-#ifdef GENERIC_UMPC
- { A_CLOSE},
- { A_SEPARATOR},
-#endif
{ A_REPLY_MESSAGE},
{ A_REPLY_ALL},
{ A_REPLY_SENDER},
{ A_FORWARD},
{ A_SEPARATOR},
{ A_TRASH},
-#ifndef GENERIC_UMPC
{ A_LEARN_SPAM},
-#endif
{ A_GOTO_NEXT},
{ N_ACTION_VAL}
};
@@ -955,17 +934,13 @@ static void activate_compose_button (Toolbar *toolbar,
gtk_tool_button_set_icon_widget(
GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
toolbar->compose_news_icon);
-#ifndef GENERIC_UMPC
CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(toolbar->compose_mail_btn), _("Write News message"));
-#endif
gtk_widget_show(toolbar->compose_news_icon);
} else {
gtk_tool_button_set_icon_widget(
GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
toolbar->compose_mail_icon);
-#ifndef GENERIC_UMPC
CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(toolbar->compose_mail_btn), _("Write Email"));
-#endif
gtk_widget_show(toolbar->compose_mail_icon);
}
toolbar->compose_btn_type = type;
@@ -994,9 +969,7 @@ static void activate_learn_button (Toolbar *toolbar,
gtk_tool_button_set_label(
GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
_("Spam"));
-#ifndef GENERIC_UMPC
CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(toolbar->learn_spam_btn), _("Learn spam"));
-#endif
gtk_widget_show(toolbar->learn_spam_icon);
} else {
gtk_tool_button_set_icon_widget(
@@ -1005,9 +978,7 @@ static void activate_learn_button (Toolbar *toolbar,
gtk_tool_button_set_label(
GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
_("Ham"));
-#ifndef GENERIC_UMPC
CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(toolbar->learn_spam_btn), _("Learn ham"));
-#endif
gtk_widget_show(toolbar->learn_ham_icon);
}
toolbar->learn_btn_type = type;
@@ -1459,13 +1430,11 @@ static void toolbar_prev_unread_cb(GtkWidget *widget, gpointer data)
/* Now we need to update the messageview window */
if (msgview->mainwin->summaryview->selected) {
-#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(msgview->mainwin->summaryview);
if (msginfo)
messageview_show(msgview, msginfo,
msgview->all_headers);
-#endif
} else {
gtk_widget_destroy(msgview->window);
}
@@ -1506,13 +1475,11 @@ static void toolbar_next_unread_cb(GtkWidget *widget, gpointer data)
/* Now we need to update the messageview window */
if (msgview->mainwin->summaryview->selected) {
-#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(msgview->mainwin->summaryview);
if (msginfo)
messageview_show(msgview, msginfo,
msgview->all_headers);
-#endif
} else {
gtk_widget_destroy(msgview->window);
}
@@ -2115,7 +2082,7 @@ static void toolbar_buttons_cb(GtkWidget *widget,
}
}
}
-#ifndef GENERIC_UMPC
+
#define TOOLBAR_ITEM(item,icon,text,tooltip) { \
item = GTK_WIDGET(gtk_tool_button_new(icon, text)); \
gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \
@@ -2164,50 +2131,6 @@ static void toolbar_buttons_cb(GtkWidget *widget,
g_list_free(gchild); \
}
-#else
-
-#define TOOLBAR_ITEM(item,icon,text,tooltip) { \
- item = GTK_WIDGET(gtk_tool_button_new(icon, text)); \
- gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \
- gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \
- gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE); \
- g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item); \
- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1); \
-}
-
-#define TOOLBAR_TOGGLE_ITEM(item,icon,text,tooltip) { \
- item = GTK_WIDGET(gtk_toggle_tool_button_new()); \
- gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(item), icon); \
- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), text); \
- gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \
- gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \
- gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE); \
- g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item); \
- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1); \
-}
-
-#define TOOLBAR_MENUITEM(item,icon,text,tooltip,menutip) { \
- GtkWidget *child = NULL, *btn = NULL, *arr = NULL; \
- GList *gchild = NULL; \
- item = GTK_WIDGET(gtk_menu_tool_button_new(icon, text)); \
- gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \
- gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE); \
- g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item); \
- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1); \
- child = gtk_bin_get_child(GTK_BIN(item)); \
- gchild = gtk_container_get_children( \
- GTK_CONTAINER(child)); \
- btn = (GtkWidget *)gchild->data; \
- gtk_widget_set_can_focus(btn, FALSE); \
- arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL); \
- gtk_widget_set_can_focus(arr, FALSE); \
- g_list_free(gchild); \
- gchild = gtk_container_get_children(GTK_CONTAINER(arr)); \
- gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1); \
- g_list_free(gchild); \
-}
-#endif
-
#define ADD_MENU_ITEM(name,cb,data) { \
item = gtk_menu_item_new_with_mnemonic(name); \
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); \
@@ -2218,7 +2141,6 @@ static void toolbar_buttons_cb(GtkWidget *widget,
gtk_widget_show(item); \
}
-#ifndef GENERIC_UMPC
static void toolbar_reply_menu_cb(GtkWidget *widget, gpointer data)
{
gpointer int_value = g_object_get_data(G_OBJECT(widget), "int-value");
@@ -2234,7 +2156,6 @@ static void toolbar_delete_dup_menu_cb(GtkWidget *widget, gpointer data)
toolbar_delete_dup(toolbar_item, GPOINTER_TO_INT(int_value));
}
-#endif
static void toolbar_learn_menu_cb(GtkWidget *widget, gpointer data)
{
@@ -2332,7 +2253,6 @@ Toolbar *toolbar_create(ToolbarType type,
toolbar_data->open_mail_btn = item;
break;
case A_COMPOSE_EMAIL:
-#ifndef GENERIC_UMPC
TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
_("Write Email"),
_("Write with selected Account"));
@@ -2343,15 +2263,6 @@ Toolbar *toolbar_create(ToolbarType type,
icon_news = stock_pixmap_widget(STOCK_PIXMAP_NEWS_COMPOSE);
toolbar_data->compose_news_icon = icon_news;
g_object_ref_sink(toolbar_data->compose_news_icon);
-#else
- TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
- _("Write Email"));
- toolbar_data->compose_mail_btn = item;
- toolbar_data->compose_mail_icon = icon_wid;
-
- icon_news = stock_pixmap_widget(STOCK_PIXMAP_NEWS_COMPOSE);
- toolbar_data->compose_news_icon = icon_news;
-#endif
break;
case A_LEARN_SPAM:
TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
@@ -2371,7 +2282,6 @@ Toolbar *toolbar_create(ToolbarType type,
gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(toolbar_data->learn_spam_btn), menu);
break;
case A_DELETE_DUP:
-#ifndef GENERIC_UMPC
TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
_("Delete duplicates"),
_("Delete duplicates options"));
@@ -2381,13 +2291,8 @@ Toolbar *toolbar_create(ToolbarType type,
ADD_MENU_ITEM(_("Delete duplicates in selected folder"), toolbar_delete_dup_menu_cb, FALSE);
ADD_MENU_ITEM(_("Delete duplicates in all folders"), toolbar_delete_dup_menu_cb, TRUE);
gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(toolbar_data->delete_dup_btn), menu);
-#else
- TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Delete duplicates"));
- toolbar_data->delete_dup_btn = item;
-#endif
break;
case A_REPLY_MESSAGE:
-#ifndef GENERIC_UMPC
TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
_("Reply to Message"),
_("Reply to Message options"));
@@ -2397,14 +2302,8 @@ Toolbar *toolbar_create(ToolbarType type,
ADD_MENU_ITEM(_("_Reply with quote"), toolbar_reply_menu_cb, COMPOSE_REPLY_WITH_QUOTE);
ADD_MENU_ITEM(_("Reply without _quote"), toolbar_reply_menu_cb, COMPOSE_REPLY_WITHOUT_QUOTE);
gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(toolbar_data->reply_btn), menu);
-#else
- TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
- _("Reply to Message"));
- toolbar_data->reply_btn = item;
-#endif
break;
case A_REPLY_SENDER:
-#ifndef GENERIC_UMPC
TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
_("Reply to Sender"),
_("Reply to Sender options"));
@@ -2414,14 +2313,8 @@ Toolbar *toolbar_create(ToolbarType type,
ADD_MENU_ITEM(_("_Reply with quote"), toolbar_reply_menu_cb, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE);
ADD_MENU_ITEM(_("Reply without _quote"), toolbar_reply_menu_cb, COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE);
gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(toolbar_data->replysender_btn), menu);
-#else
- TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
- _("Reply to Sender"));
- toolbar_data->replysender_btn = item;
-#endif
break;
case A_REPLY_ALL:
-#ifndef GENERIC_UMPC
TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
_("Reply to All"),
_("Reply to All options"));
@@ -2431,14 +2324,8 @@ Toolbar *toolbar_create(ToolbarType type,
ADD_MENU_ITEM(_("_Reply with quote"), toolbar_reply_menu_cb, COMPOSE_REPLY_TO_ALL_WITH_QUOTE);
ADD_MENU_ITEM(_("Reply without _quote"), toolbar_reply_menu_cb, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE);
gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(toolbar_data->replyall_btn), menu);
-#else
- TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
- _("Reply to All"));
- toolbar_data->replyall_btn = item;
-#endif
break;
case A_REPLY_ML:
-#ifndef GENERIC_UMPC
TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
_("Reply to Mailing-list"),
_("Reply to Mailing-list options"));
@@ -2448,14 +2335,8 @@ Toolbar *toolbar_create(ToolbarType type,
ADD_MENU_ITEM(_("_Reply with quote"), toolbar_reply_menu_cb, COMPOSE_REPLY_TO_LIST_WITH_QUOTE);
ADD_MENU_ITEM(_("Reply without _quote"), toolbar_reply_menu_cb, COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE);
gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(toolbar_data->replylist_btn), menu);
-#else
- TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
- _("Reply to Mailing-list"));
- toolbar_data->replylist_btn = item;
-#endif
break;
case A_FORWARD:
-#ifndef GENERIC_UMPC
TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
_("Forward Message"),
_("Forward Message options"));
@@ -2466,11 +2347,6 @@ Toolbar *toolbar_create(ToolbarType type,
ADD_MENU_ITEM(_("For_ward as attachment"), toolbar_reply_menu_cb, COMPOSE_FORWARD_AS_ATTACH);
ADD_MENU_ITEM(_("Redirec_t"), toolbar_reply_menu_cb, COMPOSE_REDIRECT);
gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(toolbar_data->fwd_btn), menu);
-#else
- TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
- _("Forward Message"));
- toolbar_data->fwd_btn = item;
-#endif
break;
case A_TRASH:
TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Trash Message"));
@@ -2596,16 +2472,6 @@ Toolbar *toolbar_create(ToolbarType type,
gtk_widget_show_all(toolbar);
if (type == TOOLBAR_MAIN) {
-#ifdef GENERIC_UMPC
- MainWindow *mainwin = mainwindow_get_mainwindow();
- GtkWidget *progressbar = gtk_progress_bar_new();
- item = GTK_WIDGET(gtk_tool_item_new());
- gtk_container_add (GTK_CONTAINER (item), progressbar);
- gtk_widget_show(item);
- gtk_widget_set_size_request(progressbar, 84, -1);
- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);
- mainwin->progressbar = progressbar;
-#endif
activate_compose_button(toolbar_data,
prefs_common.toolbar_style,
toolbar_data->compose_btn_type);
@@ -2658,7 +2524,6 @@ void toolbar_update(ToolbarType type, gpointer data)
Compose *compose = (Compose*)data;
MessageView *msgview = (MessageView*)data;
-#ifndef GENERIC_UMPC
switch(type) {
case TOOLBAR_MAIN:
toolbar_data = mainwin->toolbar;
@@ -2681,26 +2546,6 @@ void toolbar_update(ToolbarType type, gpointer data)
toolbar_init(toolbar_data);
toolbar_data = toolbar_create(type, handlebox, data);
-#else
- switch(type) {
- case TOOLBAR_MAIN:
- toolbar_data = mainwin->toolbar;
- handlebox = mainwin->window;
- break;
- case TOOLBAR_COMPOSE:
- toolbar_data = compose->toolbar;
- handlebox = compose->window;
- break;
- case TOOLBAR_MSGVIEW:
- toolbar_data = msgview->toolbar;
- handlebox = msgview->window;
- break;
- default:
- return;
- }
- toolbar_init(toolbar_data);
- toolbar_data = toolbar_create(type, handlebox, data);
-#endif
switch(type) {
case TOOLBAR_MAIN:
