On Mon, Feb 08, 2010 at 04:22:53PM +0100, Julian Andres Klode wrote: > Package: notification-daemon > Version: 0.4.0-2 > Severity: wishlist > > Please include the attached patch in the next upload, build-depend > on libgtk2.0-dev (>= 2.18) and drop the build-dependency on > libsexy-dev. >
Sending the patch. -- Julian Andres Klode - Debian Developer, Ubuntu Member See http://wiki.debian.org/JulianAndresKlode and http://jak-linux.org/.
From 7d3492771b8cba18bb23af744cd0cfab196f23eb Mon Sep 17 00:00:00 2001 From: Julian Andres Klode <[email protected]> Date: Mon, 8 Feb 2010 16:11:55 +0100 Subject: [PATCH] src/themes/standard/theme.c: Drop dependency on libsexy. GTK+ 2.18 supports showing links inside a GtkLabel, similar to SexyUrlLabel. Port checkgmail to use this new functionality. --- configure | 6 ++---- configure.ac | 6 ++---- src/themes/standard/theme.c | 7 +++---- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 1cf08ba..c85f69a 100755 --- a/configure +++ b/configure @@ -13334,16 +13334,14 @@ echo "${ECHO_T}$LINGUAS" >&6; } < $srcdir/po/POTFILES.in > po/POTFILES -REQ_GTK_VERSION=2.10.0 -REQ_GLIB_VERSION=$REQ_GTK_VERSION -REQ_SEXY_VERSION=0.1.3 +REQ_GTK_VERSION=2.18.0 +REQ_GLIB_VERSION=2.10.0 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/configure.ac b/configure.ac index 5c837d3..0f33096 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_GLIB_VERSION=$REQ_GTK_VERSION -REQ_SEXY_VERSION=0.1.3 +REQ_GTK_VERSION=2.18.0 +REQ_GLIB_VERSION=2.10.0 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..784dd7c 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); @@ -722,11 +721,11 @@ 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_signal_connect_swapped(G_OBJECT(windata->body_label), "activate-link", G_CALLBACK(windata->url_clicked), win); atkobj = gtk_widget_get_accessible(windata->body_label); @@ -801,7 +800,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); -- 1.6.6.1
signature.asc
Description: Digital signature
