[gnome-panel] panel: Remove some gconf-related includes where not needed
- From: Vincent Untz <vuntz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel] panel: Remove some gconf-related includes where not needed
- Date: Mon, 28 Mar 2011 21:15:46 +0000 (UTC)
commit 456ecda3c9c43afc0065327b2db5ef76582eb431
Author: Vincent Untz <vuntz gnome org>
Date: Fri Mar 25 23:10:23 2011 +0100
panel: Remove some gconf-related includes where not needed
gnome-panel/applet.h | 4 ++--
gnome-panel/menu.c | 2 +-
gnome-panel/panel-applet-frame.c | 1 -
gnome-panel/panel-menu-items.c | 1 +
gnome-panel/panel.c | 1 -
5 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/gnome-panel/applet.h b/gnome-panel/applet.h
index bb7cd80..3a6a59b 100644
--- a/gnome-panel/applet.h
+++ b/gnome-panel/applet.h
@@ -3,9 +3,9 @@
#include <glib.h>
#include <gdk/gdk.h>
-#include "panel-widget.h"
-#include "panel-gconf.h"
+
#include "panel-enums.h"
+#include "panel-widget.h"
G_BEGIN_DECLS
diff --git a/gnome-panel/menu.c b/gnome-panel/menu.c
index 14ae289..652ac2d 100644
--- a/gnome-panel/menu.c
+++ b/gnome-panel/menu.c
@@ -29,12 +29,12 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
#include <gdk/gdkkeysyms.h>
-#include <gconf/gconf-client.h>
#include <libpanel-util/panel-keyfile.h>
#include <libpanel-util/panel-xdg.h>
#include "launcher.h"
+#include "panel-gconf.h"
#include "panel-util.h"
#include "panel.h"
#include "panel-stock-icons.h"
diff --git a/gnome-panel/panel-applet-frame.c b/gnome-panel/panel-applet-frame.c
index ed7023a..a3db251 100644
--- a/gnome-panel/panel-applet-frame.c
+++ b/gnome-panel/panel-applet-frame.c
@@ -29,7 +29,6 @@
#include <glib/gi18n.h>
-#include <gconf/gconf.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
diff --git a/gnome-panel/panel-menu-items.c b/gnome-panel/panel-menu-items.c
index 2a5a12e..66c7af7 100644
--- a/gnome-panel/panel-menu-items.c
+++ b/gnome-panel/panel-menu-items.c
@@ -49,6 +49,7 @@
#include "menu.h"
#include "panel-action-button.h"
+#include "panel-gconf.h"
#include "panel-globals.h"
#include "panel-icon-names.h"
#include "panel-lockdown.h"
diff --git a/gnome-panel/panel.c b/gnome-panel/panel.c
index 164e019..a16b5bc 100644
--- a/gnome-panel/panel.c
+++ b/gnome-panel/panel.c
@@ -30,7 +30,6 @@
#include "panel-bindings.h"
#include "panel-context-menu.h"
#include "panel-util.h"
-#include "panel-gconf.h"
#include "panel-applet-frame.h"
#include "panel-action-button.h"
#include "panel-menu-bar.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]