Changeset 358

Timestamp:

05/22/06 19:58:09

Author:

pvanhoof

Message:

Build environment

Files:

• trunk/configure.ac (modified) (8 diffs)
• trunk/libtinymail-gnome-desktop/tny-account-store.c (modified) (6 diffs)

trunk/configure.ac

@@ -1 @@
-
-m4_define([tny_major_version], [1])
-m4_define([tny_minor_version], [0])
@@ -9 +8 @@
-          [m4_eval(100 * tny_minor_version + tny_micro_version)])
-m4_define([tny_api_version], [1.0])
+m4_define([lt_current], [m4_eval(100 * tny_minor_version + tny_micro_version - tny_interface_age)])
+m4_define([lt_revision], [tny_interface_age])
+m4_define([lt_age], [m4_eval(tny_binary_age - tny_interface_age)])
-
-AC_INIT([libtinymail], [tny_version], [http://www.pvanhoof.be])
@@ -17 +19 @@
-AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
-
-m4_define([lt_current], [m4_eval(100 * tny_minor_version + tny_micro_version - tny_interface_age)])
-m4_define([lt_revision], [tny_interface_age])
-m4_define([lt_age], [m4_eval(tny_binary_age - tny_interface_age)])
-LT_VERSION_INFO="lt_current:lt_revision:lt_age"
-LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
@@ -53 +52 @@
-dnl ### Enable gnome features ##
-AC_ARG_ENABLE(gnome,
-    
+              
-[case "${enableval}" in
-  yes) build_gnome=true ;;
@@ -61 +60 @@
-AM_CONDITIONAL(BUILD_GNOME, test x$build_gnome = xtrue)
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-AM_CONDITIONAL(BUILD_MOZEMBED, test x$build_mozembed = xtrue)
+AM_CONDITIONAL(BUILD_GTKHTML, test x$build_gtkhtml = xtrue)
-
-dnl ### Enable the python language bindings ##
-AC_ARG_ENABLE(py-tinymail,
-    
+                
-[case "${enableval}" in
-  yes) build_pytinymail=true ;;
@@ -83 +96 @@
-dnl ### Enable building the unit tests ##
-AC_ARG_ENABLE(unit-tests,
-    
+         
-[case "${enableval}" in
-  yes) build_unittests=true ;;
@@ -93 +106 @@
-dnl ### Set the platform library ##
-AC_ARG_WITH(platform,
-       
+               
-[case "${with_platform}" in
-  gnome-desktop) PLATFORMDIR=libtinymail-gnome-desktop ;;
-
-
+
+
+
-AC_SUBST(PLATFORMDIR)
-
@@ -224 +238 @@
-])
-
+echo ""
+echo "The following options are selected:"
+echo ""
+echo "  Enable GNOME features:       $build_gnome"
+echo "  HTML component:              ${with_html_component}"
+echo "  Python language bindings:    $build_pytinymail"
+echo "  Unit tests:                  $build_unittests"
+echo "  Target platform:             ${with_platform}"
+echo "  Prefix:                      ${prefix}"
+echo ""
+echo "Version info:"
+echo ""
+echo "  Version:                     $VERSION"
+echo "  API version:                 $API_VERSION"
+echo "  ABI version:                 $LT_VERSION_INFO"
+echo ""
+
+

trunk/libtinymail-gnome-desktop/tny-account-store.c

@@ -395 +395 @@
-}
-
+static void
+tny_account_store_notify_add (TnyAccountStoreIface *self)
+{
+        TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+        priv->notify = gconf_client_notify_add (priv->client, 
+                "/apps/tinymail/accounts", gconf_listener_account_changed,
+                self, NULL, NULL);
+        return;
+}
+
+static void
+tny_account_store_notify_remove (TnyAccountStoreIface *self)
+{
+        TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+        gconf_client_notify_remove (priv->client, priv->notify);
+        return;
+}
+
-/*
-        gconftool-2 -s /apps/tinymail/cache_dir -t string .tinymail
@@ -444 +462 @@
-        TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self);
-
+        tny_account_store_notify_remove (self);
-        tny_account_store_add_account (self, TNY_ACCOUNT_IFACE (account), "store");
+        tny_account_store_notify_add (self);
+
-        g_object_ref (G_OBJECT (account));
-
@@ -462 +483 @@
-
-        g_object_ref (G_OBJECT (account));
+
+        tny_account_store_notify_remove (self);
-        tny_account_store_add_account (self, TNY_ACCOUNT_IFACE (account), "transport");
+        tny_account_store_notify_add (self);
-
-        g_mutex_lock (priv->transport_accounts_lock);
@@ -501 +525 @@
-}
-
+
-static void
-tny_account_store_instance_init (GTypeInstance *instance, gpointer g_class)
@@ -515 +540 @@
-                GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
-
-
-
-
+
-
-        return;
@@ -529 +552 @@
-        TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self);
-
-gconf_client_notify_remove (priv->client, priv->notify
+tny_account_store_notify_remove (TNY_ACCOUNT_STORE_IFACE (self)
-        g_object_unref (G_OBJECT (priv->client));
-