[Xfce4-commits] [apps/xfce4-screenshooter] 06/14: remove dependency on libsexy, just use plain GtkLabel with markup

[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 apps/xfce4-screenshooter.

commit 58847d9dd50f39cdf352659bf3911bbe4fdf3aed
Author: Landry Breuil <landry at rhaalovely.net>
Date:   Fri Dec 12 23:17:04 2014 +0100

    remove dependency on libsexy, just use plain GtkLabel with markup
---
 Makefile.am               |    6 ------
 configure.ac.in           |    1 -
 lib/screenshooter-imgur.c |   16 ++++++++--------
 lib/screenshooter-imgur.h |    2 --
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index cbcbb39..5eb3d62 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,6 @@ lib_libscreenshooter_la_CFLAGS = \
 	@SOUP_CFLAGS@ \
 	@CURL_CFLAGS@ \
 	@JSON_GLIB_CFLAGS@ \
-	@SEXY_CFLAGS@ \
 	@XFIXES_CFLAGS@ \
   -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
@@ -62,7 +61,6 @@ lib_libscreenshooter_la_LIBADD = \
 	@JSON_GLIB_LIBS@ \
 	@LIBXEXT_LIBS@ \
 	@LIBX11_LIBS@ \
-	@SEXY_LIBS@ \
 	@XFIXES_LIBS@
 
 lib_libscreenshooter_built_sources = \
@@ -100,7 +98,6 @@ src_xfce4_screenshooter_CFLAGS = \
 	@SOUP_CFLAGS@ \
 	@CURL_CFLAGS@ \
 	@JSON_GLIB_CFLAGS@ \
-	@SEXY_CFLAGS@ \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
 src_xfce4_screenshooter_LDFLAGS = \
@@ -111,7 +108,6 @@ src_xfce4_screenshooter_LDFLAGS = \
 	@SOUP_LIBS@ \
 	@CURL_LIBS@ \
 	@JSON_GLIB_LIBS@ \
-	@SEXY_LIBS@ \
 	@LIBXFCE4UTIL_LIBS@ \
 	@LIBXFCE4UI_LIBS@
 
@@ -147,7 +143,6 @@ panel_plugin_libscreenshooterplugin_la_CFLAGS =	\
 	@GTHREAD_CFLAGS@ \
 	@CURL_CFLAGS@ \
 	@JSON_GLIB_CFLAGS@ \
-	@SEXY_CFLAGS@ \
 	@SOUP_CFLAGS@
 
 panel_plugin_libscreenshooterplugin_la_LDFLAGS = \
@@ -164,7 +159,6 @@ panel_plugin_libscreenshooterplugin_la_LIBADD = \
 	@SOUP_LIBS@ \
 	@CURL_LIBS@ \
 	@JSON_GLIB_LIBS@ \
-	@SEXY_LIBS@ \
 	@LIBXFCE4UI_LIBS@ \
 	lib/libscreenshooter.la
 
diff --git a/configure.ac.in b/configure.ac.in
index f81c022..9173e8b 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -57,7 +57,6 @@ XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])
 XDT_CHECK_PACKAGE([LIBXEXT], [xext], [1.0.0])
 XDT_CHECK_OPTIONAL_PACKAGE([XFIXES], [xfixes], [4.0.0], [xfixes], [XFIXES extension support])
 XDT_CHECK_OPTIONAL_PACKAGE([CURL], [libcurl], [7.19], [curl], [curl for imgur.com support])
-XDT_CHECK_OPTIONAL_PACKAGE([SEXY], [libsexy], [0.1], [sexy], [libsexy for imgur.com support])
 XDT_CHECK_OPTIONAL_PACKAGE([JSON_GLIB], [json-glib-1.0], [0.7.6], [json-glib], [json-glib for imgur.com support])
 XDT_CHECK_LIBX11()
 
diff --git a/lib/screenshooter-imgur.c b/lib/screenshooter-imgur.c
index 9614619..c753d88 100644
--- a/lib/screenshooter-imgur.c
+++ b/lib/screenshooter-imgur.c
@@ -33,7 +33,7 @@ typedef enum
   COMMENT,
 } ZimagezInformation;
 
-static void              open_url_hook             (SexyUrlLabel      *url_label,
+static void              open_url_hook             (GtkLabel      *url_label,
                                                     gchar             *url,
                                                     gpointer           user_data);
 static ScreenshooterJob *imgur_upload_to_imgur     (const gchar       *file_name,
@@ -124,7 +124,7 @@ static char *get_image_hash(char *json)
 }
 
 static void
-open_url_hook (SexyUrlLabel *url_label, gchar *url, gpointer user_data)
+open_url_hook (GtkLabel *url_label, gchar *url, gpointer user_data)
 {
   const gchar *command = g_strconcat ("xdg-open ", url, NULL);
   GError *error = NULL;
@@ -449,8 +449,8 @@ static void cb_image_uploaded (ScreenshooterJob  *job,
   gtk_container_add (GTK_CONTAINER (links_alignment), links_box);
 
   /* Create the image link */
-  image_link = sexy_url_label_new ();
-  sexy_url_label_set_markup (SEXY_URL_LABEL (image_link), image_markup);
+  image_link = gtk_label_new (NULL);
+  gtk_label_set_markup (GTK_LABEL (image_link), image_markup);
   gtk_misc_set_alignment (GTK_MISC (image_link), 0, 0);
   g_signal_connect (G_OBJECT (image_link), "url-activated",
                     G_CALLBACK (open_url_hook), NULL);
@@ -458,8 +458,8 @@ static void cb_image_uploaded (ScreenshooterJob  *job,
   gtk_container_add (GTK_CONTAINER (links_box), image_link);
 
   /* Create the thumbnail link */
-  thumbnail_link = sexy_url_label_new ();
-  sexy_url_label_set_markup (SEXY_URL_LABEL (thumbnail_link), thumbnail_markup);
+  thumbnail_link = gtk_label_new (NULL);
+  gtk_label_set_markup (GTK_LABEL (thumbnail_link), thumbnail_markup);
   gtk_misc_set_alignment (GTK_MISC (thumbnail_link), 0, 0);
   g_signal_connect (G_OBJECT (thumbnail_link), "url-activated",
                     G_CALLBACK (open_url_hook), NULL);
@@ -467,8 +467,8 @@ static void cb_image_uploaded (ScreenshooterJob  *job,
   gtk_container_add (GTK_CONTAINER (links_box), thumbnail_link);
 
   /* Create the small thumbnail link */
-  small_thumbnail_link = sexy_url_label_new ();
-  sexy_url_label_set_markup (SEXY_URL_LABEL (small_thumbnail_link), small_thumbnail_markup);
+  small_thumbnail_link = gtk_label_new (NULL);
+  gtk_label_set_markup (GTK_LABEL (small_thumbnail_link), small_thumbnail_markup);
   gtk_misc_set_alignment (GTK_MISC (small_thumbnail_link), 0, 0);
   g_signal_connect (G_OBJECT (small_thumbnail_link), "url-activated",
                     G_CALLBACK (open_url_hook), NULL);
diff --git a/lib/screenshooter-imgur.h b/lib/screenshooter-imgur.h
index f7a78d6..47e233e 100644
--- a/lib/screenshooter-imgur.h
+++ b/lib/screenshooter-imgur.h
@@ -26,8 +26,6 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <libsoup/soup.h>
-#include <libsexy/sexy-url-label.h>
 
 #include "screenshooter-utils.h"
 #include "screenshooter-simple-job.h"

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