aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog5
-rw-r--r--camel/Makefile.am4
-rw-r--r--e-util/ChangeLog4
-rw-r--r--e-util/e-cursors.c6
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/main.c1
-rw-r--r--shell/Evolution.idl1
7 files changed, 22 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 984cc4b81b..67601b4095 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-12 Miguel de Icaza <miguel@gnu.org>
+
+ * Makefile.am (pthread_SRC): Use correct names for the pthread
+ source variables.
+
2000-04-10 Dan Winship <danw@helixcode.com>
* providers/pop3/camel-pop3-store.c (pop3_connect): fix various
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 16e180a392..2ce0e029dd 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -25,8 +25,8 @@ pthread_HDR = \
else
-libcamel_pthread_SRC =
-libcamel_pthread_HDR=
+pthread_SRC =
+pthread_HDR=
endif
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index f02808dcfc..613b1fbc9d 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-12 Miguel de Icaza <miguel@gnu.org>
+
+ * e-cursors.c (e_cursor_get): Prevent next hacker to get bitten by this.
+
2000-04-10 Christopher James Lahey <clahey@helixcode.com>
* e-canvas.c: Added proper keyboard focus handling.
diff --git a/e-util/e-cursors.c b/e-util/e-cursors.c
index 150b84b90a..56a5015cbd 100644
--- a/e-util/e-cursors.c
+++ b/e-util/e-cursors.c
@@ -28,6 +28,7 @@ static CursorDef cursors [] = {
{ NULL, 0, 0, NULL }
};
+static int inited = FALSE;
static void
create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, gchar **xpm)
@@ -105,6 +106,8 @@ e_cursors_init (void)
}
}
+ inited = TRUE;
+
g_assert (i == E_NUM_CURSORS);
}
@@ -124,5 +127,8 @@ e_cursor_get (ECursorType type)
{
g_return_val_if_fail (type >= 0 && type < E_NUM_CURSORS, NULL);
+ if (!inited)
+ g_warning ("e_cursors_init not called");
+
return cursors [type].cursor;
}
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 3e091eb7cc..448f3c327d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-12 Miguel de Icaza <miguel@gnu.org>
+
+ * main.c (main): Call e_cursors_init.
+
2000-04-10 Dan Winship <danw@helixcode.com>
* mail-ops.c (fetch_mail): use camel_movemail when fetching mail
diff --git a/mail/main.c b/mail/main.c
index 2dceb6644e..dbbe27ad72 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -46,6 +46,7 @@ main (int argc, char *argv [])
init_bonobo (argc, argv);
session_init ();
+ e_cursors_init ();
folder_browser_factory_init ();
diff --git a/shell/Evolution.idl b/shell/Evolution.idl
index 0253971a5b..c9026e2083 100644
--- a/shell/Evolution.idl
+++ b/shell/Evolution.idl
@@ -12,4 +12,3 @@
#include <Shell.idl>
#include <evolution-service-repository.idl>
-