From f18a00f8a9489da809cdd42570d594cf6fcbf34f Mon Sep 17 00:00:00 2001
From: evilynux <evilynux@users.sf.net>
Date: Mon, 3 Sep 2007 20:25:44 +0000
Subject: [PATCH] gtk-glade: - Added DeSmuME version in about dialog. gtk and
 gtk-glade: - Updated website url in about dialog.

---
 desmume/ChangeLog                         | 7 ++++++-
 desmume/src/gtk-glade/callbacks.c         | 1 +
 desmume/src/gtk-glade/glade/DeSmuMe.glade | 4 ++--
 desmume/src/gtk/main.c                    | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/desmume/ChangeLog b/desmume/ChangeLog
index cbbdd927f..e7ce12d03 100644
--- a/desmume/ChangeLog
+++ b/desmume/ChangeLog
@@ -11,7 +11,12 @@
  - Default screen color now black (better represents being "off" and easier on eyes at night) [Jeff B]
  general:
  - Fixed possible segfault in ROMReader on ia64 and amd64. [evilynux]
-
+ gtk-glade:
+ - Added DeSmuME version in about dialog. [evilynux]
+ - Updated website url in about dialog. [evilynux]
+ gtk:
+ - Updated website url in about dialog. [evilynux]
+	
 0.7.2 -> 0.7.3
  gtk-glade:
   - Full localization using intltool/gettext. [evilynux]
diff --git a/desmume/src/gtk-glade/callbacks.c b/desmume/src/gtk-glade/callbacks.c
index 8f0dd2058..ba04266ee 100755
--- a/desmume/src/gtk-glade/callbacks.c
+++ b/desmume/src/gtk-glade/callbacks.c
@@ -368,6 +368,7 @@ void  on_menu_wtoolsXX_activate     (GtkMenuItem *menuitem, gpointer user_data)
    FIXME: Add proper copyright */
 void  on_menu_apropos_activate (GtkMenuItem *menuitem, gpointer user_data) {
   GtkWidget * wAbout = glade_xml_get_widget(xml, "wAboutDlg");
+  gtk_about_dialog_set_version((GtkAboutDialog *)wAbout, VERSION);
   gtk_widget_show(wAbout);
 }
 
diff --git a/desmume/src/gtk-glade/glade/DeSmuMe.glade b/desmume/src/gtk-glade/glade/DeSmuMe.glade
index 052d47295..868bbbc27 100755
--- a/desmume/src/gtk-glade/glade/DeSmuMe.glade
+++ b/desmume/src/gtk-glade/glade/DeSmuMe.glade
@@ -1320,8 +1320,8 @@
   <property name="name" translatable="yes">DeSmuME</property>
   <property name="comments" translatable="yes">Nintendo DS emulator based on work by Yopyop</property>
   <property name="wrap_license">False</property>
-  <property name="website">http://desmume.sf.net</property>
-  <property name="website_label" translatable="yes">http://desmume.sf.net</property>
+  <property name="website">http://desmume.org</property>
+  <property name="website_label" translatable="yes">http://desmume.org</property>
   <property name="authors">Original author:
   yopyop (now inactive)
 
diff --git a/desmume/src/gtk/main.c b/desmume/src/gtk/main.c
index 0dc548c1b..88569df59 100644
--- a/desmume/src/gtk/main.c
+++ b/desmume/src/gtk/main.c
@@ -402,7 +402,7 @@ void About(GtkWidget* widget, gpointer data)
 	gtk_show_about_dialog(GTK_WINDOW(pWindow),
 			"name", "DeSmuME",
 			"version", VERSION,
-			"website", "http://desmume.sf.net",
+			"website", "http://desmume.org",
 			"logo", pixbuf,
 			"comments", "Nintendo DS emulator based on work by Yopyop",
 			NULL);