2007-07-19 [paul] 2.10.0cvs46

[claws.git] / src / gtk / about.c

diff --git a/src/gtk/about.c b/src/gtk/about.c
index b1ff8f99a3a072f95d5a35d83ed210a6840d04c5..fee146813316961125c4f517a1385c58e029fd0e 100644 (file)
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -4,7 +4,7 @@
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -155,7 +155,11 @@ static GtkWidget *about_create_child_page_info(void)
        gtk_text_buffer_create_tag(buffer, "underlined-list-title",
                                "underline", PANGO_UNDERLINE_SINGLE,
                                NULL);
-
+#ifdef MAEMO
+       gtk_text_buffer_insert(buffer, &iter, _(
+                               "\n\nCopyright (C) 1999-2007\nHiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+                               "and the Claws Mail team"), -1);
+#endif
        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (_("\n\nSystem Information\n")), -1,
                        "underlined-list-title", NULL);
 
@@ -404,8 +408,8 @@ static GtkWidget *about_create_child_page_features(void)
        gtk_text_buffer_create_tag(buffer, "bold", "weight", PANGO_WEIGHT_BOLD,
                                   NULL);
 
-       stock_pixbuf_gdk(window, STOCK_PIXMAP_ACTIVE, &active_pixbuf);
-       stock_pixbuf_gdk(window, STOCK_PIXMAP_INACTIVE, &inactive_pixbuf);
+       stock_pixbuf_gdk(window, STOCK_PIXMAP_CHECKBOX_ON, &active_pixbuf);
+       stock_pixbuf_gdk(window, STOCK_PIXMAP_CHECKBOX_OFF, &inactive_pixbuf);
 
 #if INET6
        gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
@@ -540,7 +544,7 @@ static GtkWidget *about_create_child_page_license(void)
        gtk_text_buffer_insert(buffer, &iter,
                _("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 "
-                 "the Free Software Foundation; either version 2, or (at your option) "
+                 "the Free Software Foundation; either version 3, or (at your option) "
                  "any later version.\n\n"), -1);
 
        gtk_text_buffer_insert(buffer, &iter,
@@ -549,12 +553,6 @@ static GtkWidget *about_create_child_page_license(void)
                  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. "
                  "See the GNU General Public License for more details.\n\n"), -1);
 
-       gtk_text_buffer_insert(buffer, &iter,
-               _("You should have received a copy of the GNU General Public License "
-                 "along with this program; if not, write to the Free Software "
-                 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, "
-                 "MA 02110-1301, USA.\n\n"), -1);
-#ifdef USE_OPENSSL
        /* textview link style (based upon main prefs) */
        gtkut_convert_int_to_gdk_color(prefs_common.uri_col,
                        (GdkColor*)&uri_color);
@@ -567,6 +565,14 @@ static GtkWidget *about_create_child_page_license(void)
                "underline", PANGO_UNDERLINE_SINGLE,
                NULL);
 
+       gtk_text_buffer_insert(buffer, &iter,
+               _("You should have received a copy of the GNU General Public License "
+                 "along with this program. If not, see <"), -1);
+       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, 
+               "http://www.gnu.org/licenses/", -1,
+               "link", NULL);
+       gtk_text_buffer_insert(buffer, &iter, _(">. \n\n"), -1);
+#ifdef USE_OPENSSL
        gtk_text_buffer_insert(buffer, &iter,
                _("This product includes software developed by the OpenSSL Project "
                  "for use in the OpenSSL Toolkit ("), -1);
@@ -714,7 +720,7 @@ static void about_create(void)
 
        button = gtkut_get_link_btn(window, HOMEPAGE_URI, " "HOMEPAGE_URI" ");
        gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
-
+#ifndef MAEMO
        label = gtk_label_new
                (_("Copyright (C) 1999-2007\nHiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
                 "and the Claws Mail team"));
@@ -722,7 +728,7 @@ static void about_create(void)
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
        gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 0);
-
+#endif
        notebook = gtk_notebook_new();
        gtk_widget_set_size_request(notebook, -1, 220);
        gtk_widget_show(notebook);