? 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/druid/.deps
? lib/druid/Makefile
? lib/druid/Makefile.in
? 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: INSTALL
===================================================================
RCS file: /cvs/gnome/ekiga/INSTALL,v
retrieving revision 1.2
diff -u -p -r1.2 INSTALL
--- INSTALL	4 Dec 2005 16:01:54 -0000	1.2
+++ INSTALL	12 Oct 2006 18:20:30 -0000
@@ -1,13 +1,16 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+Installation Instructions
+*************************
 
-   This file is free documentation; the Free Software Foundation gives
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-   These are generic installation instructions.
+These are generic installation instructions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -67,9 +70,9 @@ The simplest way to compile this package
 Compilers and Options
 =====================
 
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
@@ -82,7 +85,7 @@ is an example:
 Compiling For Multiple Architectures
 ====================================
 
-   You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you must use a version of `make' that
 supports the `VPATH' variable, such as GNU `make'.  `cd' to the
@@ -99,19 +102,19 @@ for another architecture.
 Installation Names
 ==================
 
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
 
@@ -122,7 +125,7 @@ option `--program-prefix=PREFIX' or `--p
 Optional Features
 =================
 
-   Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -137,11 +140,11 @@ you can use the `configure' options `--x
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -156,7 +159,7 @@ where SYSTEM can have one of these forms
 need to know the machine type.
 
    If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
 produce code for.
 
    If you want to _use_ a cross compiler, that generates code for a
@@ -167,9 +170,9 @@ eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
 
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -178,7 +181,7 @@ A warning: not all `configure' scripts l
 Defining Variables
 ==================
 
-   Variables not defined in a site shell script can be set in the
+Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -186,14 +189,18 @@ them in the `configure' command line, us
 
      ./configure CC=/usr/local2/bin/gcc
 
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).  Here is a another example:
+
+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
 
 `configure' Invocation
 ======================
 
-   `configure' recognizes the following options to control how it
-operates.
+`configure' recognizes the following options to control how it operates.
 
 `--help'
 `-h'
Index: configure.in
===================================================================
RCS file: /cvs/gnome/ekiga/configure.in,v
retrieving revision 1.368.2.4
diff -u -p -r1.368.2.4 configure.in
--- configure.in	4 Sep 2006 10:49:03 -0000	1.368.2.4
+++ configure.in	12 Oct 2006 18:20:31 -0000
@@ -104,10 +104,10 @@ dnl ####################################
 PKG_PROG_PKG_CONFIG
 
 if test ${enable_gnome} = no; then
-PKG_CHECK_MODULES(EKIGA, gtk+-2.0 >= 2.4.0 gthread-2.0 >= 2.4.0 libxml-2.0 >= 2.5.0)
+PKG_CHECK_MODULES(EKIGA, gtk+-2.0 >= 2.10.0 gthread-2.0 >= 2.4.0 libxml-2.0 >= 2.5.0)
 EKIGA_CFLAGS="$EKIGA_CFLAGS -DDISABLE_GNOME"
 else
-PKG_CHECK_MODULES(EKIGA, gtk+-2.0 >= 2.4.0 gthread-2.0 >= 2.4.0 esound >= 0.2.28 gconf-2.0 >= 2.2.0 libgnome-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0)
+PKG_CHECK_MODULES(EKIGA, gtk+-2.0 >= 2.10.0 gthread-2.0 >= 2.4.0 esound >= 0.2.28 gconf-2.0 >= 2.2.0 libgnome-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0)
 PKG_CHECK_MODULES(EDS, libebook-1.2 >= 1.1.3,ebook12=yes,ebook12=no)
 if test x"${ebook12}" = xno ; then
 PKG_CHECK_MODULES(EDS, libebook-1.0 >= 0.0.94)
@@ -565,7 +565,6 @@ AC_PACKAGE_NAME.desktop.in
 net.ekiga.instance.service
 net.ekiga.helper.service
 lib/Makefile
-lib/about/Makefile
 lib/druid/Makefile
 lib/gmconf/Makefile
 lib/gmcontacts/Makefile
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	12 Oct 2006 18:20:31 -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	12 Oct 2006 18:20:31 -0000
@@ -128,10 +128,6 @@ void
 about_callback (GtkWidget *widget, 
 		gpointer parent_window)
 {
-  GtkWidget *abox = NULL;
-  GdkPixbuf *pixbuf = NULL;
-  gchar     *filename = NULL;
-
   const gchar *authors [] = {
       "Damien Sandras <dsandras@seconix.com>",
       "",
@@ -156,40 +152,56 @@ 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>",
     NULL
   };
 
-  /* Translators: Please write translator credits here, and
-   * seperate names with \n */
-  const char *translator_credits = _("translator-credits");
-  
-  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);
-
-  if (pixbuf)
-    g_object_unref (pixbuf);
+  const gchar *license = "\
+This program 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. \
+\n\n\
+This program 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. \
+\n\n\
+Ekiga is licensed under the GPL license and as a special exception, \
+you have permission to link or otherwise combine this program with the \
+programs OPAL, OpenH323 and PWLIB, and distribute the combination, \
+without applying the requirements of the GNU GPL to the OPAL, OpenH323 \
+and PWLIB programs, as long as you do follow the requirements of the \
+GNU GPL for all the rest of the software thus combined.";
 
-  gtk_window_set_transient_for (GTK_WINDOW (abox), GTK_WINDOW (parent_window));
-  gtk_window_present (GTK_WINDOW (abox));
+  /* Translators: Please write translator credits here, and
+   * 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.");
+ 
+  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-icon-name", PACKAGE_NAME,
+		"license", license,
+		"wrap-license", TRUE,
+		"website", "http://www.ekiga.org",
+		NULL);
 }
 
 
