rpms/mail-notification/devel mail-notification-5.0-eelfix.diff, NONE, 1.1 mail-notification.spec, 1.47, 1.48

[Thorsten Leemhuis (thl)]

Author: thl

Update of /cvs/pkgs/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18363

Modified Files:
	mail-notification.spec 
Added Files:
	mail-notification-5.0-eelfix.diff 
Log Message:
* Thu Jan 31 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.0-2
- add http://launchpadlibrarian.net/11684452/mail-notification-5.0-eelfix.diff
  from https://bugs.launchpad.net/bugs/180400


mail-notification-5.0-eelfix.diff:

--- NEW FILE mail-notification-5.0-eelfix.diff ---
--- src/mn-maildir-mailbox-backend.c.orig	2008-01-04 17:03:57.000000000 +0100
+++ src/mn-maildir-mailbox-backend.c	2008-01-31 20:47:10.000000000 +0100
@@ -161,7 +161,7 @@
       {
 	char *filename;
 
-	filename = eel_uri_get_basename(info_uri);
+	filename = mn_vfs_uri_get_basename(info_uri);
 	if (filename)
 	  {
 	    if (filename[0] != '.')
--- src/mn-mh-mailbox-backend.c.orig	2008-01-04 17:03:57.000000000 +0100
+++ src/mn-mh-mailbox-backend.c	2008-01-31 20:46:49.000000000 +0100
@@ -191,7 +191,7 @@
       {
 	char *filename;
 
-	filename = eel_uri_get_basename(info_uri);
+	filename = mn_vfs_uri_get_basename(info_uri);
 	if (filename)
 	  {
 	    if (! strcmp(filename, SEQUENCES_FILE) || mn_str_isnumeric(filename))
--- src/mn-sylpheed-mailbox-backend.c.orig	2008-01-04 17:03:58.000000000 +0100
+++ src/mn-sylpheed-mailbox-backend.c	2008-01-31 20:46:57.000000000 +0100
@@ -180,7 +180,7 @@
       {
 	char *filename;
 
-	filename = eel_uri_get_basename(info_uri);
+	filename = mn_vfs_uri_get_basename(info_uri);
 	if (filename)
 	  {
 	    /*
--- src/mn-vfs.c.orig	2008-01-04 16:40:15.000000000 +0100
+++ src/mn-vfs.c	2008-01-31 20:45:31.000000000 +0100
@@ -335,3 +335,21 @@
   g_set_error(err, 0, 0, "%s", gnome_vfs_result_to_string(result));
   return FALSE;
 }
+
+char *
+mn_vfs_uri_get_basename (const char *text_uri)
+{
+  GnomeVFSURI *uri;
+  char *name;
+
+  g_return_val_if_fail(text_uri != NULL, NULL);
+
+  uri = gnome_vfs_uri_new(text_uri);
+  if (! uri)
+    return NULL;
+
+  name = gnome_vfs_uri_extract_short_name(uri);
+  gnome_vfs_uri_unref(uri);
+
+  return name;
+}
--- src/mn-vfs.h.orig	2008-01-04 16:40:16.000000000 +0100
+++ src/mn-vfs.h	2008-01-31 20:45:42.000000000 +0100
@@ -54,4 +54,6 @@
 
 gboolean mn_vfs_result_to_g_error (GnomeVFSResult result, GError **err);
 
+char *mn_vfs_uri_get_basename (const char *text_uri);
+
 #endif /* _MN_VFS_H */


Index: mail-notification.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mail-notification.spec	4 Jan 2008 18:31:42 -0000	1.47
+++ mail-notification.spec	31 Jan 2008 20:03:01 -0000	1.48
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -8,6 +8,7 @@
 URL:            http://www.nongnu.org/mailnotify/
 Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-5.0.tar.bz2
 Patch0:         mail-notification-fedora-plugin-hint.patch
+Patch1:         http://launchpadlibrarian.net/11684452/mail-notification-5.0-eelfix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext >= 0.14.1
@@ -55,6 +56,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .patch0
+%patch1 -p0 -b .patch1
 
 %build
 %configure --disable-schemas-install  --enable-evolution
@@ -137,6 +139,10 @@
 
 
 %changelog
+* Thu Jan 31 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.0-2
+- add http://launchpadlibrarian.net/11684452/mail-notification-5.0-eelfix.diff
+  from https://bugs.launchpad.net/bugs/180400
+
 * Fri Jan 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.0-1
 - Update to 5.0