[gnome-shell/wip/carlosg/cleanup-gtk-usage: 2/2] st: Use GSettings for primary-paste setting
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/carlosg/cleanup-gtk-usage: 2/2] st: Use GSettings for primary-paste setting
- Date: Wed, 30 Jan 2019 19:20:13 +0000 (UTC)
commit 5aeb57aebb30310c2d6ba0db44993091f921290e
Author: Carlos Garnacho <carlosg gnome org>
Date: Wed Jan 30 19:56:18 2019 +0100
st: Use GSettings for primary-paste setting
If middle-click happens, check whether the setting is enabled
and paste primary selection if so.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/317
src/st/st-entry.c | 44 +++++++++++++++++++++++++-------------------
1 file changed, 25 insertions(+), 19 deletions(-)
---
diff --git a/src/st/st-entry.c b/src/st/st-entry.c
index 4fdfda0e3..fdfcca2e4 100644
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -644,29 +644,35 @@ clutter_text_button_press_event (ClutterActor *actor,
gpointer user_data)
{
StEntryPrivate *priv = ST_ENTRY_PRIV (user_data);
- GtkSettings *settings = gtk_settings_get_default ();
- gboolean primary_paste_enabled;
- g_object_get (settings,
- "gtk-enable-primary-paste", &primary_paste_enabled,
- NULL);
-
- if (primary_paste_enabled && event->button == 2
- && clutter_text_get_editable (CLUTTER_TEXT (priv->entry)))
+ if (event->button == 2 &&
+ clutter_text_get_editable (CLUTTER_TEXT (priv->entry)))
{
- StClipboard *clipboard;
+ GSettings *settings;
+ gboolean primary_paste_enabled;
- clipboard = st_clipboard_get_default ();
+ settings = g_settings_new ("org.gnome.desktop.interface");
+ primary_paste_enabled =
+ g_settings_get_boolean (settings, "gtk-enable-primary-paste");
- /* By the time the clipboard callback is called,
- * the rest of the signal handlers will have
- * run, making the text cursor to be in the correct
- * place.
- */
- st_clipboard_get_text (clipboard,
- ST_CLIPBOARD_TYPE_PRIMARY,
- st_entry_clipboard_callback,
- user_data);
+ if (primary_paste_enabled)
+ {
+ StClipboard *clipboard;
+
+ clipboard = st_clipboard_get_default ();
+
+ /* By the time the clipboard callback is called,
+ * the rest of the signal handlers will have
+ * run, making the text cursor to be in the correct
+ * place.
+ */
+ st_clipboard_get_text (clipboard,
+ ST_CLIPBOARD_TYPE_PRIMARY,
+ st_entry_clipboard_callback,
+ user_data);
+ }
+
+ g_object_unref (settings);
}
return FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]