From 06419d2b001022b5c85d6fca399dfbac1bfe4427 Mon Sep 17 00:00:00 2001 From: hiro Date: Wed, 1 Feb 2006 06:14:04 +0000 Subject: disabled Actions menu on win32. git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@952 ee746299-78ed-0310-b773-934348b2243d --- src/compose.c | 6 ++++++ src/mainwindow.c | 12 ++++++++++++ src/messageview.c | 6 +++++- 3 files changed, 23 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/compose.c b/src/compose.c index cc93ab6f..b6e5faac 100644 --- a/src/compose.c +++ b/src/compose.c @@ -645,7 +645,9 @@ static GtkItemFactoryEntry compose_entries[] = {N_("/_Tools"), NULL, NULL, 0, ""}, {N_("/_Tools/_Address book"), "A", compose_address_cb , 0, NULL}, {N_("/_Tools/_Template"), NULL, NULL, 0, ""}, +#ifndef G_OS_WIN32 {N_("/_Tools/Actio_ns"), NULL, NULL, 0, ""}, +#endif {N_("/_Tools/---"), NULL, NULL, 0, ""}, {N_("/_Tools/Edit with e_xternal editor"), "X", compose_ext_editor_cb, 0, NULL}, @@ -4548,7 +4550,9 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode) menu_set_sensitive(ifactory, "/Edit/Auto wrapping", FALSE); menu_set_sensitive(ifactory, "/View/Attachment", FALSE); menu_set_sensitive(ifactory, "/Tools/Template", FALSE); +#ifndef G_OS_WIN32 menu_set_sensitive(ifactory, "/Tools/Actions", FALSE); +#endif menu_set_sensitive(ifactory, "/Tools/Edit with external editor", FALSE); #if USE_GPGME menu_set_sensitive(ifactory, "/Tools/PGP Sign", FALSE); @@ -4581,7 +4585,9 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode) compose_set_out_encoding(compose); addressbook_set_target_compose(compose); +#ifndef G_OS_WIN32 action_update_compose_menu(ifactory, compose); +#endif compose_set_template_menu(compose); #if USE_GTKSPELL diff --git a/src/mainwindow.c b/src/mainwindow.c index a3bcc308..f78fb06e 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -448,9 +448,11 @@ static void prefs_filter_open_cb (MainWindow *mainwin, static void prefs_template_open_cb (MainWindow *mainwin, guint action, GtkWidget *widget); +#ifndef G_OS_WIN32 static void prefs_actions_open_cb (MainWindow *mainwin, guint action, GtkWidget *widget); +#endif static void prefs_account_open_cb (MainWindow *mainwin, guint action, GtkWidget *widget); @@ -770,8 +772,10 @@ static GtkItemFactoryEntry mainwin_entries[] = {N_("/_Tools/Filter junk _mails in selected messages"), NULL, filter_junk_cb, 1, NULL}, {N_("/_Tools/---"), NULL, NULL, 0, ""}, +#ifndef G_OS_WIN32 {N_("/_Tools/Actio_ns"), NULL, NULL, 0, ""}, {N_("/_Tools/---"), NULL, NULL, 0, ""}, +#endif {N_("/_Tools/Delete du_plicated messages"), NULL, delete_duplicated_cb, 0, NULL}, {N_("/_Tools/---"), NULL, NULL, 0, ""}, @@ -785,7 +789,9 @@ static GtkItemFactoryEntry mainwin_entries[] = {N_("/_Configuration/_Filter setting..."), NULL, prefs_filter_open_cb, 0, NULL}, {N_("/_Configuration/_Template..."), NULL, prefs_template_open_cb, 0, NULL}, +#ifndef G_OS_WIN32 {N_("/_Configuration/_Actions..."), NULL, prefs_actions_open_cb, 0, NULL}, +#endif {N_("/_Configuration/---"), NULL, NULL, 0, ""}, {N_("/_Configuration/_Preferences for current account..."), NULL, prefs_account_open_cb, 0, NULL}, @@ -1080,7 +1086,9 @@ MainWindow *main_window_create(SeparateType type) main_window_set_toolbar_sensitive(mainwin); /* create actions menu */ +#ifndef G_OS_WIN32 action_update_mainwin_menu(ifactory, mainwin); +#endif /* initialize online switch */ prefs_common.online_mode = !prefs_common.online_mode; @@ -1947,7 +1955,9 @@ void main_window_set_menu_sensitive(MainWindow *mainwin) {"/Tools/Create filter rule" , M_SINGLE_TARGET_EXIST|M_UNLOCKED}, {"/Tools/Filter junk mails in folder" , M_MSG_EXIST|M_EXEC|M_ENABLE_JUNK}, {"/Tools/Filter junk mails in selected messages", M_TARGET_EXIST|M_EXEC|M_ENABLE_JUNK}, +#ifndef G_OS_WIN32 {"/Tools/Actions" , M_TARGET_EXIST|M_UNLOCKED}, +#endif {"/Tools/Execute" , M_MSG_EXIST|M_EXEC}, {"/Tools/Delete duplicated messages" , M_MSG_EXIST|M_ALLOW_DELETE}, @@ -3425,11 +3435,13 @@ static void prefs_template_open_cb(MainWindow *mainwin, guint action, prefs_template_open(); } +#ifndef G_OS_WIN32 static void prefs_actions_open_cb(MainWindow *mainwin, guint action, GtkWidget *widget) { prefs_actions_open(mainwin); } +#endif static void prefs_account_open_cb(MainWindow *mainwin, guint action, GtkWidget *widget) diff --git a/src/messageview.c b/src/messageview.c index 4ebb6049..4a7ef5be 100644 --- a/src/messageview.c +++ b/src/messageview.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2005 Hiroyuki Yamamoto + * Copyright (C) 1999-2006 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -276,8 +276,10 @@ static GtkItemFactoryEntry msgview_entries[] = NULL, create_filter_cb, FLT_BY_TO, NULL}, {N_("/_Tools/_Create filter rule/by _Subject"), NULL, create_filter_cb, FLT_BY_SUBJECT, NULL}, +#ifndef G_OS_WIN32 {N_("/_Tools/---"), NULL, NULL, 0, ""}, {N_("/_Tools/Actio_ns"), NULL, NULL, 0, ""}, +#endif {N_("/_Help"), NULL, NULL, 0, ""}, {N_("/_Help/_About"), NULL, about_cb, 0, NULL} @@ -426,7 +428,9 @@ MessageView *messageview_create_with_new_window(void) messageview_init(msgview); ifactory = gtk_item_factory_from_widget(menubar); +#ifndef G_OS_WIN32 action_update_msgview_menu(ifactory, msgview); +#endif messageview_list = g_list_append(messageview_list, msgview); -- cgit v1.2.3