? autom4te.cache
? depcomp
? ekiga.desktop.in
? ekiga.schemas
? ekiga.schemas.in
? net.ekiga.helper.service
? net.ekiga.instance.service
? stamp-h1
? help/Makefile
? help/Makefile.in
? help/ekiga-C.omf
? help/ekiga-bg.omf
? help/ekiga-de.omf
? help/ekiga-es.omf
? help/ekiga-fr.omf
? help/ekiga-sv.omf
? help/ekiga-uk.omf
? help/bg/.xml2po.mo
? help/bg/ekiga.xml
? help/de/.xml2po.mo
? help/de/ekiga.xml
? help/es/.xml2po.mo
? help/es/ekiga.xml
? help/fr/.xml2po.mo
? help/fr/ekiga.xml
? help/sv/.xml2po.mo
? help/sv/ekiga.xml
? help/uk/.xml2po.mo
? help/uk/ekiga.xml
? lib/.deps
? lib/.libs
? lib/Makefile
? lib/Makefile.in
? lib/gmmarshallers.lo
? lib/libekiga.la
? lib/gmconf/.deps
? lib/gmconf/.libs
? lib/gmconf/Makefile
? lib/gmconf/Makefile.in
? lib/gmconf/gmconf-gconf.lo
? lib/gmconf/libgmconf.la
? lib/gmcontacts/.deps
? lib/gmcontacts/.libs
? lib/gmcontacts/Makefile
? lib/gmcontacts/Makefile.in
? lib/gmcontacts/e-vcard.lo
? lib/gmcontacts/gmcontacts-avahi.lo
? lib/gmcontacts/gmcontacts-convert.lo
? lib/gmcontacts/gmcontacts-dnd.lo
? lib/gmcontacts/gmcontacts-eds.lo
? lib/gmcontacts/gmcontacts-ldap.lo
? lib/gmcontacts/gmcontacts-remote.lo
? lib/gmcontacts/gmcontacts.lo
? lib/gmcontacts/libgmcontacts.la
? lib/gui/.deps
? lib/gui/.libs
? lib/gui/Makefile
? lib/gui/Makefile.in
? lib/gui/gmconfwidgets.lo
? lib/gui/gmconnectbutton.lo
? lib/gui/gmdialog.lo
? lib/gui/gmentrydialog.lo
? lib/gui/gmlevelmeter.lo
? lib/gui/gmmenuaddon.lo
? lib/gui/gmpreferences.lo
? lib/gui/gmstatsdrawingarea.lo
? lib/gui/gmstatusbar.lo
? lib/gui/gmstockicons.lo
? lib/gui/gmtextbufferaddon.lo
? lib/gui/gmtexttagaddon.lo
? lib/gui/gmtextviewaddon.lo
? lib/gui/libgmwidgets.la
? lib/gui/gmtray/.deps
? lib/gui/gmtray/.libs
? lib/gui/gmtray/Makefile
? lib/gui/gmtray/Makefile.in
? lib/gui/gmtray/eggtrayicon.lo
? lib/gui/gmtray/gmtray-common.lo
? lib/gui/gmtray/gmtray-x11.lo
? lib/gui/gmtray/libgmtray.la
? lib/toolbox/.deps
? lib/toolbox/.libs
? lib/toolbox/Makefile
? lib/toolbox/Makefile.in
? lib/toolbox/libtoolbox.la
? lib/toolbox/toolbox-common.lo
? lib/toolbox/toolbox-gnome.lo
? man/Makefile
? man/Makefile.in
? pixmaps/inline_emoticons.h
? pixmaps/inlines.h
? po/.intltool-merge-cache
? po/stamp-it
? src/.libs
? src/ekiga
? src/ekiga-config-tool
? src/ekiga-helper
Index: lib/Makefile.am
===================================================================
RCS file: /cvs/gnome/ekiga/lib/Makefile.am,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile.am
--- lib/Makefile.am	11 Jan 2006 20:16:21 -0000	1.36
+++ lib/Makefile.am	10 Oct 2006 21:24:24 -0000
@@ -1,7 +1,7 @@
 SUBDIRS = gmconf gmcontacts gui toolbox
 
 if DISABLE_GNOME
-SUBDIRS += about druid
+SUBDIRS += druid
 endif
 
 noinst_LTLIBRARIES = libekiga.la
@@ -27,7 +27,7 @@ INCLUDES =						\
 libekiga_la_LDFLAGS = -export-dynamic
 libekiga_la_LIBADD = gmconf/libgmconf.la gmcontacts/libgmcontacts.la gui/libgmwidgets.la toolbox/libtoolbox.la 
 if DISABLE_GNOME
-libekiga_la_LIBADD += about/libabout.la druid/libdruid.la
+libekiga_la_LIBADD += druid/libdruid.la
 endif
 
 gmmarshallers.h: gmmarshallers.list
Index: src/gui/callbacks.cpp
===================================================================
RCS file: /cvs/gnome/ekiga/src/gui/callbacks.cpp,v
retrieving revision 1.15.2.1
diff -u -p -r1.15.2.1 callbacks.cpp
--- src/gui/callbacks.cpp	9 Jul 2006 10:39:46 -0000	1.15.2.1
+++ src/gui/callbacks.cpp	10 Oct 2006 21:24:24 -0000
@@ -128,7 +128,6 @@ void
 about_callback (GtkWidget *widget, 
 		gpointer parent_window)
 {
-  GtkWidget *abox = NULL;
   GdkPixbuf *pixbuf = NULL;
   gchar     *filename = NULL;
 
@@ -156,7 +155,7 @@ about_callback (GtkWidget *widget, 
   authors [9] = gettext (authors [9]);
   authors [15] = gettext (authors [15]);
   
-  const char *documenters [] = {
+  const gchar *documenters [] = {
     "Damien Sandras <dsandras@seconix.com>",
     "Christopher Warner <zanee@kernelcode.com>",
     "Matthias Redlich <m-redlich@t-online.de>",
@@ -164,32 +163,31 @@ about_callback (GtkWidget *widget, 
   };
 
   /* Translators: Please write translator credits here, and
-   * seperate names with \n */
-  const char *translator_credits = _("translator-credits");
+   * separate names with \n */
+  const gchar *translator_credits = _("translator-credits");
+  if (strcmp (translator_credits, "translator-credits") == 0)
+    translator_credits = "No translators, English by\n"
+        "Damien Sandras <dsandras@seconix.com>";
+ 
+  const gchar *comments =  _("Ekiga is full-featured SIP and H.323 compatible VoIP, IP-Telephony and Videoconferencing application that allows you to make audio and video calls to remote users with SIP and H.323 hardware or software.");
   
   filename = g_build_filename (DATA_DIR, "pixmaps", PACKAGE_NAME ".png", NULL);
   pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
   g_free (filename);
 
-  abox = gnome_about_new ("Ekiga",
-			  VERSION,
-			  "Copyright © 2000-2006 Damien Sandras",
-                          /* Translators: Please test to see if your translation
-                           * looks OK and fits within the box */
-			  _("Ekiga is full-featured SIP and H.323 compatible VoIP, IP-Telephony and Videoconferencing application that allows you to make audio and video calls to remote users with SIP and H.323 hardware or software."),
-			  (const char **) authors,
-                          (const char **) documenters,
-                          strcmp (translator_credits, 
-				  "translator-credits") != 0 ? 
-                          translator_credits : "No translators, English by\n"
-                          "Damien Sandras <dsandras@seconix.com>",
-			  pixbuf);
-
+  gtk_show_about_dialog (GTK_WINDOW (parent_window),
+		"name", "Ekiga",
+		"version", VERSION,
+		"copyright", "Copyright © 2000-2006 Damien Sandras",
+		"authors", authors,
+		"documenters", documenters,
+		"translator-credits", translator_credits,
+		"comments", comments,
+		"logo", pixbuf,
+		"website", "http://www.ekiga.org",
+		NULL);
   if (pixbuf)
     g_object_unref (pixbuf);
-
-  gtk_window_set_transient_for (GTK_WINDOW (abox), GTK_WINDOW (parent_window));
-  gtk_window_present (GTK_WINDOW (abox));
 }
 
 
