[notification-daemon] Remove libsexy dependency

[William Jon McCann <mccann src gnome org>]

commit b32e98eae546ba3c37a0eab226d83b22c09b91d7
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jan 8 18:12:23 2010 -0500

    Remove libsexy dependency
    
    Required features are present in GTK+ 2.18 and later.

 configure.ac                |    4 +---
 src/themes/standard/theme.c |   17 ++++++++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 449ac24..5764393 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,16 +73,14 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
 AM_GLIB_GNU_GETTEXT
 
-REQ_GTK_VERSION=2.10.0
+REQ_GTK_VERSION=2.18.0
 REQ_GLIB_VERSION=$REQ_GTK_VERSION
-REQ_SEXY_VERSION=0.1.3
 REQ_DBUS_VERSION=0.36
 pkg_modules="
 	gtk+-2.0 >= $REQ_GTK_VERSION, \
 	glib-2.0 >= $REQ_GLIB_VERSION, \
 	dbus-1 >= $REQ_DBUS_VERSION, \
 	dbus-glib-1 >= $REQ_DBUS_VERSION, \
-	libsexy >= $REQ_SEXY_VERSION, \
 	gconf-2.0, \
 	libwnck-1.0 \
 "
diff --git a/src/themes/standard/theme.c b/src/themes/standard/theme.c
index 73c5f73..34d9234 100644
--- a/src/themes/standard/theme.c
+++ b/src/themes/standard/theme.c
@@ -1,7 +1,6 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include <libsexy/sexy-url-label.h>
 
 typedef void (*ActionInvokedCb)(GtkWindow *nw, const char *key);
 typedef void (*UrlClickedCb)(GtkWindow *nw, const char *url);
@@ -563,6 +562,14 @@ configure_event_cb(GtkWidget *nw,
 	return FALSE;
 }
 
+static gboolean
+activate_link (GtkLabel *label, const char *url, WindowData *windata)
+{
+	windata->url_clicked (GTK_WINDOW(windata->win), url);
+
+	return TRUE;
+}
+
 GtkWindow *
 create_notification(UrlClickedCb url_clicked)
 {
@@ -722,12 +729,12 @@ create_notification(UrlClickedCb url_clicked)
 	gtk_widget_show(vbox);
 	gtk_box_pack_start(GTK_BOX(windata->content_hbox), vbox, TRUE, TRUE, 0);
 
-	windata->body_label = sexy_url_label_new();
+	windata->body_label = gtk_label_new (NULL);
 	gtk_box_pack_start(GTK_BOX(vbox), windata->body_label, TRUE, TRUE, 0);
 	gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0, 0);
 	gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE);
-	g_signal_connect_swapped(G_OBJECT(windata->body_label), "url_activated",
-							 G_CALLBACK(windata->url_clicked), win);
+	g_signal_connect(G_OBJECT(windata->body_label), "activate-link",
+                                  G_CALLBACK(activate_link), windata);
 
 	atkobj = gtk_widget_get_accessible(windata->body_label);
 	atk_object_set_description(atkobj, "Notification body text.");
@@ -801,7 +808,7 @@ set_notification_text(GtkWindow *nw, const char *summary, const char *body)
 	gtk_label_set_markup(GTK_LABEL(windata->summary_label), str);
 	g_free(str);
 
-	sexy_url_label_set_markup(SEXY_URL_LABEL(windata->body_label), body);
+	gtk_label_set_markup(GTK_LABEL(windata->body_label), body);
 
 	if (body == NULL || *body == '\0')
 		gtk_widget_hide(windata->body_label);