diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-11-08 06:04:53 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-11-08 06:04:53 +0800 |
| commit | d6445f8abfa78c0a9c8680a3ba7422d331391f8f (patch) | |
| tree | 8d462e7747bccdc2108837401fd295dfa160943d /addressbook | |
| parent | 6140798719beb44abaa4de89043f6d911c977621 (diff) | |
| download | gsoc2013-evolution-d6445f8abfa78c0a9c8680a3ba7422d331391f8f.tar.gz gsoc2013-evolution-d6445f8abfa78c0a9c8680a3ba7422d331391f8f.tar.zst gsoc2013-evolution-d6445f8abfa78c0a9c8680a3ba7422d331391f8f.zip | |
Merge revisions 36685:36729 from trunk.
svn path=/branches/kill-bonobo/; revision=36763
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 8 | ||||
| -rw-r--r-- | addressbook/gui/component/openldap-extract.h | 4 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/test-editor.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard-label.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard-view-widget.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/widgets/test-reflow.c | 3 |
6 files changed, 14 insertions, 7 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 46f6de9bd2..f061e55515 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,11 @@ +2008-10-30 Matthew Barnes <mbarnes@redhat.com> + + * gui/contact-editor/test-editor.c: + * gui/widgets/e-minicard-label.c: + * gui/widgets/e-minicard-view-widget.c: + * gui/widgets/test-reflow.c: + Only include the toplevel GTK+ header. + 2008-10-17 Milan Crha <mcrha@redhat.com> ** Fix for bug #511918 diff --git a/addressbook/gui/component/openldap-extract.h b/addressbook/gui/component/openldap-extract.h index f11012ec40..010589da1e 100644 --- a/addressbook/gui/component/openldap-extract.h +++ b/addressbook/gui/component/openldap-extract.h @@ -22,8 +22,8 @@ * modification, are permitted only as authorized by the OpenLDAP * Public License. * - * A copy of this license is available in file LICENSE in the - * top-level directory of the distribution or, alternatively, at + * A copy of this license is available in file COPYING.OPENLDAP in + * the top-level directory of the distribution or, alternatively, at * <http://www.OpenLDAP.org/license.html>. */ diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c index 7a7e644238..61c6de7174 100644 --- a/addressbook/gui/contact-editor/test-editor.c +++ b/addressbook/gui/contact-editor/test-editor.c @@ -23,7 +23,7 @@ #include "config.h" #include <stdlib.h> -#include <gtk/gtkmain.h> +#include <gtk/gtk.h> #include <libgnomeui/gnome-app.h> #include <libgnomeui/gnome-ui-init.h> #include <glade/glade.h> diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 89107dafbf..696d42dcd9 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -24,7 +24,7 @@ #include "e-minicard-label.h" -#include <gtk/gtksignal.h> +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> #include <glib/gi18n.h> #include <e-util/e-util.h> diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index 2d43aca39e..0f9ae7c143 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -22,7 +22,7 @@ #include <config.h> -#include <gtk/gtksignal.h> +#include <gtk/gtk.h> #include <misc/e-canvas-background.h> #include <misc/e-canvas.h> #include <glib/gi18n.h> diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c index 8853e7f748..f0faf7899c 100644 --- a/addressbook/gui/widgets/test-reflow.c +++ b/addressbook/gui/widgets/test-reflow.c @@ -50,8 +50,7 @@ #include "config.h" -#include <gtk/gtkmain.h> -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include <libgnomeui/gnome-canvas-rect-ellipse.h> #include <libgnomeui/gnome-init.h> #include <misc/e-canvas.h> |