X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-runtime.h;h=dbe2460c37a3f61d0b6fac96f9102a90788016d3;hp=eade560679606596a20f2394cd4174e1e4aff97e;hb=b3e33b42465084b4e1cf2dbf90302bd1b43d05ad;hpb=7b9c42bc690092373ab9e35d4848fc85635dd100

diff --git a/src/modest-runtime.h b/src/modest-runtime.h
index eade560..dbe2460 100644
--- a/src/modest-runtime.h
+++ b/src/modest-runtime.h
@@ -35,9 +35,11 @@
 #include <modest-conf.h>
 #include <modest-account-mgr.h>
 #include <modest-cache-mgr.h>
+#include <modest-email-clipboard.h>
 #include <modest-mail-operation-queue.h>
 #include <modest-tny-account-store.h>
 #include <modest-tny-send-queue.h>
+#include <modest-signal-mgr.h>
 #include <tny-platform-factory.h>
 #include "widgets/modest-window-mgr.h"
 
@@ -50,8 +52,7 @@ typedef enum {
 	MODEST_RUNTIME_DEBUG_LOG_ACTIONS           = 1 << 1, /* not in use atm */
 	MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS         = 1 << 2, /* for g_type_init */
 	MODEST_RUNTIME_DEBUG_DEBUG_SIGNALS         = 1 << 3, /* for g_type_init */
-	MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS      = 1 << 4, /* reset to factory defaults */
-	MODEST_RUNTIME_DEBUG_TINY_TEST_ACCOUNTS    = 1 << 5
+	MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS      = 1 << 4  /* reset to factory defaults */
 } ModestRuntimeDebugFlags;
 
 /**
@@ -68,18 +69,6 @@ gboolean modest_runtime_init (void);
 
 
 /**
- * modest_runtime_init_ui:
- * @argc: the #argc argument to the main function
- * @argv: the #argv argument to the main function
- * 
- * initialize the modest UI; this replaces the call to
- * gtk_init
- *  
- * TRUE if this succeeded, FALSE otherwise.
- */
-gboolean modest_runtime_init_ui (gint argc, gchar** argv);
-
-/**
  * modest_runtime_uinit:
  *
  * uninitialize the modest runtime system; free all the
@@ -88,7 +77,6 @@ gboolean modest_runtime_init_ui (gint argc, gchar** argv);
  * TRUE if this succeeded, FALSE otherwise
  */
 gboolean modest_runtime_uninit (void);
-
 	
 
 /**
@@ -133,6 +121,15 @@ ModestConf*         modest_runtime_get_conf   (void);
 ModestAccountMgr*         modest_runtime_get_account_mgr   (void);
 
 /**
+ * modest_runtime_get_email_clipboard:
+ * 
+ * get the #ModestEmailClipboard singleton instance
+ * 
+ * Returns: the #ModestEamilClipboard singleton. This should NOT be unref'd.
+ **/
+ModestEmailClipboard*     modest_runtime_get_email_clipboard   (void);
+
+/**
  * modest_runtime_get_account_store:
  * 
  * get the ModestTnyAccountStore singleton instance
@@ -196,6 +193,13 @@ ModestMailOperationQueue* modest_runtime_get_mail_operation_queue (void);
  **/
 ModestTnySendQueue* modest_runtime_get_send_queue        (TnyTransportAccount *account);
 
+/**
+ * modest_runtime_remove_all_send_queues:
+ * 
+ * Removes all send queues, ready for them to be recreated, for instance 
+ * with a new connection.
+ **/
+void modest_runtime_remove_all_send_queues ();
 
 /**
  * modest_runtime_get_window_mgr:
@@ -207,22 +211,24 @@ ModestTnySendQueue* modest_runtime_get_send_queue        (TnyTransportAccount *a
 ModestWindowMgr* modest_runtime_get_window_mgr (void);
 
 /**
- * modest_runtime_verify_object_death
+ * modest_runtime_verify_object_last_ref
  * @OBJ: some (GObject) ptr
  * @NAME: name of @OBJ
  * 
- * macro to check whether @obj is 'dead', ie, it is no longer a valid GObject. If
+ * macro to check whether @obj holds only one more ref (ie. after the
+ * next unref it will die)
+ * 
  * not, a g_warning will be issued on stderr. NOTE: this is only active
  * when MODEST_DEBUG contains "debug-objects".
  *
  ***/
-#define modest_runtime_verify_object_death(OBJ,name)			\
-	do {								\
-		if (modest_runtime_get_debug_flags() & MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS) \
-			if (G_IS_OBJECT(OBJ))				\
-				g_warning ("%s:%d: %s ("	\
-					   #OBJ ") still holds a ref count of %d", \
-					   __FILE__,__LINE__,name, G_OBJECT(OBJ)->ref_count); \
+#define modest_runtime_verify_object_last_ref(OBJ,name)			                               \
+	do {								                               \
+		if (modest_runtime_get_debug_flags() & MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS)             \
+			if (G_IS_OBJECT(OBJ) && G_OBJECT(OBJ)->ref_count != 1)			       \
+				g_warning ("%s:%d: %s ("	                                       \
+					   #OBJ ") still holds a ref count of %d",                     \
+					   __FILE__,__LINE__,name, G_OBJECT(OBJ)->ref_count);          \
 	} while (0)