[gnome-hello] Clean includes
- From: Javier Jardón <jjardon src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-hello] Clean includes
- Date: Mon, 8 Feb 2010 16:50:20 +0000 (UTC)
commit f7934cdc6385aa8ca69c4bf2114150f034affc99
Author: Javier Jardón <jjardon gnome org>
Date: Mon Feb 8 16:08:38 2010 +0100
Clean includes
Also, the libgnome dependency is not necessary
configure.ac | 4 +---
src/app.c | 4 +++-
src/app.h | 2 +-
src/hello.c | 7 +++++--
src/icon.c | 8 +++++---
src/menus.c | 6 +++++-
6 files changed, 20 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6704887..761b9e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,13 +30,11 @@ GNOME_MAINTAINER_MODE_DEFINES
# ***************************
LIBGTK_REQUIRED=2.6.0
-LIBGNOME_REQUIRED=2.14.0
LIBGNOMEUI_REQUIRED=2.14.0
SCROLLKEEPER_REQUIRED=0.3.14
PKG_CHECK_MODULES([GNOME_HELLO],
- [libgnome-2.0 >= $LIBGNOME_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
+ [libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
gtk+-2.0 >= $LIBGTK_REQUIRED])
# *************
diff --git a/src/app.c b/src/app.c
index b4441b3..891ff35 100644
--- a/src/app.c
+++ b/src/app.c
@@ -18,8 +18,10 @@
* USA
*/
-#include <config.h>
+#include "config.h"
+
#include <glib/gi18n.h>
+
#include "app.h"
#include "menus.h"
diff --git a/src/app.h b/src/app.h
index fcab85c..70a29df 100644
--- a/src/app.h
+++ b/src/app.h
@@ -21,7 +21,7 @@
#ifndef GNOMEHELLO_APP_H
#define GNOMEHELLO_APP_H
-#include <gnome.h>
+#include <gtk/gtk.h>
GtkWidget* hello_app_new(const gchar* message,
const gchar* geometry,
diff --git a/src/hello.c b/src/hello.c
index e2e4d81..555b49d 100644
--- a/src/hello.c
+++ b/src/hello.c
@@ -18,11 +18,14 @@
* USA
*/
-#include <config.h>
+#include "config.h"
+
#include <glib-object.h>
-#include <gnome.h>
#include <glib/gi18n.h>
+#include <libgnomeui/gnome-ui-init.h>
+#include <libgnomeui/gnome-client.h>
+
#include "app.h"
diff --git a/src/icon.c b/src/icon.c
index f6d3464..bac7f2e 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -20,8 +20,11 @@
/*** gnomehello-icon */
-#include <gnome.h>
-#include <config.h>
+#include "config.h"
+
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+
#include "icon.h"
void
@@ -34,7 +37,6 @@ hello_set_icon(GtkWindow* window, const gchar* filename)
}
-#include <gdk/gdkx.h>
void
gdk_get_icon_sizes(GdkIconSize** size_list, guint* count)
{
diff --git a/src/menus.c b/src/menus.c
index d1350d8..24a9b94 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -18,8 +18,12 @@
* USA
*/
-#include <config.h>
+#include "config.h"
+
#include <glib/gi18n.h>
+
+#include <stdlib.h>
+
#include "menus.h"
#include "app.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]