evolution r35030 - in trunk/addressbook: . gui/merging

[sragavan svn gnome org]

Author: sragavan
Date: Sun Feb 17 20:10:32 2008
New Revision: 35030
URL: http://svn.gnome.org/viewvc/evolution?rev=35030&view=rev

Log:
2008-02-18  Srinivasa Ragavan  <sragavan novell com>

	* gui/merging/eab-contact-merging.c: (mergeit): Upstream patch from
	OpenSUSE.




Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/gui/merging/eab-contact-merging.c

Modified: trunk/addressbook/gui/merging/eab-contact-merging.c
==============================================================================
--- trunk/addressbook/gui/merging/eab-contact-merging.c	(original)
+++ trunk/addressbook/gui/merging/eab-contact-merging.c	Sun Feb 17 20:10:32 2008
@@ -343,6 +343,7 @@
 		     value = 1;
 		     break;
 	case GTK_RESPONSE_CANCEL:
+	default:
 	             value = 0;
 		     break;
 	}