[gtk+] Revert "Remove the show-unicode-menu and show-input-method-menu settings"
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Revert "Remove the show-unicode-menu and show-input-method-menu settings"
- Date: Wed, 26 Jun 2013 13:56:21 +0000 (UTC)
commit 5b7b86c231eff1ed170721361d509ccc8fe12699
Author: Benjamin Otte <otte redhat com>
Date: Wed Jun 26 15:02:18 2013 +0200
Revert "Remove the show-unicode-menu and show-input-method-menu settings"
Removing object properties is too much of an API break, even for
properties we don't expect to be used outside of GTK itself.
This reverts commit 8b811b623c387b99d42fb065535d5f6a05d52fa5.
gtk/gtksettings.c | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 5cd8cbc..9f44d99 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -160,6 +160,8 @@ enum {
PROP_CURSOR_THEME_SIZE,
PROP_ALTERNATIVE_BUTTON_ORDER,
PROP_ALTERNATIVE_SORT_ARROWS,
+ PROP_SHOW_INPUT_METHOD_MENU,
+ PROP_SHOW_UNICODE_MENU,
PROP_TIMEOUT_INITIAL,
PROP_TIMEOUT_REPEAT,
PROP_TIMEOUT_EXPAND,
@@ -611,6 +613,24 @@ gtk_settings_class_init (GtkSettingsClass *class)
g_assert (result == PROP_ALTERNATIVE_SORT_ARROWS);
result = settings_install_property_parser (class,
+ g_param_spec_boolean ("gtk-show-input-method-menu",
+ P_("Show the 'Input Methods' menu"),
+ P_("Whether the context menus of entries
and text views should offer to change the input method"),
+ TRUE,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_SHOW_INPUT_METHOD_MENU);
+
+ result = settings_install_property_parser (class,
+ g_param_spec_boolean ("gtk-show-unicode-menu",
+ P_("Show the 'Insert Unicode Control
Character' menu"),
+ P_("Whether the context menus of entries
and text views should offer to insert control characters"),
+ TRUE,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_SHOW_UNICODE_MENU);
+
+ result = settings_install_property_parser (class,
g_param_spec_int ("gtk-timeout-initial",
P_("Start timeout"),
P_("Starting value for timeouts, when button
is pressed"),
@@ -968,7 +988,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
* This also can be a colon-separated list of input methods, which GTK+
* will try in turn until it finds one available on the system.
*
- * See #GtkIMContext.
+ * See #GtkIMContext and see the #GtkSettings:gtk-show-input-method-menu property.
*/
result = settings_install_property_parser (class,
g_param_spec_string ("gtk-im-module",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]