sync with 0.8.8cvs5

[claws.git] / src / about.c

diff --git a/src/about.c b/src/about.c
index 60c3888459670e97e97e5720217615830b32535a..d1c817e842c76e67d00c55c24a1366c92936d8a0 100644 (file)
--- a/src/about.c
+++ b/src/about.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 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
@@ -30,7 +30,6 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkhbox.h>
-#include <gtk/gtkpixmap.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkhseparator.h>
 #include <gtk/gtkscrolledwindow.h>
@@ -43,10 +42,10 @@
 #include "intl.h"
 #include "about.h"
 #include "gtkutils.h"
+#include "stock_pixmap.h"
 #include "prefs_common.h"
 #include "utils.h"
-
-#include "pixmaps/sylpheed-logo.xpm"
+#include "version.h"
 
 static GtkWidget *window;
 
@@ -58,15 +57,15 @@ void about_show(void)
 {
        if (!window)
                about_create();
-       else
+       else {
+               gtk_widget_hide(window);
                gtk_widget_show(window);
+       }
 }
 
 static void about_create(void)
 {
        GtkWidget *vbox;
-       GdkPixmap *logoxpm = NULL;
-       GdkBitmap *logoxpmmask;
        GtkWidget *pixmap;
        GtkWidget *label;
        GtkWidget *hbox;
@@ -79,10 +78,10 @@ static void about_create(void)
        GdkColormap *cmap;
        GdkColor uri_color[2] = {{0, 0, 0, 0xffff}, {0, 0xffff, 0, 0}};
        gboolean success[2];
-       
+
 #if HAVE_SYS_UTSNAME_H
        struct utsname utsbuf;
-#endif 
+#endif
        gchar buf[1024];
        gint i;
 
@@ -91,7 +90,6 @@ static void about_create(void)
        gtk_container_set_border_width(GTK_CONTAINER(window), 8);
        gtk_widget_set_usize(window, 518, 358);
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       /* gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE); */
        gtk_signal_connect(GTK_OBJECT(window), "delete_event",
                           GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete), NULL);
        gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
@@ -101,13 +99,12 @@ static void about_create(void)
        vbox = gtk_vbox_new(FALSE, 6);
        gtk_container_add(GTK_CONTAINER(window), vbox);
 
-       PIXMAP_CREATE(window, logoxpm, logoxpmmask, sylpheed_logo_xpm);
-       pixmap = gtk_pixmap_new(logoxpm, logoxpmmask);
+       pixmap = stock_pixmap_widget(window, STOCK_PIXMAP_SYLPHEED_LOGO);
        gtk_box_pack_start(GTK_BOX(vbox), pixmap, FALSE, FALSE, 0);
 
        label = gtk_label_new("version "VERSION);
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-       
+
 #if HAVE_SYS_UTSNAME_H
        uname(&utsbuf);
        g_snprintf(buf, sizeof(buf),
@@ -139,14 +136,26 @@ static void about_create(void)
 #if INET6
                   " IPv6"
 #endif
-#if HAVE_LIBCOMPFACE
-                  " libcompface"
+#if HAVE_ICONV
+                  " iconv"
 #endif
-#if HAVE_LIBJCONV
-                  " libjconv"
+#if HAVE_LIBCOMPFACE
+                  " compface"
 #endif
 #if USE_GPGME
-                  " GPGME"
+                  " GnuPG"
+#endif
+#if USE_OPENSSL
+                  " OpenSSL"
+#endif
+#if USE_LDAP
+                  " LDAP"
+#endif
+#if USE_JPILOT
+                  " JPilot"
+#endif
+#if USE_ASPELL
+                  " GNU/aspell"
 #endif
        "");
 
@@ -154,7 +163,7 @@ static void about_create(void)
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
        label = gtk_label_new
-               ("Copyright (C) 1999-2001 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>");
+               ("Copyright (C) 1999-2002 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>");
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
        hbox = gtk_hbox_new(FALSE, 0);
@@ -196,16 +205,6 @@ static void about_create(void)
 
        gtk_text_freeze(GTK_TEXT(text));
 
-       gtk_text_insert(GTK_TEXT(text), NULL, NULL, NULL,
-               _("The portions applied from fetchmail is Copyright 1997 by Eric S. "
-                 "Raymond.  Portions of those are also copyrighted by Carl Harris, "
-                 "1993 and 1995.  Copyright retained for the purpose of protecting free "
-                 "redistribution of source.\n\n"), -1);
-
-       gtk_text_insert(GTK_TEXT(text), NULL, NULL, NULL,
-               _("Kcc is copyright by Yasuhiro Tonooka <tonooka@msi.co.jp>, "
-                 "and libkcc is copyright by takeshi@SoftAgency.co.jp.\n\n"), -1);
-
 #if USE_GPGME
        gtk_text_insert(GTK_TEXT(text), NULL, NULL, NULL,
                _("GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>\n\n"), -1);