[Xfce4-commits] [panel-plugins/xfce4-mpc-plugin] 02/10: Drop exo dependency

[noreply at xfce.org]

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

landry pushed a commit to branch master
in repository panel-plugins/xfce4-mpc-plugin.

commit b130bd2c8b6e46ff065076ea8c1da379ee934924
Author: Landry Breuil <landry at xfce.org>
Date:   Sun May 1 13:18:24 2016 +0200

    Drop exo dependency
---
 panel-plugin/Makefile.am        |  2 --
 panel-plugin/xfce4-mpc-plugin.c | 10 ++++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 23b3c38..ade5d04 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -3,12 +3,10 @@ plugin_LTLIBRARIES = libmpc.la
 
 libmpc_la_CFLAGS =							\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
-	@EXO_CFLAGS@							\
 	@LIBXFCE4UI_CFLAGS@						\
 	@LIBXFCE4PANEL_CFLAGS@
 
 libmpc_la_LIBADD =							\
-	@EXO_LIBS@							\
 	@LIBXFCE4UI_LIBS@						\
 	@LIBXFCE4PANEL_LIBS@
 
diff --git a/panel-plugin/xfce4-mpc-plugin.c b/panel-plugin/xfce4-mpc-plugin.c
index f70784e..38c0a93 100644
--- a/panel-plugin/xfce4-mpc-plugin.c
+++ b/panel-plugin/xfce4-mpc-plugin.c
@@ -23,7 +23,6 @@
 #endif
 
 #include <libxfce4ui/libxfce4ui.h>
-#include <exo/exo.h>
 #include <string.h>
 #include <stdlib.h>
 #include <glib/gprintf.h>
@@ -404,9 +403,12 @@ static void
 str_replace(GString *str, gchar* pattern, gchar* replacement)
 {
    gchar *nstr;
+   GRegex *regex;
    if (!replacement)
       return;
-   nstr = exo_str_replace(str->str, pattern, replacement);
+   regex = g_regex_new(pattern, 0, 0, NULL);
+   nstr = g_regex_replace_literal( regex, str->str, -1, 0, replacement, 0, NULL);
+   g_regex_unref (regex);
    g_string_assign(str, nstr);
    g_free(nstr);
 }
@@ -758,10 +760,6 @@ mpc_show_about(XfcePanelPlugin *plugin, t_mpc* mpc)
    GdkPixbuf *icon;
    const gchar *auth[] = { "Landry Breuil <landry at xfce.org>", NULL };
    icon = xfce_panel_pixbuf_from_source("applications-multimedia", NULL, 32);
-#if !GTK_CHECK_VERSION (2, 18, 0)
-   gtk_about_dialog_set_email_hook (exo_gtk_url_about_dialog_hook, NULL, NULL);
-   gtk_about_dialog_set_url_hook (exo_gtk_url_about_dialog_hook, NULL, NULL);
-#endif
    gtk_show_about_dialog(NULL,
       "logo", icon,
       "license", xfce_get_license_text (XFCE_LICENSE_TEXT_BSD),

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