Changeset 362

Timestamp:

05/22/06 20:48:10

Author:

pvanhoof

Message:

Solved the firefox gtkmozembed bug

Files:

• trunk/configure.ac (modified) (1 diff)
• trunk/libtinymail-camel/tny-session-camel.c (modified) (1 diff)
• trunk/tinymail/Makefile.am (modified) (1 diff)
• trunk/tinymail/tny-main.c (modified) (3 diffs)

trunk/configure.ac

@@ -153 +153 @@
-dnl ### libtinymailui-mozembed, a library that wraps the gtkmozembed widget ##
-if test x$build_mozembed = xtrue; then
-
+
+
-  PKG_CHECK_MODULES(LIBTINYMAILUI_MOZEMBED, $extraplatpkgs glib-2.0 >= 2.8 gobject-2.0 gtk+-2.0 $extragtkpkgs)
-else

trunk/libtinymail-camel/tny-session-camel.c

@@ -376 +376 @@
-{
-        ms_parent_class->thread_msg_free(session, m);
-
+
-        return;
-}

trunk/tinymail/Makefile.am

@@ -10 +10 @@
-if BUILD_GNOME
-INCLUDES += -DGNOME
+endif
+
+if BUILD_MOZEMBED
+INCLUDES += -DMOZEMBED
-endif
-

trunk/tinymail/tny-main.c

@@ -17 +17 @@
- */
-
-
-#include <gtk/gtk.h>
-
@@ -30 +29 @@
-#endif
-
+#ifdef MOZEMBED
+#include <nspr.h>
+#include <prthread.h>
+
+static void
+tny_main_shutdown (gpointer data)
+{
+
+        /* This solves a firefox vs. Camel bug. */
+
+        PR_ProcessExit ((int)data);
+        gtk_exit ((gint)data);
+
+        return;
+}
+#endif
-
-/**
@@ -66 +81 @@
-        
-        g_signal_connect (window, "destroy",
+#ifdef MOZEMBED
+                G_CALLBACK (tny_main_shutdown), 0);
+#else
-                G_CALLBACK (gtk_exit), 0);
+#endif
-
-        gtk_main();