Changeset 2829

Timestamp:

10/11/07 11:38:42

Author:

jdapena

Message:

* m4/moz.m4: add support for gtkmozembed library using gtkembedmoz.pc.

Also export mozilla_home.
* debian/rules.maemo: compile with mozembed support.
* debian/control.maemo1: compile with mozembed support.
* tests/c-demo/tny-main.c: remove mozilla calls in main.
* configure.ac: some fixes for html module detection. Use mozilla home.
Now we only use detection of xpcom for being sure we've got an engine
path.
* Removed libtinymailui-mozembed/mozilla-preferences.{cpp,h}, as we now
use gtk moz embed api to set preferences.
* libtinymalui-mozembed/Makefile.am: removed mozilla preferences from
build.
* libtinymailui-mozembed/tny-moz-embed-html-mime-part-view.c:
Now we use gtk moz embed to set preferences. We also set properly the
component path (mozilla home from used engine), and the profile path
(using the progname). We set a default chrome without scrollbars.

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/config.h.in (modified) (1 diff)
• trunk/configure.ac (modified) (3 diffs)
• trunk/debian/control.maemo1 (modified) (2 diffs)
• trunk/debian/rules.maemo (modified) (2 diffs)
• trunk/libtinymailui-mozembed/Makefile.am (modified) (1 diff)
• trunk/libtinymailui-mozembed/mozilla-preferences.cpp (deleted)
• trunk/libtinymailui-mozembed/mozilla-preferences.h (deleted)
• trunk/libtinymailui-mozembed/tny-moz-embed-html-mime-part-view.c (modified) (5 diffs)
• trunk/m4/moz.m4 (modified) (2 diffs)
• trunk/tests/c-demo/tny-main.c (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-10-10  Jose Dapena Paz  <jdapena@igalia.com>
+
+        * m4/moz.m4: add support for gtkmozembed library using gtkembedmoz.pc.
+        Also export mozilla_home.
+        * debian/rules.maemo: compile with mozembed support.
+        * debian/control.maemo1: compile with mozembed support.
+        * tests/c-demo/tny-main.c: remove mozilla calls in main.
+        * configure.ac: some fixes for html module detection. Use mozilla home.
+        Now we only use detection of xpcom for being sure we've got an engine
+        path.
+        * Removed libtinymailui-mozembed/mozilla-preferences.{cpp,h}, as we now
+        use gtk moz embed api to set preferences.
+        * libtinymalui-mozembed/Makefile.am: removed mozilla preferences from
+        build.
+        * libtinymailui-mozembed/tny-moz-embed-html-mime-part-view.c:
+        Now we use gtk moz embed to set preferences. We also set properly the
+        component path (mozilla home from used engine), and the profile path
+        (using the progname). We set a default chrome without scrollbars.
+
-2007-10-08  Philip Van Hoof  <pvanhoof@gnome.org>
-

trunk/config.h.in

@@ -55 +55 @@
-#undef MAEMO_CONIC_DUMMY
-
+/* "The path of the mozilla engine" */
+#undef MOZILLA_HOME
+
-/* Name of package */
-#undef PACKAGE

trunk/configure.ac

@@ -61 +61 @@
-build_uigtk=true
-build_demoui=true
-tru
+fals
-build_webkit=false
-build_gtkhtml=false
@@ -88 +88 @@
-        build_gnome=false
-        build_maemo=true
-        with_html_component=none
-        build_uigtk=true
-        build_demoui=true
@@ -376 +375 @@
-  AC_TNY_MOZ_CHECK
-
-nspr
- AC_MSG_ERROR("You need Mozilla's NSPR") 
+xpcom
+AC_MSG_ERROR("You need Mozilla's XPCOM")
-  fi
-
-
-
-
-
-
+
-  if test x$mozilla_gtkmozembed = xno; then
-   AC_MSG_ERROR("You need Mozilla's GtkMozEmbed")
-  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)
+  MOZILLA_HOME="$mozilla_home"
+  AC_DEFINE_UNQUOTED(MOZILLA_HOME,"$mozilla_home",["The path of the mozilla engine"])
-else
-  LIBTINYMAILUI_MOZEMBED_CFLAGS=
-  LIBTINYMAILUI_MOZEMBED_LIBS=
-
+
+
+
-
-dnl ### libtinymail-gnome-desktop, a GNOME platform library implementation ##

trunk/debian/control.maemo1

@@ -3 +3 @@
-Priority: optional
-Maintainer: Oystein Gisnas <oystein@gisnas.net>
-
+, libgtkmozembed-dev
-Standards-Version: 3.7.2
-
@@ -224 +224 @@
- This package contains the debug symbol files for libtinymail-gnomevfs.
-
+Package: libtinymailui-mozembed-1.0-0
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: memory-effective framework for accessing e-mail - Camel library
+ Tinymail is a development framework for accessing E-mail services using
+ devices with few memory resources.
+ .
+ It supports local mail storage (Maildir,mh,spool & mbox), IMAP, Exchange
+ and NNTP. It can be used to send messages over SMTP and by using sendmail.
+ .
+ This package contains the library for rendering HTML.
+
+Package: libtinymailui-mozembed-1.0-0-dev
+Architecture: any
+Depends: libtinymailui-mozembed-1.0-0 (= ${binary:Version})
+Description: memory-effective framework for accessing e-mail - development files
+ Tinymail is a development framework for accessing E-mail services using
+ devices with few memory resources.
+ .
+ It supports local mail storage (Maildir,mh,spool & mbox), IMAP, Exchange
+ and NNTP. It can be used to send messages over SMTP and by using sendmail.
+ .
+ This package contains the development files for libtinymailui-mozembed.

trunk/debian/rules.maemo

@@ -32 +32 @@
-        dh_testdir
-        # Add here commands to configure the package.
-
+ --with-html-component=mozembed
-
-
@@ -95 +95 @@
-#       dh_installman
-        dh_link
-
+ --dbg-package=libtinymail-mozembed-1.0-0
-        dh_compress
-        dh_fixperms

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

@@ -21 +21 @@
-#include <config.h>
-#include <glib/gi18n-lib.h>
-
-#include "mozilla-preferences.h"
-
-#include <unistd.h>
@@ -33 +31 @@
-#include <string.h>
-#include <gtk/gtk.h>
+
+#include <gtkmozembed_common.h>
-
-#include <tny-moz-embed-html-mime-part-view.h>
@@ -143 +143 @@
-        priv->part = NULL;
-        gtk_moz_embed_set_chrome_mask (GTK_MOZ_EMBED (self), 
-|GTK_MOZ_EMBED_FLAG_SCROLLBARS
+ | GTK_MOZ_EMBED_FLAG_WINDOWRESIZE
-
-        g_signal_connect (G_OBJECT (self), "new_window",
@@ -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);
@@ -192 +199 @@
-        g_type_class_add_private (object_class, sizeof (TnyMozEmbedHtmlMimePartViewPriv));
-
+        gtk_moz_embed_set_path (MOZILLA_HOME);
+
+        home_path = getenv ("HOME");
+        if (!home_path)
+                home_path = g_get_home_dir ();
+        prgname = g_get_prgname ();
+        if (!prgname)
+                prgname = "tinymail";
+        full_path = g_strdup_printf("%s/%s", home_path, ".tinymail");
+        profile_path = g_strconcat ("mozembed-", prgname, NULL);
+        gtk_moz_embed_set_profile_path (full_path, profile_path);
+        g_free (profile_path);
+
-        gtk_moz_embed_push_startup ();
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-        return;

trunk/m4/moz.m4

@@ -25 +25 @@
-
-mozilla_xpcom="no"
+mozilla_home="no"
-AC_MSG_CHECKING(Mozilla XPCOM pkg-config module name)
-mozilla_xpcom_pcs="xpcom mozilla-xpcom firefox-xpcom xulrunner-xpcom microb-engine-xpcom"
@@ -30 +31 @@
-        if $PKG_CONFIG --exists $pc; then
-                mozilla_xpcom=$pc
+                mozilla_home="`$PKG_CONFIG --variable=libdir $pc`"
-                break;
-        fi
-done
-AC_MSG_RESULT($mozilla_xpcom)
+AC_MSG_RESULT($mozilla_home)
-
-mozilla_gtkmozembed="no"
-AC_MSG_CHECKING(Mozilla gtkmozembed pkg-config module name)
-mozembed
+embedmoz gtkembedmoz
-for pc in $mozilla_gtkmozembed_pcs; do
-        if $PKG_CONFIG --exists $pc; then

trunk/tests/c-demo/tny-main.c

@@ -45 +45 @@
-#include <libgnomevfs/gnome-vfs.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#endif
-
-#ifdef MOZEMBED
-#include <nspr.h>
-#include <prthread.h>
-#endif
-
@@ -138 +133 @@
-        gdk_threads_leave ();
-
-#ifdef MOZEMBED
-        PR_ProcessExit ((PRIntn)(long)0);
-#endif
-
-        return 0;
-}