Changeset 2835

Timestamp:

10/15/07 02:17:59

Author:

jdapena

Message:

* m4/moz.m4:

• • • • Reworked mozilla detection. Now we know if the mozilla
        engine is based on 1.8 or 1.9 code.
        

* configure.ac:

• • • • Use again includes for nspr and nss
        

* libtinymailui-mozembed/Makefile.am:

• • • • Use again the mozilla preferences code, as it will hide the
        mozilla 1.8 compatibility code.
        

* tny-moz-embed-html-mime-part-view.c:

• • • • Move all the mozembed setup code to mozilla-preferences. There
        I'll set specific mozilla code to add compatibility with
        mozilla 1.8.
        

* libtinymailui-gnome-keyring/tny-gnome-keyring-password-getter.c:

• • • • Fix crash when the keyring function returns no matches in
        keyring, but it returns ok.
        

Files:

• trunk/config.h.in (modified) (2 diffs)
• trunk/configure.ac (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/config.h.in (modified) (2 diffs)
• trunk/libtinymailui-gnome-keyring/tny-gnome-keyring-password-getter.c (modified) (1 diff)
• trunk/libtinymailui-mozembed/Makefile.am (modified) (1 diff)
• trunk/libtinymailui-mozembed/mozilla-preferences.cpp (added)
• trunk/libtinymailui-mozembed/mozilla-preferences.h (added)
• trunk/libtinymailui-mozembed/tny-moz-embed-html-mime-part-view.c (modified) (3 diffs)
• trunk/m4/moz.m4 (modified) (1 diff)

trunk/config.h.in

@@ -31 +31 @@
-#undef HAVE_MEMORY_H
-
+/* Define if we have mozilla api 1.8 */
+#undef HAVE_MOZILLA_1_8
+
+/* Define if we have mozilla api 1.9 */
+#undef HAVE_MOZILLA_1_9
+
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
@@ -54 +60 @@
-/* "Whether to hack the TnyMaemoConicDevice to somewhat work in sbox" */
-#undef MAEMO_CONIC_DUMMY
+
+/* Detected mozilla engine version for mozembed */
+#undef MOZEMBED_MOZILLA_VERSION
-
-/* "The path of the mozilla engine" */

trunk/configure.ac

@@ -375 +375 @@
-  AC_TNY_MOZ_CHECK
-
+  if test x$mozilla_nspr = xno; then
+   AC_MSG_ERROR("You need Mozilla's NSPR")
+  fi
+
+  if test x$mozilla_nss = xno; then
+   AC_MSG_ERROR("You need Mozilla's NSS")
+  fi
+
-  if test x$mozilla_xpcom = xno; then
-   AC_MSG_ERROR("You need Mozilla's XPCOM")
@@ -383 +391 @@
-  fi
-
-
+nspr $mozilla_nss $mozilla_
-  extratnypkgs="$extratnypkgs $extraplatpkgs"
-  PKG_CHECK_MODULES(LIBTINYMAILUI_MOZEMBED, $extraplatpkgs glib-2.0 >= 2.8 gobject-2.0 gtk+-2.0 $extragtkpkgs)

trunk/libtinymail-camel/camel-lite/config.h.in

@@ -95 +95 @@
-#undef HAVE_MKSTEMP
-
+/* Define if we have mozilla api 1.8 */
+#undef HAVE_MOZILLA_1_8
+
+/* Define if we have mozilla api 1.9 */
+#undef HAVE_MOZILLA_1_9
+
-/* Define if you have NSS */
-#undef HAVE_NSS
@@ -163 +169 @@
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
+
+/* Detected mozilla engine version for mozembed */
+#undef MOZEMBED_MOZILLA_VERSION
-
-/* Enable getaddrinfo emulation */

trunk/libtinymailui-gnome-keyring/tny-gnome-keyring-password-getter.c

@@ -41 +41 @@
-                "PLAIN", 0, &list);
-
-keyringret != GNOME_KEYRING_RESULT_OK
+(keyringret != GNOME_KEYRING_RESULT_OK) || (list == NULL)
-        {
-                gboolean canc = FALSE;

trunk/libtinymailui-mozembed/Makefile.am

@@ -21 +21 @@
-        tny-moz-embed-html-mime-part-view.c \
-        tny-moz-embed-msg-view.c \
-
+
+
+
-
-libtinymailui_mozembed_1_0_la_LIBADD =  \

trunk/libtinymailui-mozembed/tny-moz-embed-html-mime-part-view.c

@@ -32 +32 @@
-#include <gtk/gtk.h>
-
-<gtkmozembed_common.h>
+"mozilla-preferences.h"
-
-#include <tny-moz-embed-html-mime-part-view.h>
@@ -184 +184 @@
-{
-        GObjectClass *object_class;
-        gint int_value;
-        gboolean bool_value;
-        const gchar *home_path;
-        const gchar *full_path;
-        const gchar *prgname;
-        gchar *profile_path;
-        gchar *useragent;
-
-        parent_class = g_type_class_peek_parent (class);
@@ -199 +192 @@
-        g_type_class_add_private (object_class, sizeof (TnyMozEmbedHtmlMimePartViewPriv));
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        return;

trunk/m4/moz.m4

@@ -49 +49 @@
-AC_MSG_RESULT($mozilla_gtkmozembed)
-
+#Detect Mozilla XPCom version
+if test x$mozilla_xpcom != x; then
+
+   AC_MSG_CHECKING(Mozilla xpcom engine version)
+   #The only real way to detect the MOZILLA engine version is using the version in mozilla-config.h
+   #of the engine we use.
+   mozilla_xpcom_includedir="`$PKG_CONFIG --variable=includedir $mozilla_xpcom`"
+   mozilla_version=`cat $mozilla_xpcom_includedir/mozilla-config.h | grep MOZILLA_VERSION_U | sed "s/.*_VERSION_U\ //"|tr ".abpre+" " "`
+   mozilla_major_version=`echo $mozilla_version | awk ' { print $[1]; } '`
+   mozilla_minor_version=`echo $mozilla_version | awk ' { print $[2]; } '`
+
+   if test "$mozilla_major_version" != "1"; then
+      AC_DEFINE([HAVE_MOZILLA_1_9],[1],[Define if we have mozilla api 1.9])
+      AC_DEFINE([HAVE_MOZILLA_1_8],[1],[Define if we have mozilla api 1.8])
+   fi
+
+   if test "$mozilla_major_version" = "1" -a "$mozilla_minor_version" -ge "8"; then
+      AC_DEFINE([HAVE_MOZILLA_1_8],[1],[Define if we have mozilla api 1.8])
+   fi
+      
+   if test "$mozilla_major_version" = "1" -a "$mozilla_minor_version" -ge "9"; then
+      AC_DEFINE([HAVE_MOZILLA_1_9],[1],[Define if we have mozilla api 1.9])
+   fi
+
+   AC_MSG_RESULT($mozilla_version)
+
+
+fi
+
+
+AM_CONDITIONAL([HAVE_MOZILLA_1_8],[test "mozilla_major_version" = "1" -a "$mozilla_minor_version" -ge "8"])
+AM_CONDITIONAL([HAVE_MOZILLA_1_9],[test "$mozilla_major_version" = "1" -a "$mozilla_minor_version" -ge "9"])
+AC_DEFINE([MOZEMBED_MOZILLA_VERSION],["$mozilla_version"],[Detected mozilla engine version for mozembed])
+
-])
-