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

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index 442b590..8f81f3d 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -133,7 +133,8 @@ static GList* new_cold_ids_gslist_from_array( const FolderCols* cols, guint col_
        return result;
 }
 
-GList * modest_init_get_default_header_view_column_ids (TnyFolderType folder_type, ModestHeaderViewStyle style)
+GList* 
+modest_init_get_default_header_view_column_ids (TnyFolderType folder_type, ModestHeaderViewStyle style)
 {
                GList *result = NULL;
                
@@ -203,7 +204,6 @@ modest_init_init_core (void)
                return FALSE;
        }
 
-       /* based on the debug settings, we decide whether to overwrite old settings */
        reset = modest_runtime_get_debug_flags () & MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS;
        if (!init_header_columns(modest_runtime_get_conf(), reset)) {
                modest_init_uninit ();
@@ -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