sync with 0.8.10cvs19
authorPaul Mangan <paul@claws-mail.org>
Fri, 28 Feb 2003 07:27:13 +0000 (07:27 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 28 Feb 2003 07:27:13 +0000 (07:27 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/main.c

index 47884ce9672c3e6fa290590ad31ad2771d12205e..ad3ee267c0603bcd6decc5c4c94e34d0f0250b51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-28
+
+       * src/main.c: main(): remove lock socket if sylpheed is not running
+         when --status command is executed.
+         lock_socket_remove(): new.
+
 2003-02-27
 
        * src/codeconv.c: conv_codeset_strdup(): don't convert if current
 2003-02-27
 
        * src/codeconv.c: conv_codeset_strdup(): don't convert if current
index 4a763ac996012e9a7f1a626570c09c1b8b0095a3..517b367e62e1de8b9f7c19df7dfb74816d6a7e5a 100644 (file)
@@ -1,3 +1,8 @@
+2003-02-28 [paul]      0.8.10claws58
+
+       * sync with 0.8.10cvs19
+               see ChangeLog 2003-02-28
+
 2003-02-27 [martin]    0.8.10claws57
 
        * src/prefs_matcher.c 
 2003-02-27 [martin]    0.8.10claws57
 
        * src/prefs_matcher.c 
index 2c019b25a488aac6cc8bd36c9ecbbf50b1cbed29..3a62af26b4ad10ca5d2f12a24826aa384f9f7c02 100644 (file)
@@ -1,3 +1,9 @@
+2003-02-28
+
+       * src/main.c: main(): --status ¥³¥Þ¥ó¥É¤¬¼Â¹Ô¤µ¤ì¤¿»þ¤Ë sylpheed
+         ¤¬µ¯Æ°¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¥í¥Ã¥¯¥½¥±¥Ã¥È¤òºï½ü¡£
+         lock_socket_remove(): ¿·µ¬¡£
+
 2003-02-27
 
        * src/codeconv.c: conv_codeset_strdup(): ¸½ºß¤Î¥³¡¼¥É¥»¥Ã¥È¤¬
 2003-02-27
 
        * src/codeconv.c: conv_codeset_strdup(): ¸½ºß¤Î¥³¡¼¥É¥»¥Ã¥È¤¬
index cf0eedd5afc29db3da4c523f5cecb8b3ee2bb336..51fccb0b8bb323fc79e73432b9775bd3fc75a409 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws57
+EXTRA_VERSION=claws58
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 995905876e4d56de9df56cc6d2c404522228bf23..a2465c98492a064d2fbfdfd8dcad52e66287b514 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -100,8 +100,7 @@ typedef enum
        ONLINE_MODE_OFFLINE
 } OnlineMode;
 
        ONLINE_MODE_OFFLINE
 } OnlineMode;
 
-
-static struct Cmd {
+static struct RemoteCmd {
        gboolean receive;
        gboolean receive_all;
        gboolean compose;
        gboolean receive;
        gboolean receive_all;
        gboolean compose;
@@ -122,6 +121,7 @@ static void idle_function_for_gpgme(void);
 
 static gint prohibit_duplicate_launch  (void);
 static gchar * get_crashfile_name      (void);
 
 static gint prohibit_duplicate_launch  (void);
 static gchar * get_crashfile_name      (void);
+static gint lock_socket_remove         (void);
 static void lock_socket_input_cb       (gpointer          data,
                                         gint              source,
                                         GdkInputCondition condition);
 static void lock_socket_input_cb       (gpointer          data,
                                         gint              source,
                                         GdkInputCondition condition);
@@ -193,6 +193,7 @@ int main(int argc, char *argv[])
 
        if (cmd.status) {
                puts("0 Sylpheed not running.");
 
        if (cmd.status) {
                puts("0 Sylpheed not running.");
+               lock_socket_remove();
                return 0;
        }
 
                return 0;
        }
 
@@ -586,16 +587,12 @@ void app_will_exit(GtkWidget *widget, gpointer data)
 
        close_log_file();
 
 
        close_log_file();
 
-       /* delete unix domain socket */
-       gdk_input_remove(lock_socket_tag);
-       fd_close(lock_socket);
-       filename = get_socket_name();
-       unlink(filename);
-       
        /* delete crashfile */
        if (!cmd.crash)
                unlink(get_crashfile_name());
 
        /* delete crashfile */
        if (!cmd.crash)
                unlink(get_crashfile_name());
 
+       lock_socket_remove();
+
        gtk_main_quit();
 }
 
        gtk_main_quit();
 }
 
@@ -708,6 +705,21 @@ static gint prohibit_duplicate_launch(void)
        return -1;
 }
 
        return -1;
 }
 
+static gint lock_socket_remove(void)
+{
+       gchar *filename;
+
+       if (lock_socket < 0) return -1;
+
+       if (lock_socket_tag > 0)
+               gdk_input_remove(lock_socket_tag);
+       fd_close(lock_socket);
+       filename = get_socket_name();
+       unlink(filename);
+
+       return 0;
+}
+
 static void lock_socket_input_cb(gpointer data,
                                 gint source,
                                 GdkInputCondition condition)
 static void lock_socket_input_cb(gpointer data,
                                 gint source,
                                 GdkInputCondition condition)