[gnome-pilot] minor cleanup of migration to GtkAboutDialog

[Matthew Charles Davey <mcdavey src gnome org>]

commit 766e0ef08db6f42af1df96d556e4b96751382e7a
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Thu Sep 3 09:04:21 2009 +0100

    minor cleanup of migration to GtkAboutDialog
    
    2009-09-03  Matt Davey  <mcdavey mrao cam ac uk>
    	* applet/pilot.c: minor cleanup of migration to
    	        GtkAboutDialog

 ChangeLog      |   24 ++++++++++++++++++++++++
 applet/pilot.c |   10 ++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0c33cf2..aa2b906 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2009-09-03  Matt Davey  <mcdavey mrao cam ac uk>
+	* applet/pilot.c: minor cleanup of migration to
+	        GtkAboutDialog
+
+2009-08-28  Halton Huo
+	* remove unused gpilotd-conduit-mgmt.h
+
+2009-08-28  Halton Huo
+	* Use GKeyFile instead of gnome-config:
+	    - use same file format as before
+	    - migrate files from ~/.gnome2/gnome-pilot.d/ to
+	      ~/.gnome-pilot/ when accessed.  Note that files
+	      created by other conduits (such as evolution)
+	      must be migrated by those applications.
+
+2009-08-27  Halton Huo
+	* remove obsolete 'drafts/' folder.
+	
+2009-08-26  Halton Huo
+	* Replace GnomeAbout with GtkAboutDialog:
+	     part of bug #590215
+	* Replace g_file_exists() with g_file_test() and
+	     replace g_concat_dir_and_file() with g_build_filename().
+
 2009-08-25  Matt Davey  <mcdavey mrao cam ac uk>
 	* Makefile.am:	removed gpilot-fileman.  Obsolete.
 	* applet/pilot.c: fix some bugs with restore feature, plus
diff --git a/applet/pilot.c b/applet/pilot.c
index 1864384..b6774cf 100644
--- a/applet/pilot.c
+++ b/applet/pilot.c
@@ -430,7 +430,7 @@ static void
 about_cb(BonoboUIComponent *uic, PilotApplet *pilot, const gchar *verbname)
 
 {
-	GError *error;
+	GError *error = NULL;
 
 	GtkWidget *about;
 	const gchar *authors[] = {"Vadim Strizhevsky <vadim optonline net>",
@@ -445,9 +445,9 @@ about_cb(BonoboUIComponent *uic, PilotApplet *pilot, const gchar *verbname)
 	    GNOME_ICONDIR "/sync_icon.png", &error);
 
 
-	if (error)
+	if (error != NULL)
 	{
-		g_warning ("Can't find icon: " GNOME_ICONDIR "/sync_icon.png" );
+	    g_warning ("Error setting icon: " GNOME_ICONDIR "/sync_icon.png: %s", error->message );
 	}
 
 	about = gtk_about_dialog_new ();
@@ -457,6 +457,7 @@ about_cb(BonoboUIComponent *uic, PilotApplet *pilot, const gchar *verbname)
         gtk_about_dialog_set_comments (GTK_ABOUT_DIALOG (about), _("A PalmOS PDA monitor.\n"));
         gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (about), (const gchar**)authors);
         gtk_about_dialog_set_translator_credits (GTK_ABOUT_DIALOG (about), "Translations by the GNOME Translation Project");
+        gtk_about_dialog_set_logo_icon_name (GTK_ABOUT_DIALOG (about), "palm-pilot-sync");
 
 	gtk_window_set_wmclass (
 		GTK_WINDOW (about), "pilot", "Pilot");
@@ -465,7 +466,8 @@ about_cb(BonoboUIComponent *uic, PilotApplet *pilot, const gchar *verbname)
 	gtk_window_set_screen (GTK_WINDOW (about),
 		gtk_widget_get_screen (GTK_WIDGET (pilot->applet)));
 
-	gtk_widget_show (about);
+	gtk_dialog_run (GTK_DIALOG(about));
+	gtk_widget_destroy (about);
 
 	return;
 }