rpms/xchat-gnome/devel xchat-gnome-libnotify.patch, NONE, 1.1 xchat-gnome.spec, 1.19, 1.20

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9094

Modified Files:
	xchat-gnome.spec 
Added Files:
	xchat-gnome-libnotify.patch 
Log Message:
* Sat Feb 25 2006 Brian Pepple <bdpepple at ameritech.net> - 0.10-3
- Add libnotify patch to work with 0.3.0 api.


xchat-gnome-libnotify.patch:

--- NEW FILE xchat-gnome-libnotify.patch ---
diff -ur xchat-gnome-0.10.ORIG/configure xchat-gnome-0.10/configure
--- xchat-gnome-0.10.ORIG/configure	2006-02-24 06:55:07.000000000 -0500
+++ xchat-gnome-0.10/configure	2006-02-25 12:07:28.000000000 -0500
@@ -2437,7 +2437,7 @@
 DBUS_REQUIRED=0.35
 DBUS_GLIB_REQUIRED=0.35
 LIBSEXY_REQUIRED=0.1.4
-LIBNOTIFY_REQUIRED=0.3.2
+LIBNOTIFY_REQUIRED=0.3.0
 
 
 ac_ext=c
diff -ur xchat-gnome-0.10.ORIG/plugins/notify-osd/notify-osd.c xchat-gnome-0.10/plugins/notify-osd/notify-osd.c
--- xchat-gnome-0.10.ORIG/plugins/notify-osd/notify-osd.c	2006-02-12 06:06:27.000000000 -0500
+++ xchat-gnome-0.10/plugins/notify-osd/notify-osd.c	2006-01-10 18:14:49.000000000 -0500
@@ -66,7 +66,7 @@
 
 	notify = notify_notification_new (summary, message, NULL, NULL);
 	notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
-	notify_notification_set_icon_from_pixbuf (notify, notify_icon);
+	notify_notification_set_icon_data_from_pixbuf (notify, notify_icon);
 	if (!notify_notification_show (notify, &error)) {
 		g_warning (_("Failed to send notification: %s\n"), error->message);
 		g_error_free (error);
@@ -97,7 +97,7 @@
 new_msg_cb (char *word[], gpointer data)
 {
 	const char *channel;
-	gchar *stripped, *escaped, *message, *summary;
+	gchar *stripped, *message, *summary;
 
 	if (focused)
 		return XCHAT_EAT_NONE;
@@ -106,19 +106,16 @@
 	stripped = xchat_strip (ph, word[2], -1, STRIP_COLORS | STRIP_ATTRS);
 
 	message = g_strdup_printf ("<%s> %s", word[1], stripped);
-	escaped = g_markup_escape_text(message, strlen(message));
-
 	if (channel[0] == '#')
 		summary = g_strdup_printf (_("Message in %s"), channel);
 	else
 		summary = g_strdup_printf (_("Message from %s"), channel);
 
-	add_notify (summary, escaped);
+	add_notify (summary, message);
 
 	xchat_free (ph, stripped);
 	g_free (message);
 	g_free (summary);
-	g_free (escaped);
 	return XCHAT_EAT_NONE;
 }
 


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xchat-gnome.spec	24 Feb 2006 19:05:17 -0000	1.19
+++ xchat-gnome.spec	25 Feb 2006 17:42:09 -0000	1.20
@@ -1,9 +1,9 @@
 %define with_dbus 1
-%define with_libnotify 0
+%define with_libnotify 1
 
 Name:           xchat-gnome
 Version:        0.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -12,6 +12,7 @@
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-screensaver.patch
+Patch2:		%{name}-libnotify.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -54,6 +55,7 @@
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
 %patch1 -p1 -b .screensaver
+%patch2 -p1 -b .libnotify
 
 
 %build
@@ -135,6 +137,9 @@
 
 
 %changelog
+* Sat Feb 25 2006 Brian Pepple <bdpepple at ameritech.net> - 0.10-3
+- Add libnotify patch to work with 0.3.0 api.
+
 * Fri Feb 24 2006 Brian Pepple <bdpepple at ameritech.net> - 0.10-2
 - Add patch to use correct gnome-screensaver dbus object.
 - Drop killall gconfd-2 calls in scriptlets.