sync with sylpheed 0.7.2cvs17
authorPaul Mangan <paul@claws-mail.org>
Tue, 26 Feb 2002 09:00:33 +0000 (09:00 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 26 Feb 2002 09:00:33 +0000 (09:00 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/filesel.c
src/foldersel.c
src/mainwindow.c
src/mh.c

index 99c52b5c6b1bbfa229f30be8c9347e3022d5bfdc..85dafa8b6f5dd559c521419bbf180746d4786f2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-02-26
+
+       * src/filesel.c
+         src/foldersel.c
+         src/mainwindow.c: set WMCLASS for window/dialog.
+
+2002-02-25
+
+       * src/mh.c: mh_scan_tree_recursive(): changed the hardcoded directory
+         name to the macros.
+
 2002-02-24
 
        * src/messageview.c
index d9c1410cf309cde92f72e673402832f76d7f47ca..1c341efcfb40db35c2f49ecf6ae3f1b0cbb90eba 100644 (file)
@@ -1,4 +1,9 @@
-2002-02-15 [christoph] 0.7.2claws14
+2002-02-26 [paul]      0.7.2claws15
+
+       * sync with sylpheed 0.7.2cvs17
+               see ChangeLog entries 2002-02-25 and 2002-02-26
+
+2002-02-25 [christoph] 0.7.2claws14
 
        * src/filtering.[ch]
        * src/inc.c
index 31ee8c487f2da72a8176fc41564c0801a3babd4b..4ddb20b45485e77d0fad641d21111c6446b8298d 100644 (file)
@@ -1,3 +1,14 @@
+2002-02-26
+
+       * src/filesel.c
+         src/foldersel.c
+         src/mainwindow.c: ¥¦¥£¥ó¥É¥¦/¥À¥¤¥¢¥í¥°¤Î WMCLASS ¤ò¥»¥Ã¥È¡£
+
+2002-02-25
+
+       * src/mh.c: mh_scan_tree_recursive(): ¥Ï¡¼¥É¥³¡¼¥É¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê
+         Ì¾¤ò¥Þ¥¯¥í¤ËÊѹ¹¡£
+
 2002-02-24
 
        * src/messageview.c
index ab850ff18ccc2321b136745d57173fcad7bc4c64..968f28a05319d4fe33bc7c55752e173a13e4aedd 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws14
+EXTRA_VERSION=claws15
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index f09ec9d9046d8f10f7b2b0d7253a087013bcdf35..6422402d68bc30da170be9554e3c6a45f9282da6 100644 (file)
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkfilesel.h>
+#include <gtk/gtkentry.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkeditable.h>
-#include <gtk/gtkentry.h>
 
 #include "main.h"
 #include "filesel.h"
@@ -164,6 +164,11 @@ GList *filesel_select_multiple_files(const gchar *title, const gchar *file)
 static void filesel_create(const gchar *title, gboolean multiple_files)
 {
        filesel = gtk_file_selection_new(title);
+       gtk_window_set_position(GTK_WINDOW(filesel), GTK_WIN_POS_CENTER);
+       gtk_window_set_modal(GTK_WINDOW(filesel), TRUE);
+       gtk_window_set_wmclass
+               (GTK_WINDOW(filesel), "file_selection", "Sylpheed");
+
        gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button),
                           "clicked", GTK_SIGNAL_FUNC(filesel_ok_cb),
                           NULL);
@@ -177,8 +182,6 @@ static void filesel_create(const gchar *title, gboolean multiple_files)
                           GTK_SIGNAL_FUNC(key_pressed), NULL);
        MANAGE_WINDOW_SIGNALS_CONNECT(filesel);
 
-       gtk_window_set_modal(GTK_WINDOW(filesel), TRUE);
-
        if (multiple_files) {
                gtk_clist_set_selection_mode
                        (GTK_CLIST(GTK_FILE_SELECTION(filesel)->file_list),
index 8aa51726b8086e3d31823643a63821d5056844e2..b27f31275658d3075d312ade60e94c1415abec54 100644 (file)
@@ -145,6 +145,8 @@ static void foldersel_create(void)
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
+       gtk_window_set_wmclass
+               (GTK_WINDOW(window), "folder_selection", "Sylpheed");
        gtk_signal_connect(GTK_OBJECT(window), "delete_event",
                           GTK_SIGNAL_FUNC(delete_event), NULL);
        gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
index 5a03f78dbdc290ba1ceb5188d3c6889ecbef872d..2ef1a42dd6d9341a4b056f3e79b8b6b97b0562ec 100644 (file)
@@ -764,6 +764,7 @@ MainWindow *main_window_create(SeparateType type)
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);
        gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
+       gtk_window_set_wmclass(GTK_WINDOW(window), "main_window", "Sylpheed");
        gtk_signal_connect(GTK_OBJECT(window), "delete_event",
                           GTK_SIGNAL_FUNC(main_window_close_cb), mainwin);
        MANAGE_WINDOW_SIGNALS_CONNECT(window);
index 63e996fd6f51411c21dca78cd264df806c82eb2d..f2bb0fb41101dff66b03081f37eefdfe82bfaf4e 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -1142,19 +1142,19 @@ static void mh_scan_tree_recursive(FolderItem *item, GHashTable *pptable)
                        new_item = folder_item_new(d->d_name, entry);
                        folder_item_append(item, new_item);
                        if (!item->path) {
-                               if (!strcmp(d->d_name, "inbox")) {
+                               if (!strcmp(d->d_name, INBOX_DIR)) {
                                        new_item->stype = F_INBOX;
                                        item->folder->inbox = new_item;
-                               } else if (!strcmp(d->d_name, "outbox")) {
+                               } else if (!strcmp(d->d_name, OUTBOX_DIR)) {
                                        new_item->stype = F_OUTBOX;
                                        item->folder->outbox = new_item;
-                               } else if (!strcmp(d->d_name, "draft")) {
+                               } else if (!strcmp(d->d_name, DRAFT_DIR)) {
                                        new_item->stype = F_DRAFT;
                                        item->folder->draft = new_item;
-                               } else if (!strcmp(d->d_name, "queue")) {
+                               } else if (!strcmp(d->d_name, QUEUE_DIR)) {
                                        new_item->stype = F_QUEUE;
                                        item->folder->queue = new_item;
-                               } else if (!strcmp(d->d_name, "trash")) {
+                               } else if (!strcmp(d->d_name, TRASH_DIR)) {
                                        new_item->stype = F_TRASH;
                                        item->folder->trash = new_item;
                                }