2006-12-13 [colin] 2.6.1cvs26

	* src/main.c
	* src/main.h
		Add claws_is_starting()

diff --git a/ChangeLog b/ChangeLog
index d3d1af7c34c50d5eb8b957d205f63caf088b6cb2..b8fa836a56c753ffc2c6ac417fc16d19dc98b1ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-13 [colin]     2.6.1cvs26
+
+       * src/main.c
+       * src/main.h
+               Add claws_is_starting()
+
 2006-12-13 [mones]     2.6.1cvs25
 
        * manual/es/advanced.xml

diff --git a/PATCHSETS b/PATCHSETS
index a8f6cb33b90e5d67e854b58b7a07d5344c0c03e0..8f0d089f5287fb4ebbce8e73954dd36514ac8578 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2133,3 +2133,4 @@
 ( cvs diff -u -r 1.115.2.116 -r 1.115.2.117 src/main.c;  ) > 2.6.1cvs23.patchset
 ( cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/wizard.c;  ) > 2.6.1cvs24.patchset
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 manual/es/advanced.xml;  cvs diff -u -r 1.60.2.38 -r 1.60.2.39 po/es.po;  ) > 2.6.1cvs25.patchset
+( cvs diff -u -r 1.115.2.117 -r 1.115.2.118 src/main.c;  cvs diff -u -r 1.7.2.6 -r 1.7.2.7 src/main.h;  ) > 2.6.1cvs26.patchset

diff --git a/configure.ac b/configure.ac
index 6cffda6ceb0597006cb353be6bbcf6c674c41ca4..b24f1a51da00da44c6cb2daf63dfc54a627c76c4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=25
+EXTRA_VERSION=26
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index 0f957b7998ef67cd530a25cb88f335e5fa353a4c..0c98552c2bf8353624953617a676b5e137b704af 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -501,6 +501,9 @@ static void sc_session_manager_connect(MainWindow *mainwin)
 }
 #endif
 
+static gboolean sc_exiting = FALSE;
+static gboolean sc_starting = FALSE;
+
 int main(int argc, char *argv[])
 {
        gchar *userrc;
@@ -511,6 +514,8 @@ int main(int argc, char *argv[])
        gint num_folder_class = 0;
        START_TIMING("startup");
        
+       sc_starting = TRUE;
+
        if (!claws_init(&argc, &argv)) {
                return 0;
        }
@@ -873,7 +878,10 @@ int main(int argc, char *argv[])
        }
 
        prefs_destroy_cache();
+       
+       sc_starting = FALSE;
        END_TIMING();
+       
        gtk_main();
 
        exit_claws(mainwin);
@@ -893,8 +901,6 @@ static void save_all_caches(FolderItem *item, gpointer data)
        folder_item_free_cache(item, TRUE);
 }
 
-static gboolean sc_exiting = FALSE;
-
 static void exit_claws(MainWindow *mainwin)
 {
        gchar *filename;
@@ -1256,6 +1262,11 @@ gboolean claws_is_exiting(void)
        return sc_exiting;
 }
 
+gboolean claws_is_starting(void)
+{
+       return sc_starting;
+}
+
 /*
  * CLAWS: want this public so crash dialog can delete the
  * lock file too

diff --git a/src/main.h b/src/main.h
index e68c3bfbdd8104d209c7255b6f0d968b2f131f5e..9ff2101a0934ad15a995a09dd3fd518cf9b1346a 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -29,5 +29,5 @@ extern gboolean debug_mode;
 void app_will_exit     (GtkWidget *widget, gpointer data);
 gboolean clean_quit    (gpointer data);
 gboolean claws_is_exiting(void);
-
+gboolean claws_is_starting(void);
 #endif /* __MAIN_H__ */