2007-06-25 Armin Burgmeier <armin@openismus.com>

* src/widgets/modest-window-mgr.c:
	* src/modest-init.c:
	* configure.ac: Correctly recognize hildon-notify presence and fixed
	the build without it being installed.

pmo-trunk-r2401

diff --git a/ChangeLog2 b/ChangeLog2
index 509aa92..10c1cee 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,3 +1,10 @@
+2007-06-25  Armin Burgmeier  <armin@openismus.com>
+
+       * src/widgets/modest-window-mgr.c:
+       * src/modest-init.c:
+       * configure.ac: Correctly recognize hildon-notify presence and fixed
+       the build without it being installed.
+
 2007-06-25  Murray Cumming  <murrayc@murrayc.com>
 
        * libmodest-dbus-client/libmodest-dbus-client.c:

diff --git a/configure.ac b/configure.ac
index 8db19de..8b094f1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -170,7 +170,7 @@ fi
 #
 if test "x$with_platform" == "xmaemo"; then  
    PKG_CHECK_MODULES(MODEST_HILDON_NOTIFY,hildon-notify libnotify,have_hildon_notify=true,have_hildon_notify=false)
-   if test "x$have_hildon_notify"="xtrue"; then
+   if test "x$have_hildon_notify" == "xtrue"; then
       AC_DEFINE_UNQUOTED(MODEST_HAVE_HILDON_NOTIFY, 1, ["Whether hildon-notify is available"])      
    fi
 fi

diff --git a/src/modest-init.c b/src/modest-init.c
index 2580951..8f81f3d 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -245,7 +245,7 @@ modest_init_init_ui (gint argc, gchar** argv)
        init_stock_icons ();
 
        /* Init notification system */
-       #ifndef MODEST_HILDON_VERSION_0
+       #ifdef MODEST_HAVE_HILDON_NOTIFY
        notify_init ("Basics");
        #endif
 

diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c
index 91348d7..e7709db 100644 (file)
--- a/src/widgets/modest-window-mgr.c
+++ b/src/widgets/modest-window-mgr.c
@@ -145,7 +145,7 @@ modest_window_mgr_finalize (GObject *obj)
 
        /* Free the hash table with the handlers */
        if (priv->destroy_handlers) {
-               g_hash_table_unref (priv->destroy_handlers);
+               g_hash_table_destroy (priv->destroy_handlers);
                priv->destroy_handlers = NULL;
        }