aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--smime/ChangeLog8
-rw-r--r--smime/gui/Makefile.am1
-rw-r--r--smime/lib/e-pkcs12.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog
index 25ab15c44c..b2fa0046b0 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-30 Larry Ewing <lewing@ximian.com>
+
+ * lib/e-pkcs12.c (nickname_collision): make sure declarations
+ precede logic for older compilers.
+
+ * gui/Makefile.am (INCLUDES): don't define GTK_DISABLE_DEPRECATED
+ it breakes on gtk-2.3 with gtk_option_menu_get_history.
+
2003-11-26 Chris Toshok <toshok@ximian.com>
* gui/certificate-viewer.[ch]: mostly implement a viewer for
diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am
index aba4c31548..6b6000dd3d 100644
--- a/smime/gui/Makefile.am
+++ b/smime/gui/Makefile.am
@@ -12,7 +12,6 @@ INCLUDES = \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
-DPREFIX=\""$(prefix)"\" \
-DG_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
-DLIBGNOME_DISABLE_DEPRECATED \
-DLIBGNOMEUI_DISABLE_DEPRECATED \
$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index 2d1bc79848..3092944196 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -374,12 +374,12 @@ static SECItem * PR_CALLBACK
nickname_collision(SECItem *oldNick, PRBool *cancel, void *wincx)
{
/* nsNSSShutDownPreventionLock locker; */
- *cancel = PR_FALSE;
int count = 1;
char *nickname = NULL;
char *default_nickname = _("Imported Certificate");
SECItem *new_nick;
+ *cancel = PR_FALSE;
printf ("nickname_collision\n");
/* The user is trying to import a PKCS#12 file that doesn't have the