* remove the modest-debug stuff; it belong in modest-runtime

pmo-trunk-r1690

diff --git a/src/modest-init.c b/src/modest-init.c
index d8819a6..e6d695c 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -400,14 +400,14 @@ static void
 init_debug_g_type (void)
 {
        GTypeDebugFlags gflags;
-       ModestInitDebugFlags mflags;
+       ModestRuntimeDebugFlags mflags;
        
        gflags = 0;
        mflags = modest_runtime_get_debug_flags ();
 
-       if (mflags & MODEST_INIT_DEBUG_DEBUG_OBJECTS)
+       if (mflags & MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS)
                gflags |= G_TYPE_DEBUG_OBJECTS;
-       if (mflags & MODEST_INIT_DEBUG_DEBUG_SIGNALS)
+       if (mflags & MODEST_RUNTIME_DEBUG_DEBUG_SIGNALS)
                gflags |= G_TYPE_DEBUG_SIGNALS;
 
        g_type_init_with_debug_flags (gflags);
@@ -416,10 +416,10 @@ init_debug_g_type (void)
 static void
 init_debug_logging (void)
 {
-       ModestInitDebugFlags mflags;
+       ModestRuntimeDebugFlags mflags;
        mflags = modest_runtime_get_debug_flags ();
        
-       if (mflags & MODEST_INIT_DEBUG_ABORT_ON_WARNING)
+       if (mflags & MODEST_RUNTIME_DEBUG_ABORT_ON_WARNING)
                g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
                                        G_LOG_LEVEL_CRITICAL |
                                        G_LOG_LEVEL_WARNING);

diff --git a/src/modest-init.h b/src/modest-init.h
index 9fbd18c..acb2627 100644 (file)
--- a/src/modest-init.h
+++ b/src/modest-init.h
@@ -32,19 +32,10 @@
 
 #include <glib.h>
 #include <glib-object.h>
+#include <modest-runtime.h>
 
 G_BEGIN_DECLS
 
-#define MODEST_DEBUG "MODEST_DEBUG"
-
-typedef enum {
-       MODEST_INIT_DEBUG_ABORT_ON_WARNING      = 1 << 0,
-       MODEST_INIT_DEBUG_LOG_ACTIONS           = 1 << 1, /* not in use atm */
-       MODEST_INIT_DEBUG_DEBUG_OBJECTS         = 1 << 2, /* for g_type_init */
-       MODEST_INIT_DEBUG_DEBUG_SIGNALS         = 1 << 3, /* for g_type_init */
-       MODEST_INIT_DEBUG_FACTORY_SETTINGS      = 1 << 4  /* reset to factory defaults */
-} ModestInitDebugFlags;
-
 /**
  * modest_init_init_core:
  *