2007-12-18 [colin] 3.2.0cvs1
authorColin Leroy <colin@colino.net>
Tue, 18 Dec 2007 06:13:57 +0000 (06:13 +0000)
committerColin Leroy <colin@colino.net>
Tue, 18 Dec 2007 06:13:57 +0000 (06:13 +0000)
* src/editaddress.c
Fix build on old GCC
Fix inverted buttons

ChangeLog
PATCHSETS
configure.ac
src/editaddress.c

index efb88e3211a44b451b735075effd2eeac39147f0..17a9e7b455364a3b81fd4a050fe5c744d38e705f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-18 [colin]     3.2.0cvs1
+
+       * src/editaddress.c
+               Fix build on old GCC
+               Fix inverted buttons
+
 2007-12-17 [paul]      3.2.0
 
        * NEWS
index 1df64d10696467e9636f2ee904fab0e2d3cc34dd..280f098677a75332cd54c25ef8ce2a9a18a79f7b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/addrcustomattr.c;  ) > 3.1.0cvs77.patchset
 ( cvs diff -u -r 1.60.2.47 -r 1.60.2.48 po/es.po;  ) > 3.1.0cvs78.patchset
 ( cvs diff -u -r 1.58.2.35 -r 1.58.2.36 po/de.po;  cvs diff -u -r 1.42.2.34 -r 1.42.2.35 po/fr.po;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 po/hu.po;  cvs diff -u -r 1.34.2.24 -r 1.34.2.25 po/it.po;  cvs diff -u -r 1.50.2.28 -r 1.50.2.29 po/pt_BR.po;  ) > 3.1.0cvs79.patchset
+( cvs diff -u -r 1.14.2.46 -r 1.14.2.47 src/editaddress.c;  ) > 3.2.0cvs1.patchset
index a6d80735f93ea7d02d48e9b5f7b86581b36f5d53..74e04a87174669f5fd21130eab53954b74467b52 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=0
+EXTRA_VERSION=1
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 139e69763d25ea0656cbc1b1b13974d6daef5f4e..8b0dba4826deef089e59a9d97937da9ca0ccd624 100644 (file)
@@ -157,22 +157,29 @@ static void edit_person_ok(GtkWidget *widget, gboolean *cancelled) {
                gint val;
 
                val = alertpanel( _("Add New Person"),
+#ifndef MAEMO
                                _("Adding a new person requires at least one of the\n"
                                  "information above to be set:\n"
-#ifndef MAEMO
                                  " - Display Name\n"
-#endif
                                  " - First Name\n"
                                  " - Last Name\n"
-#ifndef MAEMO
                                  " - Nickname\n"
-#endif
                                  " - any email address\n"
                                  " - any additional attribute\n\n"
                                  "Click OK to keep editing this contact.\n"
                                  "Click Cancel to close without saving."),
+#else
+                               _("Adding a new person requires at least one of the\n"
+                                 "information above to be set:\n"
+                                 " - First Name\n"
+                                 " - Last Name\n"
+                                 " - any email address\n"
+                                 " - any additional attribute\n\n"
+                                 "Click OK to keep editing this contact.\n"
+                                 "Click Cancel to close without saving."),
+#endif
                                GTK_STOCK_CANCEL, "+"GTK_STOCK_OK, NULL );
-               if( val == G_ALERTALTERNATE ) {
+               if( val == G_ALERTDEFAULT ) {
                        edit_person_cancel(widget, cancelled);
                }
                g_free( cn );