r10441 - /packages/unstable/nautilus-sendto/debian/patches/10_evolution-error-handling.patch

[oysteigi-guest at users.alioth.debian.org]

Author: oysteigi-guest
Date: Wed Apr 25 16:27:35 2007
New Revision: 10441

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10441
Log:
Flip patch that was reversed

Modified:
    packages/unstable/nautilus-sendto/debian/patches/10_evolution-error-handling.patch

Modified: packages/unstable/nautilus-sendto/debian/patches/10_evolution-error-handling.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/debian/patches/10_evolution-error-handling.patch?rev=10441&op=diff
==============================================================================
--- packages/unstable/nautilus-sendto/debian/patches/10_evolution-error-handling.patch (original)
+++ packages/unstable/nautilus-sendto/debian/patches/10_evolution-error-handling.patch Wed Apr 25 16:27:35 2007
@@ -1,38 +1,37 @@
-diff -Nur nautilus-sendto-0.10/src/plugins/evolution.c nautilus-sendto-0.10.new/src/plugins/evolution.c
---- nautilus-sendto-0.10/src/plugins/evolution.c	2007-04-24 22:12:44.000000000 +0200
-+++ nautilus-sendto-0.10.new/src/plugins/evolution.c	2007-03-09 01:00:01.000000000 +0100
-@@ -90,9 +90,8 @@
+--- src/plugins/evolution.c.orig	2007-04-25 17:07:58.368311000 +0200
++++ src/plugins/evolution.c	2007-04-25 17:08:10.017039553 +0200
+@@ -90,8 +90,9 @@
  
  	/* Collect address books marked for auto-complete */
  	if (!e_book_get_addressbooks (&all_abooks, &err)) {
--		g_warning ("Unable to get addressbooks: %s", err->message);
++		g_warning ("Unable to get addressbooks: %s", err->message);
  		g_error_free (err);
--		return;
-+		g_error ("Unable to get addressbooks: %s", err->message);
+-		g_error ("Unable to get addressbooks: %s", err->message);
++		return;
  	}
  	for (g = e_source_list_peek_groups (all_abooks); g; g = g_slist_next (g)) {
  		for (s = e_source_group_peek_sources ((ESourceGroup *) g->data); s; s = g_slist_next (s)) {
-@@ -117,20 +116,19 @@
+@@ -116,19 +117,20 @@
  
  		if (!(book = e_book_new (source, &err))) {
  			g_warning ("Unable to create addressbook: %s", err->message);
--			g_clear_error (&err);
-+			g_error_free (err);
+-			g_error_free (err);
++			g_clear_error (&err);
  			continue;
  		}
  		if (!e_book_open (book, TRUE, &err)) {
  			g_warning ("Unable to open addressbook: %s", err->message);
--			g_clear_error (&err);
-+			g_error_free (err);
+-			g_error_free (err);
++			g_clear_error (&err);
  			g_object_unref (book);
  			continue;
  		}
  		query = e_book_query_field_exists (E_CONTACT_FULL_NAME);
  		if (!e_book_get_contacts (book, query, &contacts, &err)) {
  			g_warning ("Unable to get contacts: %s", err->message);
--			g_clear_error (&err);
--			e_book_query_unref (query);
-+			g_error_free (err);
+-			g_error_free (err);
++			g_clear_error (&err);
++			e_book_query_unref (query);
  			g_object_unref (book);
  			continue;
  		}