[Gpa-commits] r863 - trunk/src

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Thu Mar 27 03:12:21 CET 2008


Author: marcus
Date: 2008-03-27 03:12:20 +0100 (Thu, 27 Mar 2008)
New Revision: 863

Modified:
   trunk/src/ChangeLog
   trunk/src/helpmenu.c
   trunk/src/helpmenu.h
Log:
2008-03-27  Marcus Brinkmann  <marcus at g10code.de>

	* helpmenu.c: Convert file encoding to UTF-8.
	(help_about): Rewritten to use stock gtk about dialog.
	(about_dialog, scroll_text, SCROLLING, DIM, shuffle_array)
	(do_scrolling, scroll_state, scroll_offset, scroll_text_widths)
	(scroll_area, scroll_pixmap, cur_scroll_text, cur_scroll_index)
	(timer, help_license, about_dialog_unmap, about_dialog_destroy)
	(about_dialog_button, about_dialog_timer, help_license_destroy):
	Removed.
	(gpa_help_menu_add_to_factory): Remove the Help->License entry.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2008-03-26 15:53:16 UTC (rev 862)
+++ trunk/src/ChangeLog	2008-03-27 02:12:20 UTC (rev 863)
@@ -1,3 +1,15 @@
+2008-03-27  Marcus Brinkmann  <marcus at g10code.de>
+
+	* helpmenu.c: Convert file encoding to UTF-8.
+	(help_about): Rewritten to use stock gtk about dialog.
+	(about_dialog, scroll_text, SCROLLING, DIM, shuffle_array)
+	(do_scrolling, scroll_state, scroll_offset, scroll_text_widths)
+	(scroll_area, scroll_pixmap, cur_scroll_text, cur_scroll_index)
+	(timer, help_license, about_dialog_unmap, about_dialog_destroy)
+	(about_dialog_button, about_dialog_timer, help_license_destroy):
+	Removed.
+	(gpa_help_menu_add_to_factory): Remove the Help->License entry.
+
 2008-03-26  Werner Koch  <wk at g10code.com>
 
 	* gpa.c: Change option --server to --daemon.

Modified: trunk/src/helpmenu.c
===================================================================
--- trunk/src/helpmenu.c	2008-03-26 15:53:16 UTC (rev 862)
+++ trunk/src/helpmenu.c	2008-03-27 02:12:20 UTC (rev 863)
@@ -1,470 +1,120 @@
 /* helpmenu.c  -  The GNU Privacy Assistant
- * Copyright (C) 1995 Spencer Kimball and Peter Mattis
- * Copyright (C) 2000, 2001 G-N-U GmbH.
- * Copyright (C) 2008 g10 Code GmbH.
- *
- * This file is part of GPA
- *
- * GPA 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
- * (at your option) any later version.
- *
- * GPA is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
+   Copyright (C) 1995 Spencer Kimball and Peter Mattis
+   Copyright (C) 2000, 2001 G-N-U GmbH.
+   Copyright (C) 2008 g10 Code GmbH.
 
-#include <config.h>
+   This file is part of GPA.
 
-#include "gpa.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
-#include <gtk/gtk.h>
-#include "gpawindowkeeper.h"
-#include "gtktools.h"
-#include "icons.h"
-#include "gpl-text.h"
+   GPA 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 3 of the License, or
+   (at your option) any later version.
 
-/* W32 target is broken with regards to GdkFont functions.  */
-#ifndef G_OS_WIN32
-#define SCROLLING	1
-#endif
+   GPA is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
 
-static GtkWidget *about_dialog = NULL;
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
-#ifdef SCROLLING
-static char *scroll_text[] =
-{
-  "Markus Gerwinski",
-  "Peter Gerwinski",
-  "Peter Neuhaus",
-  "Werner Koch",
-  "Jan-Oliver Wagner",
-  "Beate Esser",
-  "Bernhard Herzog",
-  "Shell Hung",
-  "Peter Hanecak",
-  "Michael Fischer v. Mollard",
-  "Michael Mauch",
-  "Benedikt Wildenhain",
-  "Miguel Coca",
-  "Renato Martini",
-  "Yasunari Imado",
-  "Michael Anckaert",
-  "Mick Ohrberg",
-  "Andy Ruddock",
-  "Ling Li",
-  "Josué Burgos",
-  "Can Berk Güder",
-  "Emilian Nowak",
-  "Daniel Nylander",
-  "Zdenek Hatas",
-  "Maxim Britov",
-  "Marcus Brinkmann"
-};
-#define DIM(v)		     (sizeof(v)/sizeof((v)[0]))
-static int shuffle_array[ DIM(scroll_text) ];
-static int do_scrolling = 0;
-static int scroll_state = 0;
-static int scroll_offset = 0;
-static int *scroll_text_widths;
-static GtkWidget *scroll_area = NULL;
-static GdkPixmap *scroll_pixmap = NULL;
-static int cur_scroll_text = 0;
-static int cur_scroll_index = 0;
-static int timer = 0;
+#ifdef HAVE_CONFIG_H
+# include <config.h>
 #endif
 
+#include <gtk/gtk.h>
 
-static void
-about_dialog_unmap (void)
-{
-#ifdef SCROLLING
-  if (timer)
-    {
-      gtk_timeout_remove (timer);
-      timer = 0;
-    }
-#endif
-}
+#include "gpa.h"
+#include "icons.h"
+#include "gpl-text.h"
+#include "helpmenu.h"
 
+
+/* Display the about dialog.  */
 static void
-about_dialog_destroy (void)
+help_about (GtkWindow *window)
 {
-  about_dialog = NULL;
-  about_dialog_unmap ();
-}
-
-
-static int
-about_dialog_button (GtkWidget *widget, GdkEventButton *event)
-{
-#ifdef SCROLLING
-  if (timer)
-    gtk_timeout_remove (timer);
-  timer = 0;
-#endif
-  gtk_widget_hide (about_dialog);
-  return FALSE;
-}
-
-
-#ifdef SCROLLING
-static int
-about_dialog_timer (gpointer data)
-{
-  gint return_val = TRUE;
-  
-  if (do_scrolling)
+  static const gchar *authors[] =
     {
-      if (!scroll_pixmap)
-	{
-	  scroll_pixmap = gdk_pixmap_new (scroll_area->window,
-					  scroll_area->allocation.width,
-					  scroll_area->allocation.height,
-					  -1);
-	}
-
-      switch (scroll_state)
-	{
-	case 1:
-	  scroll_state = 2;
-	  timer = gtk_timeout_add (700, about_dialog_timer, NULL);
-	  return_val = FALSE;
-	  break;
-	case 2:
-	  scroll_state = 3;
-	  timer = gtk_timeout_add (75, about_dialog_timer, NULL);
-	  return_val = FALSE;
-	  break;
-	}
-
-      if (scroll_offset > (scroll_text_widths[cur_scroll_text]
-			   + scroll_area->allocation.width))
-	{
-	  scroll_state = 0;
-	  if (++cur_scroll_index == DIM(scroll_text))
-	    cur_scroll_index = 0;
-	  cur_scroll_text = shuffle_array[cur_scroll_index];
-	  scroll_offset = 0;
-	}
-
-      gdk_draw_rectangle (scroll_pixmap,
-			  scroll_area->style->white_gc,
-			  TRUE, 0, 0,
-			  scroll_area->allocation.width,
-			  scroll_area->allocation.height);
-      gdk_draw_string (scroll_pixmap,
-		       gtk_style_get_font (scroll_area->style),
-		       scroll_area->style->black_gc,
-		       scroll_area->allocation.width - scroll_offset,
-		       scroll_area->allocation.height
-		        - gtk_style_get_font (scroll_area->style)->descent,
-		       scroll_text[cur_scroll_text]);
-      gdk_draw_pixmap (scroll_area->window,
-		       scroll_area->style->black_gc,
-		       scroll_pixmap, 0, 0, 0, 0,
-		       scroll_area->allocation.width,
-		       scroll_area->allocation.height);
-
-      scroll_offset += 15;
-      if (!scroll_state
-	  && scroll_offset > ((scroll_area->allocation.width
-			       + scroll_text_widths[cur_scroll_text])/2))
-	{ scroll_state = 1;
-	  scroll_offset = (scroll_area->allocation.width
-			   + scroll_text_widths[cur_scroll_text])/2;
-	}
-    }
-
-  return return_val;
-}
-#endif
-
-
-
-/****************
- * Scroll and logo stuff taken from GIMP 1.0
- */
-static void
-help_about (void)
-{
-
-  if (!about_dialog)
-    {
-      GtkWidget *vbox;
-      GtkWidget *frame;
-      GtkWidget *label;
-      GtkWidget *pixmap;
-#ifdef SCROLLING
-      GtkWidget *alignment;
-      int max_width;
-      int i;
-#endif
-
-      srand (time (NULL)); /* the about dialog uses rand() */
-
-      about_dialog = gtk_dialog_new ();
-      gtk_window_set_title (GTK_WINDOW (about_dialog), _("About GPA"));
-      gtk_window_set_policy (GTK_WINDOW (about_dialog), FALSE, FALSE, FALSE);
-      gtk_window_set_position (GTK_WINDOW (about_dialog), GTK_WIN_POS_CENTER);
-      gtk_signal_connect (GTK_OBJECT (about_dialog), "destroy",
-			  GTK_SIGNAL_FUNC(about_dialog_destroy), NULL);
-      gtk_signal_connect (GTK_OBJECT (about_dialog), "unmap_event",
-			  GTK_SIGNAL_FUNC(about_dialog_unmap), NULL);
-      gtk_signal_connect (GTK_OBJECT (about_dialog), "button_press_event",
-			  GTK_SIGNAL_FUNC(about_dialog_button), NULL);
-      gtk_widget_set_events (about_dialog, GDK_BUTTON_PRESS_MASK);
-
-      vbox = gtk_vbox_new (FALSE, 1);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-      gtk_container_add (GTK_CONTAINER(GTK_DIALOG(about_dialog)->vbox), vbox);
-      gtk_widget_show (vbox);
-
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_container_set_border_width (GTK_CONTAINER (frame), 0);
-      gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
-      gtk_widget_show (frame);
-
-      gtk_widget_realize (about_dialog);
-      pixmap = gpa_create_icon_widget (about_dialog, "gpa_logo");
-      gtk_container_add (GTK_CONTAINER (frame), pixmap);
-      gtk_widget_show (pixmap);
-
-      label = gtk_label_new ("GNU Privacy Assistant v" VERSION
-                             "  (rev. " BUILD_REVISION ")");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
-      gtk_widget_show (label);
-
-      label = gtk_label_new ("Copyright (C) 2000-2002 G-N-U GmbH");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
-      gtk_widget_show (label);
-
-      label = gtk_label_new ("Copyright (C) 2002-2003 Miguel Coca");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
-      gtk_widget_show (label);
-
-      label = gtk_label_new ("Copyright (C) 2005 g10 Code GmbH");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
-      gtk_widget_show (label);
-
-#if SCROLLING
-      label = gtk_label_new (_("Brought to you by:"));
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
-      gtk_widget_show (label);
-
-      alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-      gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, TRUE, 0);
-      gtk_widget_show (alignment);
-
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_container_border_width (GTK_CONTAINER (frame), 0);
-      gtk_container_add (GTK_CONTAINER (alignment), frame);
-      gtk_widget_show (frame);
-
-      scroll_text_widths = g_malloc0 (DIM(scroll_text)*sizeof *scroll_text_widths);
-
-      gtk_widget_ensure_style (GTK_WIDGET (frame));
-      max_width = 0;
-      for (i = 0; i < DIM(scroll_text); i++)
-	{
-	  scroll_text_widths[i] =
-            gdk_string_width (gtk_style_get_font (frame->style),
-                              scroll_text[i]);
-	  if (scroll_text_widths[i] > max_width)
-	    max_width = scroll_text_widths[i];
-	}
-
-      scroll_area = gtk_drawing_area_new ();
-      gtk_drawing_area_size (GTK_DRAWING_AREA (scroll_area),
-			     max_width + 10,
-			     gtk_style_get_font (frame->style)->ascent
-			     + gtk_style_get_font (frame->style)->descent );
-      gtk_widget_set_events (scroll_area, GDK_BUTTON_PRESS_MASK);
-      gtk_container_add (GTK_CONTAINER (frame), scroll_area);
-      gtk_widget_show (scroll_area);
-#endif
-
-      label = gtk_label_new (_("GPA is Free Software under the"));
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
-      gtk_widget_show (label);
-
-      label = gtk_label_new (_("GNU General Public License."));
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
-      gtk_widget_show (label);
-
-      label = gtk_label_new (_("For news see:"));
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
-      gtk_widget_show (label);
-
+      "Andy Ruddock",
+      "Beate Esser",
+      "Benedikt Wildenhain",
+      "Bernhard Herzog",
+      "Can Berk Güder",
+      "Daniel Nylander",
+      "Emilian Nowak",
+      "Jan-Oliver Wagner",
+      "Josué Burgos",
+      "Ling Li",
+      "Marcus Brinkmann",
+      "Markus Gerwinski",
+      "Maxim Britov",
+      "Michael Anckaert",
+      "Michael Fischer v. Mollard",
+      "Michael Mauch",
+      "Mick Ohrberg",
+      "Miguel Coca",
+      "Peter Gerwinski",
+      "Peter Hanecak",
+      "Peter Neuhaus",
+      "Renato Martini",
+      "Shell Hung",
+      "Werner Koch",
+      "Yasunari Imado",
+      "Zdenek Hatas",
+      NULL
+    };
+  static const gchar copyright[] =
+    "Copyright \xc2\xa9 2000-2002 G-N-U GmbH\n"
+    "Copyright \xc2\xa9 2002-2003 Miguel Coca\n"
+    "Copyright \xc2\xa9 2005-2008 g10 Code GmbH";
 #ifdef HAVE_W32_SYSTEM
-      label = gtk_label_new (_("http://www.gpg4win.org"));
+  static const gchar website[] = "http://www.gpg4win.org/";
 #else
-      label = gtk_label_new (_("http://www.gnupg.org"));
+  static const gchar website[] = "http://www.gnupg.org/";
 #endif
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
-      gtk_widget_show (label);
 
-#ifdef SCROLLING
-      gtk_widget_realize (scroll_area);
-      gdk_window_set_background (scroll_area->window,
-				 &scroll_area->style->white);
-#endif
-    }
+  GdkPixbuf *logo;
 
-  if (!GTK_WIDGET_VISIBLE (about_dialog))
-    {
-#if SCROLLING
-      int i;
-#endif
-
-      gtk_widget_show (about_dialog);
-
-#if SCROLLING
-      do_scrolling = 0;
-      scroll_state = 0;
-
-      for (i = 0; i < DIM(scroll_text); i++)
-	{
-	  shuffle_array[i] = i;
-	}
-
-      for (i = 0; i < DIM(scroll_text); i++)
-	{
-	  int j, k;
-	  j = rand() % DIM(scroll_text); /* Hmmm: Not really portable */
-	  k = rand() % DIM(scroll_text);
-	  if (j != k)
-	    {
-	      int t;
-	      t = shuffle_array[j];
-	      shuffle_array[j] = shuffle_array[k];
-	      shuffle_array[k] = t;
-	    }
-	}
-      do_scrolling = 1;
-      about_dialog_timer (about_dialog);
-      timer = gtk_timeout_add (75, about_dialog_timer, NULL);
-#endif
-    }
-  else
-    {
-      gdk_window_raise(about_dialog->window);
-    }
+  logo = gpa_create_icon_pixbuf ("gpa_logo");
+  gtk_show_about_dialog (window,
+			 "program-name", "GPA",
+			 "version", VERSION,
+			 "title", _("About GPA"),
+			 /* Only clickable if
+			    gtk_about_dialog_set_url_hook() is
+			    used.  */
+			 "website", website,
+			 "copyright", copyright,
+			 "comments", _("GPA is the GNU Privacy Assistant."),
+			 "authors", authors,
+			 "license", get_gpl_text (),
+			 "logo", logo,
+			 NULL);
+  if (logo)
+    g_object_unref (logo);
 }
 
-static void
-help_license_destroy (GtkWidget * widget, gpointer param)
+void
+help_help (GtkWindow *window)
 {
-  gtk_main_quit ();
+  g_print (_("Show Help Text\n"));
 }
 
 
-static void
-help_license (gpointer param)
-{
-  GpaWindowKeeper *keeper;
-  GtkAccelGroup *accelGroup;
-  gpointer *paramClose;
-  GtkWidget *parent = param;
-
-  GtkWidget *windowLicense;
-  GtkWidget *vboxLicense;
-  GtkWidget *vboxGPL;
-  GtkWidget *labelJfdGPL;
-  GtkWidget *labelGPL;
-  GtkWidget *hboxGPL;
-  GtkWidget *textGPL;
-  GtkWidget *hButtonBoxLicense;
-  GtkWidget *buttonClose;
-  GtkWidget *licenseScrolled;
-
-  keeper = gpa_windowKeeper_new ();
-  windowLicense = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gpa_windowKeeper_set_window (keeper, windowLicense);
-  gtk_window_set_title (GTK_WINDOW (windowLicense),
-			_("GNU General Public License"));
-  accelGroup = gtk_accel_group_new ();
-  gtk_window_add_accel_group (GTK_WINDOW (windowLicense), accelGroup);
-  gtk_signal_connect (GTK_OBJECT (windowLicense), "destroy",
-		      GTK_SIGNAL_FUNC (help_license_destroy), NULL);
-  
-  vboxLicense = gtk_vbox_new (FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (vboxLicense), 5);
-  vboxGPL = gtk_vbox_new (FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (vboxGPL), 5);
-  labelGPL = gtk_label_new ("");
-  labelJfdGPL = gpa_widget_hjustified_new (labelGPL, GTK_JUSTIFY_LEFT);
-  gtk_box_pack_start (GTK_BOX (vboxGPL), labelJfdGPL, FALSE, FALSE, 0);
-  hboxGPL = gtk_hbox_new (FALSE, 0);
-  textGPL = gtk_text_view_new ();
-  gtk_text_view_set_editable (GTK_TEXT_VIEW (textGPL), FALSE);
-  gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (textGPL)),
-			    get_gpl_text (), -1);
-  gtk_widget_set_size_request (textGPL, 500, 300);
-  licenseScrolled = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (licenseScrolled),
-				  GTK_POLICY_AUTOMATIC,
-				  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (licenseScrolled), textGPL);
-  gtk_adjustment_set_value (gtk_scrolled_window_get_vadjustment
-			    (GTK_SCROLLED_WINDOW (licenseScrolled)), 0.0);
-  gpa_connect_by_accelerator (GTK_LABEL (labelGPL), textGPL, accelGroup,
-			      _("_GNU General Public License"));
-  gtk_box_pack_start (GTK_BOX (hboxGPL), licenseScrolled, TRUE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (vboxGPL), hboxGPL, TRUE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (vboxLicense), vboxGPL, TRUE, TRUE, 0);
-  hButtonBoxLicense = gtk_hbutton_box_new ();
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (hButtonBoxLicense),
-			     GTK_BUTTONBOX_END);
-  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hButtonBoxLicense), 10);
-  gtk_container_set_border_width (GTK_CONTAINER (hButtonBoxLicense), 5);
-  paramClose = (gpointer *) g_malloc (2 * sizeof (gpointer));
-  gpa_windowKeeper_add_param (keeper, paramClose);
-  paramClose[0] = keeper;
-  paramClose[1] = NULL;
-  buttonClose = gpa_buttonCancel_new (accelGroup, _("_Close"), paramClose);
-  gtk_container_add (GTK_CONTAINER (hButtonBoxLicense), buttonClose);
-  gtk_box_pack_start (GTK_BOX (vboxLicense), hButtonBoxLicense, FALSE, FALSE,
-		      0);
-  gtk_container_add (GTK_CONTAINER (windowLicense), vboxLicense);
-
-  gtk_window_set_modal (GTK_WINDOW (windowLicense), TRUE);
-  gpa_window_show_centered (windowLicense, parent);
-  gtk_main ();
-}
-
 void
-help_help (void)
-{
-  g_print (_("Show Help Text\n"));      /*!!! */
-}				/* help_help */
-
-
-void
 gpa_help_menu_add_to_factory (GtkItemFactory *factory, GtkWidget * window)
 {
   GtkItemFactoryEntry menu[] = {
-    {_("/_Help"), NULL, NULL, 0, "<Branch>"},
-#if 0  /* Help is not available yet. :-( */
-    {_("/Help/_Contents"), NULL, (GtkItemFactoryCallback)help_help, 0,
-     "<StockItem>", GTK_STOCK_HELP}
+    { _("/_Help"), NULL, NULL, 0, "<Branch>" },
+#if 0
+    /* FIXME: Help is not available yet.  */
+    { _("/Help/_Contents"), NULL, (GtkItemFactoryCallback) help_help, 0,
+      "<StockItem>", GTK_STOCK_HELP },
 #endif
-    {_("/Help/_License"), NULL, (GtkItemFactoryCallback)help_license, 0, NULL},
-    {_("/Help/_About"), NULL, (GtkItemFactoryCallback)help_about, 0,
-     "<StockItem>", GTK_STOCK_ABOUT }
+    { _("/Help/_About"), NULL, (GtkItemFactoryCallback) help_about, 0,
+      "<StockItem>", GTK_STOCK_ABOUT }
   };
-
   gtk_item_factory_create_items (factory, sizeof (menu) / sizeof (menu[0]),
 				 menu, window);
 }

Modified: trunk/src/helpmenu.h
===================================================================
--- trunk/src/helpmenu.h	2008-03-26 15:53:16 UTC (rev 862)
+++ trunk/src/helpmenu.h	2008-03-27 02:12:20 UTC (rev 863)
@@ -1,24 +1,24 @@
-/* helpmenu.h  -  The GNU Privacy Assistant
- *	Copyright (C) 2000, 2001 G-N-U GmbH.
- *
- * This file is part of GPA
- *
- * GPA 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
- * (at your option) any later version.
- *
- * GPA is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
+/* helpmenu.h - The GNU Privacy Assistant.
+   Copyright (C) 2000, 2001 G-N-U GmbH.
+
+   This file is part of GPA.
+
+   GPA 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 3 of the License, or
+   (at your option) any later version.
+
+   GPA is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the 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, see <http://www.gnu.org/licenses/>.  */
+
 #ifndef HELPMENU_H__
 #define HELPMENU_H__
-extern void help_help (void);
+
 void gpa_help_menu_add_to_factory (GtkItemFactory *factory, GtkWidget *window);
+
 #endif /* HELPMENU_H__ */



More information about the Gpa-commits mailing list