0.9.0claws20

* src/Makefile.am
* src/crash.c
* src/export.c
* src/filesel.[ch]              ** REMOVE **
* src/folder.c
* src/main.[ch]
* src/common/sylpheed.[ch]
* src/gtk/Makefile.am
* src/gtk/filesel.[ch]          ** NEW **
* src/gtk/pluginwindow.c
* src/gtk/sslcertwindow.c
        move filesel.[ch] to gtk directory

diff --git a/ChangeLog.claws b/ChangeLog.claws
index cb4cffceb2cb1dc9923b5be21035cd3002cfa195..77143f67e1557e7d2277d69ff7777db4fc6d64ec 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,18 @@
+2003-06-07 [christoph] 0.9.0claws20
+
+       * src/Makefile.am
+       * src/crash.c
+       * src/export.c
+       * src/filesel.[ch]              ** REMOVE **
+       * src/folder.c
+       * src/main.[ch]
+       * src/common/sylpheed.[ch]
+       * src/gtk/Makefile.am
+       * src/gtk/filesel.[ch]          ** NEW **
+       * src/gtk/pluginwindow.c
+       * src/gtk/sslcertwindow.c
+               move filesel.[ch] to gtk directory
+
 2003-06-07 [alfons]    0.9.0claws19
 
        * src/filesel.c

diff --git a/configure.ac b/configure.ac
index 42585dcd48908b3f1101182047f5488ccc6b765c..e2911f3c6da1e292aede7e9501fe726b8b5c2909 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws19
+EXTRA_VERSION=claws20
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/doc/src/ui_seperation.txt b/doc/src/ui_seperation.txt
index 4f3b9ccd954c72868a02052b79fdb4f28070c6c9..d00a02a4478f9a77c6d151d26443c37b87bfc3b7 100644 (file)
--- a/doc/src/ui_seperation.txt
+++ b/doc/src/ui_seperation.txt
@@ -48,3 +48,5 @@ gtkutils.[ch]         gtk/gtkutils.[ch]       ok
 about.[ch]             gtk/about.[ch]          ok
 
 colorlabel.[ch]                gtk/colorlabel.[ch]     ok
+
+filesel.[ch]           gtk/filesel.[ch]        ok

diff --git a/src/Makefile.am b/src/Makefile.am
index 9b15e03d36a95fd65600bdfe18d9575a0f154713..4501133a8c7189925e5699c31759951150ff115e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,7 +62,6 @@ sylpheed_SOURCES = \
        addrgather.c addrgather.h \
        exporthtml.c exporthtml.h \
        exphtmldlg.c exphtmldlg.h \
-       filesel.c filesel.h \
        foldersel.c foldersel.h \
        statusbar.c statusbar.h \
        logwindow.c logwindow.h \

diff --git a/src/common/sylpheed.c b/src/common/sylpheed.c
index da8b1426c5031ceea0cd3df68e038e179254f955..716e09e9c2d68cc2bbc9400f2e1e5f58cee6b6f0 100644 (file)
--- a/src/common/sylpheed.c
+++ b/src/common/sylpheed.c
@@ -36,6 +36,7 @@
 #include "plugin.h"
 
 static gboolean sylpheed_initialized = FALSE;
+static gchar *startup_dir;
 
 /**
  * Parse program parameters and remove all parameters
@@ -84,6 +85,8 @@ gboolean sylpheed_init(int *argc, char ***argv)
        if (sylpheed_initialized)
                return TRUE;
 
+       startup_dir = g_get_current_dir();
+
        parse_parameter(argc, argv);
 
        setlocale(LC_ALL, "");
@@ -119,3 +122,8 @@ void sylpheed_done()
        ssl_done();
 #endif
 }
+
+const gchar *sylpheed_get_startup_dir()
+{
+       return startup_dir;
+}

diff --git a/src/common/sylpheed.h b/src/common/sylpheed.h
index ffb927d8c79de87b9a74a7555dabee15090f6c8d..bf95d5c46a65e5e32d928fed288d18837f4b1d7d 100644 (file)
--- a/src/common/sylpheed.h
+++ b/src/common/sylpheed.h
@@ -17,5 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-gboolean sylpheed_init (int *argc, char ***argv);
-void sylpheed_done     ();
+gboolean sylpheed_init                 (int *argc, char ***argv);
+void sylpheed_done                     ();
+const gchar *sylpheed_get_startup_dir  ();

diff --git a/src/crash.c b/src/crash.c
index e33915dfc29b8273fa97ea1262821f75aed49cfe..f4928557a1bae831d68cb1a685dbbd93a52c990e 100644 (file)
--- a/src/crash.c
+++ b/src/crash.c
@@ -490,10 +490,9 @@ static void crash_handler(int sig)
        static volatile unsigned long crashed_ = 0;
 
        /*
-        * let's hope startup_dir and argv0 aren't trashed.
+        * let's hope argv0 aren't trashed.
         * both are defined in main.c.
         */
-       extern gchar *startup_dir;
        extern gchar *argv0;
 
 
@@ -533,7 +532,7 @@ static void crash_handler(int sig)
                args[3] = buf;
                args[4] = NULL;
 
-               chdir(startup_dir);
+               chdir(sylpheed_get_startup_dir());
                setgid(getgid());
                setuid(getuid());
                execvp(argv0, args);

diff --git a/src/export.c b/src/export.c
index 0f7f8d658749c74407559540864d7390da1a9318..a0886c6a4bb1e98c363f82b967abb26d03231f2a 100644 (file)
--- a/src/export.c
+++ b/src/export.c
@@ -38,6 +38,7 @@
 #include <gtk/gtksignal.h>
 
 #include "intl.h"
+#include "sylpheed.h"
 #include "main.h"
 #include "inc.h"
 #include "mbox.h"
@@ -75,7 +76,7 @@ gint export_mbox(FolderItem *default_src)
        else
                gtk_widget_show(window);
 
-       change_dir(startup_dir);
+       change_dir(sylpheed_get_startup_dir());
 
        if (default_src && default_src->path)
                src_id = folder_item_get_identifier(default_src);

diff --git a/src/folder.c b/src/folder.c
index f1432926f3349a9619992319ee66e95f16095981..701156d93f5004b748c2e4167a5275c81dcdf799 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -1271,6 +1271,21 @@ gint folder_item_scan(FolderItem *item)
        return 0;
 }
 
+static gboolean folder_scan_all_items_func(GNode *node, gpointer data)
+{
+       FolderItem *item = node->data;
+
+       folder_item_scan(item);
+
+       return FALSE;
+}
+
+void folder_scan_all_items(Folder * folder)
+{
+       g_node_traverse(folder->node, G_PRE_ORDER,
+                       G_TRAVERSE_ALL, -1, folder_scan_all_items_func, NULL);
+}
+
 static void folder_item_scan_foreach_func(gpointer key, gpointer val,
                                          gpointer data)
 {

diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
index ba395c5067bd132ff4c21d8e2a7a0fba58ce7846..5e41bfc0869e3f24f73f7839613ecc43ed943170 100644 (file)
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@ -4,6 +4,7 @@ libsylpheedgtk_la_SOURCES = \
        about.c about.h \
        colorlabel.c colorlabel.h \
        description_window.c description_window.h \
+       filesel.c filesel.h \
        gtkutils.c gtkutils.h \
        gtkshruler.c gtkshruler.h \
        gtksctree.c gtksctree.h \

diff --git a/src/filesel.c b/src/gtk/filesel.c
similarity index 98%
rename from src/filesel.c
rename to src/gtk/filesel.c
index 13d32c93861ffa2b8e9b32fca5da1cf301ab9411..e4af38f8e5a7d8dcfef8142a4b960281a88a9cb2 100644 (file)
--- a/src/filesel.c
+++ b/src/gtk/filesel.c
@@ -26,7 +26,7 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkeditable.h>
 
-#include "main.h"
+#include "sylpheed.h"
 #include "filesel.h"
 #include "manage_window.h"
 #include "gtkutils.h"
@@ -70,7 +70,7 @@ gchar *filesel_select_file(const gchar *title, const gchar *file)
        }
 
        if (!cwd)
-               cwd = g_strconcat(startup_dir, G_DIR_SEPARATOR_S, NULL);
+               cwd = g_strconcat(sylpheed_get_startup_dir(), G_DIR_SEPARATOR_S, NULL);
 
        gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), cwd);
 
@@ -133,7 +133,7 @@ GList *filesel_select_multiple_files(const gchar *title, const gchar *file)
        }
 
        if (!cwd)
-               cwd = g_strconcat(startup_dir, G_DIR_SEPARATOR_S, NULL);
+               cwd = g_strconcat(sylpheed_get_startup_dir(), G_DIR_SEPARATOR_S, NULL);
 
        gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), cwd);
 

diff --git a/src/filesel.h b/src/gtk/filesel.h
similarity index 100%
rename from src/filesel.h
rename to src/gtk/filesel.h

diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
index a17bc6437a5a6e63a046b12cdf297fc26f9efbb5..10dcab240b243b347c6755c29a38ff4a6c59a072 100644 (file)
--- a/src/gtk/pluginwindow.c
+++ b/src/gtk/pluginwindow.c
@@ -28,8 +28,8 @@
 #include "intl.h"
 #include "plugin.h"
 
-#include "../filesel.h"
-#include "../alertpanel.h"
+#include "filesel.h"
+#include "alertpanel.h"
 
 typedef struct _PluginWindow
 {

diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
index ec6c5823fbc222b5481d58dd7ebac1346e8c03ad..ab444e77e35f3bb6df3ee8740532d4c7d663757f 100644 (file)
--- a/src/gtk/sslcertwindow.c
+++ b/src/gtk/sslcertwindow.c
@@ -29,7 +29,7 @@
 #include "intl.h"
 #include "ssl_certificate.h"
 #include "utils.h"
-#include "../alertpanel.h"
+#include "alertpanel.h"
 #include "hooks.h"
 
 static void toggle_cert_cb(GtkWidget   *widget,

diff --git a/src/main.c b/src/main.c
index b956aa3b4abb92166c3d38a916f6cdca77dcaeae..4ad6e9359484552943a7f439a23617fd18c4bc4e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -83,7 +83,6 @@
 #include "crash.h"
 
 gchar *prog_version;
-gchar *startup_dir;
 #ifdef CRASH_DIALOG
 gchar *argv0;
 #endif
@@ -169,7 +168,6 @@ int main(int argc, char *argv[])
        }
 
        prog_version = PROG_VERSION;
-       startup_dir = g_get_current_dir();
 #ifdef CRASH_DIALOG
        argv0 = g_strdup(argv[0]);
 #endif
@@ -403,7 +401,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                                if (!cmd.attach_files)
                                        cmd.attach_files = g_ptr_array_new();
                                if (*p != G_DIR_SEPARATOR)
-                                       file = g_strconcat(startup_dir,
+                                       file = g_strconcat(sylpheed_get_startup_dir(),
                                                           G_DIR_SEPARATOR_S,
                                                           p, NULL);
                                else

diff --git a/src/main.h b/src/main.h
index 3e07b17e3881baa35689721b57396df153e3b55f..3728c0991875317c6d62d5a63ac4667f63256ad4 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -24,7 +24,6 @@
 #include <gtk/gtkwidget.h>
 
 extern gchar *prog_version;
-extern gchar *startup_dir;
 extern gboolean debug_mode;
 
 void app_will_exit     (GtkWidget *widget, gpointer data);