* po/POTFILES.in
authorPaul Mangan <paul@claws-mail.org>
Mon, 9 Aug 2004 06:27:55 +0000 (06:27 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 9 Aug 2004 06:27:55 +0000 (06:27 +0000)
reflect new location of sgpgme.c
* src/main.c
sync with main, see ChangeLog 2004-08-09

ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
po/POTFILES.in
src/main.c

index d50f7ae..75046b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-09
+
+       * src/main.c: removed parsing of "./gtkrc".
+
 2004-08-04
 
        * src/socket.c:
index 9dd5b88..d4e0dc4 100644 (file)
@@ -1,3 +1,10 @@
+2004-08-09 [paul]       0.9.12cvs54
+
+       * po/POTFILES.in
+               reflect new location of sgpgme.c
+       * src/main.c
+               sync with main, see ChangeLog 2004-08-09
+
 2004-08-08 [christoph] 0.9.12cvs53
 
        * src/folderutils.c
index 6f624bb..d70b88f 100644 (file)
@@ -1,3 +1,7 @@
+2004-08-09
+
+       * src/main.c: "./gtkrc" ¤ò¥Ñ¡¼¥¹¤·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+
 2004-08-04
 
        * src/socket.c:
index 5d356c4..fe36823 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=53
+EXTRA_VERSION=54
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
index 3142de9..cca1df1 100644 (file)
@@ -74,6 +74,7 @@ src/plugins/image_viewer/plugin.c
 src/plugins/image_viewer/viewer.c
 src/plugins/image_viewer/viewerprefs.c
 src/plugins/mathml_viewer/mathml_viewer.c
+src/plugins/pgpmime/sgpgme.c
 src/plugins/spamassassin/spamassassin.c
 src/plugins/spamassassin/spamassassin_gtk.c
 src/plugins/trayicon/trayicon.c
@@ -103,7 +104,6 @@ src/quote_fmt.c
 src/select-keys.c
 src/send_message.c
 src/setup.c
-src/sgpgme.c
 src/sourcewindow.c
 src/ssl_manager.c
 src/summary_search.c
index 4dcfc88..7a78821 100644 (file)
@@ -229,8 +229,6 @@ int main(int argc, char *argv[])
        gtk_rc_parse(userrc);
        g_free(userrc);
 
-       gtk_rc_parse("./gtkrc");
-
        userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL);
        gtk_item_factory_parse_rc(userrc);
        g_free(userrc);