Updating branch refs/heads/master to 5cdebb06849b06cf34d198407372ced572a00011 (commit) from ba6814e9491adc1db46c628c4f587c62d3aace58 (commit)
commit 5cdebb06849b06cf34d198407372ced572a00011 Author: Mike Massonnet <mmasson...@xfce.org> Date: Fri Oct 28 14:56:59 2011 +0200 menu.c: Remove forgotten #ifdef HAVE_LIBXTST panel-plugin/menu.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/panel-plugin/menu.c b/panel-plugin/menu.c index 15a8a44..47e217b 100644 --- a/panel-plugin/menu.c +++ b/panel-plugin/menu.c @@ -252,9 +252,7 @@ _clipman_menu_update_list (ClipmanMenu *menu) } g_signal_connect (mi, "activate", G_CALLBACK (cb_set_clipboard), item); -#ifdef HAVE_LIBXTST g_object_set_data (G_OBJECT (mi), "paste-on-activate", GUINT_TO_POINTER (menu->priv->paste_on_activate)); -#endif if (item == item_to_restore) { @@ -333,14 +331,13 @@ clipman_menu_class_init (ClipmanMenuClass *klass) "Toggle the inhibit menu item to TRUE or FALSE", FALSE, G_PARAM_CONSTRUCT|G_PARAM_READWRITE)); -#ifdef HAVE_LIBXTST + g_object_class_install_property (object_class, PASTE_ON_ACTIVATE, g_param_spec_uint ("paste-on-activate", "PasteOnActivate", "Paste the content of a menu item when it is activated", 0, 2, 0, G_PARAM_CONSTRUCT|G_PARAM_READWRITE)); -#endif } static void _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits