From 39cddfc01ffecce4afc5dbae94688a609c2690ee Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 15 Aug 2016 09:31:14 +0200 Subject: [PATCH] Remove Options->Unicode Smileys from the Composer menu I accidentally returned that action into the menu, even it was not meant to be there. --- composer/e-composer-actions.c | 8 -------- composer/e-composer-actions.h | 2 -- composer/e-msg-composer.c | 5 ----- 3 files changed, 15 deletions(-) diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c index 77e1b8886d..fa92322eb9 100644 --- a/composer/e-composer-actions.c +++ b/composer/e-composer-actions.c @@ -510,14 +510,6 @@ static GtkToggleActionEntry toggle_entries[] = { NULL, FALSE }, - { "unicode-smileys", - NULL, - N_("Unicode smilyes"), - NULL, - N_("Use Unicode characters for smileys."), - NULL, /* Handled by property bindings */ - FALSE }, - { "view-bcc", NULL, N_("_Bcc Field"), diff --git a/composer/e-composer-actions.h b/composer/e-composer-actions.h index 8449287526..863cc8f9fd 100644 --- a/composer/e-composer-actions.h +++ b/composer/e-composer-actions.h @@ -68,8 +68,6 @@ E_COMPOSER_ACTION ((composer), "toolbar-smime-encrypt") #define E_COMPOSER_ACTION_TOOLBAR_SMIME_SIGN(composer) \ E_COMPOSER_ACTION ((composer), "toolbar-smime-sign") -#define E_COMPOSER_ACTION_UNICODE_SMILEYS(composer) \ - E_COMPOSER_ACTION ((composer), "unicode-smileys") #define E_COMPOSER_ACTION_VIEW_BCC(composer) \ E_COMPOSER_ACTION ((composer), "view-bcc") #define E_COMPOSER_ACTION_VIEW_CC(composer) \ diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 713d02a68f..e1983fab87 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -2450,11 +2450,6 @@ msg_composer_constructed (GObject *object) active = g_settings_get_boolean (settings, "composer-request-receipt"); gtk_toggle_action_set_active (action, active); - action = GTK_TOGGLE_ACTION (ACTION (UNICODE_SMILEYS)); - g_settings_bind (settings, "composer-unicode-smileys", - action, "active", - G_SETTINGS_BIND_DEFAULT); - g_object_unref (settings); /* Clipboard Support */