[Xfce4-commits] [panel-plugins/xfce4-clipman-plugin] 16/28: Replace more exo references and a gtk2 version check

noreply at xfce.org noreply at xfce.org
Thu May 19 20:06:18 CEST 2016


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 4308fd77433c43eba0671b64f709d789acfd7ee3
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Thu May 12 23:10:10 2016 +0200

    Replace more exo references and a gtk2 version check
---
 panel-plugin/history.c | 2 +-
 panel-plugin/menu.c    | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/panel-plugin/history.c b/panel-plugin/history.c
index 8775c14..eb545e6 100644
--- a/panel-plugin/history.c
+++ b/panel-plugin/history.c
@@ -276,7 +276,7 @@ clipman_history_add_text (ClipmanHistory *history,
   tmp1 = g_strstrip (g_strdup (text));
   while (g_strstr_len (tmp1, preview_length, "  "))
     {
-      //tmp2 = exo_str_replace (tmp1, "  ", " ");
+      tmp2 = g_strjoinv(" ", g_strsplit(tmp1, " ", -1));
       g_free (tmp1);
       tmp1 = tmp2;
     }
diff --git a/panel-plugin/menu.c b/panel-plugin/menu.c
index b203751..fa6b49a 100644
--- a/panel-plugin/menu.c
+++ b/panel-plugin/menu.c
@@ -20,7 +20,6 @@
 #include <config.h>
 #endif
 
-//#include <exo/exo.h>
 #include <gtk/gtk.h>
 #include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4util/libxfce4util.h>
@@ -236,11 +235,7 @@ cb_clear_history (ClipmanMenu *menu)
 
 
       {
-#if GTK_CHECK_VERSION(2, 22, 0)
         GtkWidget *content_area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog));
-#else
-        GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#endif
         GtkWidget *checkbox = gtk_check_button_new_with_label (_("Don't ask again"));
         //exo_binding_new (G_OBJECT (checkbox), "active", G_OBJECT (menu), "never-confirm-history-clear");
         gtk_widget_show (checkbox);

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


More information about the Xfce4-commits mailing list