aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libibex/ChangeLog4
-rw-r--r--libibex/ibex_block.c1
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shortcuts-view-model.c2
4 files changed, 10 insertions, 2 deletions
diff --git a/libibex/ChangeLog b/libibex/ChangeLog
index 5318e935c4..291d8eddbd 100644
--- a/libibex/ChangeLog
+++ b/libibex/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-25 <jpr@helixcode.com>
+
+ * ibex_block.c: No longer include <db.h>
+
2000-10-25 Not Zed <NotZed@HelixCode.com>
* ibex_internal.h (IBEX_VERSION): Bumped to another version. The
diff --git a/libibex/ibex_block.c b/libibex/ibex_block.c
index 7540d48789..7a5864ea32 100644
--- a/libibex/ibex_block.c
+++ b/libibex/ibex_block.c
@@ -1,7 +1,6 @@
#include <glib.h>
-#include <db.h>
#include <stdio.h>
#include <unicode.h>
#include <ctype.h>
diff --git a/shell/ChangeLog b/shell/ChangeLog
index af478332b5..3d150b2f90 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-25 <jpr@helixcode.com>
+
+ * e-shortcuts-view-model.c (load_group_into_model): Set folder to NULL to
+ kill warning
+
2000-10-23 Dan Winship <danw@helixcode.com>
* Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
diff --git a/shell/e-shortcuts-view-model.c b/shell/e-shortcuts-view-model.c
index 384144508b..f0d08b8458 100644
--- a/shell/e-shortcuts-view-model.c
+++ b/shell/e-shortcuts-view-model.c
@@ -85,7 +85,7 @@ load_group_into_model (EShortcutsViewModel *shortcuts_view_model,
return;
for (p = shortcut_list; p != NULL; p = p->next) {
- EFolder *folder;
+ EFolder *folder = NULL;
const char *path;
const char *uri;
const char *name;