[Xfce4-commits] [panel-plugins/xfce4-clipman-plugin] 04/28: Fix paste-on-activate combobox

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

ochosi pushed a commit to branch master
in repository panel-plugins/xfce4-clipman-plugin.

commit bb25ee0e91aae7d4d98b6721ece4800d669ac351
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Wed May 11 23:18:12 2016 +0200

    Fix paste-on-activate combobox
---
 panel-plugin/settings-dialog.ui       |  2 +-
 panel-plugin/xfce4-clipman-settings.c | 20 +++-----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/panel-plugin/settings-dialog.ui b/panel-plugin/settings-dialog.ui
index 91b9cc6..838544f 100644
--- a/panel-plugin/settings-dialog.ui
+++ b/panel-plugin/settings-dialog.ui
@@ -493,7 +493,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkComboBox" id="combobox-paste-on-activate">
+                      <object class="GtkComboBoxText" id="combobox-paste-on-activate">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
diff --git a/panel-plugin/xfce4-clipman-settings.c b/panel-plugin/xfce4-clipman-settings.c
index b72ea0a..439f896 100644
--- a/panel-plugin/xfce4-clipman-settings.c
+++ b/panel-plugin/xfce4-clipman-settings.c
@@ -189,25 +189,11 @@ prop_dialog_run (void)
 
   /* Tweaks tab: paste-on-activate combobox */
   combobox = GTK_WIDGET (gtk_builder_get_object (builder, "combobox-paste-on-activate"));
-
-  {
-    GtkListStore *store;
-    GtkCellRenderer *cell;
-
-    store = gtk_list_store_new (1, G_TYPE_STRING);
-    gtk_combo_box_set_model (GTK_COMBO_BOX (combobox), GTK_TREE_MODEL (store));
-    g_object_unref (store);
-
-    cell = gtk_cell_renderer_text_new ();
-    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox), cell, TRUE);
-    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combobox), cell, "text", 0, NULL);
-  }
-
-  //gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("None"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("None"));
   /* TRANSLATORS: Keyboard shortcut */
-  //gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("Ctrl+V"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("Ctrl+V"));
   /* TRANSLATORS: Keyboard shortcut */
-  //gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("Shift+Insert"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("Shift+Insert"));
   gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0);
 
   xfconf_g_property_bind (xfconf_channel, "/tweaks/paste-on-activate",

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.