gossip r2824 - in trunk: . data/glade src

[mr svn gnome org]

Author: mr
Date: Mon Jul  7 13:51:41 2008
New Revision: 2824
URL: http://svn.gnome.org/viewvc/gossip?rev=2824&view=rev

Log:
Use Glade for About dialog


Removed:
   trunk/src/gossip-about-dialog.c
   trunk/src/gossip-about-dialog.h
Modified:
   trunk/ChangeLog
   trunk/data/glade/main.glade
   trunk/src/Makefile.am
   trunk/src/gossip-app.c

Modified: trunk/data/glade/main.glade
==============================================================================
--- trunk/data/glade/main.glade	(original)
+++ trunk/data/glade/main.glade	Mon Jul  7 13:51:41 2008
@@ -8261,4 +8261,39 @@
   </child>
 </widget>
 
+<widget class="GtkAboutDialog" id="about_dialog">
+  <property name="border_width">5</property>
+  <property name="visible">True</property>
+  <property name="destroy_with_parent">True</property>
+  <property name="name">Gossip</property>
+  <property name="copyright">Imendio AB 2002-2008</property>
+  <property name="comments" translatable="yes">An Instant Messaging client for GNOME</property>
+  <property name="license">Gossip is free software; you can redistribute it and/or modify it under the terms of the GNU General Public Licence as published by the Free Software Foundation; either version 2 of the Licence, or (at your option) any later version.
+
+Gossip 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 Licence for more details.
+
+You should have received a copy of the GNU General Public Licence along with Gossip; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA
+
+</property>
+  <property name="wrap_license">True</property>
+  <property name="website">http://developer.imendio.com/projects/gossip/</property>
+  <property name="website_label">http://developer.imendio.com/projects/gossip/</property>
+  <property name="authors">Mikael Hallendal
+Richard Hult
+Martyn Russell
+Geert-Jan Van den Bogaerde
+Kevin Dougherty
+Eitan Isaacson
+Xavier Claessens</property>
+  <property name="documenters">Daniel Taylor
+Keywan Najafi Tonekaboni
+Brian Pepple</property>
+  <property name="artists">Daniel Taylor
+Andreas Nilsson</property>
+  <property name="translator_credits">Abigail Brady
+Bastien Nocera
+Gareth Owen
+David Lodge</property>
+</widget>
+
 </glade-interface>

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Jul  7 13:51:41 2008
@@ -42,7 +42,6 @@
 	$(libnotify_sources)		     	                           	\
 	$(dock_sources)		     	       	                    		\
 	ephy-spinner.c                     ephy-spinner.h	  	   	\
-	gossip-about-dialog.c              gossip-about-dialog.h	   	\
 	gossip-accounts-dialog.c           gossip-accounts-dialog.h	   	\
 	gossip-account-chooser.c	   gossip-account-chooser.h        	\
 	gossip-account-widget-jabber.c	   gossip-account-widget-jabber.h  	\

Modified: trunk/src/gossip-app.c
==============================================================================
--- trunk/src/gossip-app.c	(original)
+++ trunk/src/gossip-app.c	Mon Jul  7 13:51:41 2008
@@ -46,7 +46,6 @@
 #include <libgossip/gossip-jabber.h>
 #include <libgossip/gossip-jabber-utils.h>
 
-#include "gossip-about-dialog.h"
 #include "gossip-accounts-dialog.h"
 #include "gossip-add-contact-dialog.h"
 #include "gossip-app.h"
@@ -1624,10 +1623,35 @@
 		   GossipApp *app)
 {
 	GossipAppPriv *priv;
+	GladeXML      *glade;
+	GtkWidget     *about_dialog;
 
 	priv = GET_PRIV (app);
 
-	gossip_about_dialog_new (GTK_WINDOW (priv->window));
+	glade = gossip_glade_get_file ("main.glade",
+				       "about_dialog",
+				       NULL,
+				       "about_dialog", &about_dialog,
+				       NULL);
+
+	g_object_unref (glade);
+
+	if (!about_dialog) {
+		g_warning ("Could not find about dialog in main glade file");
+		return;
+	}
+
+
+	gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (about_dialog),
+				      PACKAGE_VERSION);
+	gtk_about_dialog_set_logo_icon_name (GTK_ABOUT_DIALOG (about_dialog),
+					     PACKAGE_TARNAME);
+
+	g_signal_connect_swapped (about_dialog, "response", 
+				  G_CALLBACK (gtk_widget_destroy),
+				  about_dialog);
+
+	gtk_widget_show (about_dialog);
 }
 
 static void