[gnome-main-menu] Use slab.h single include everywhere
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-main-menu] Use slab.h single include everywhere
- Date: Thu, 23 Jul 2009 23:01:25 +0000 (UTC)
commit 825e24af475cc7133d474a8134ecba57ab67cf1f
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Wed Jul 1 13:00:21 2009 +0200
Use slab.h single include everywhere
application-browser/src/application-browser.c | 3 +--
main-menu/src/hard-drive-status-tile.c | 4 +---
main-menu/src/hard-drive-status-tile.h | 2 +-
main-menu/src/main-menu-migration.c | 3 +--
main-menu/src/main-menu-ui.c | 8 +-------
main-menu/src/main-menu.c | 2 +-
main-menu/src/network-status-agent.c | 3 +--
main-menu/src/network-status-tile.c | 2 +-
main-menu/src/network-status-tile.h | 2 +-
main-menu/src/tile-table.c | 4 +---
main-menu/src/tile-table.h | 4 +---
11 files changed, 11 insertions(+), 26 deletions(-)
---
diff --git a/application-browser/src/application-browser.c b/application-browser/src/application-browser.c
index e602a9f..610a3e8 100644
--- a/application-browser/src/application-browser.c
+++ b/application-browser/src/application-browser.c
@@ -27,8 +27,7 @@
#include <unique/unique.h>
#include <stdlib.h>
#include <glib/gi18n.h>
-#include <slab/app-shell.h>
-#include <slab/slab-gnome-util.h>
+#include <slab.h>
#define APPLICATION_BROWSER_PREFIX "/desktop/gnome/applications/main-menu/ab_"
#define NEW_APPS_MAX_ITEMS (APPLICATION_BROWSER_PREFIX "new_apps_max_items")
diff --git a/main-menu/src/hard-drive-status-tile.c b/main-menu/src/hard-drive-status-tile.c
index f39c275..4a5c74a 100644
--- a/main-menu/src/hard-drive-status-tile.c
+++ b/main-menu/src/hard-drive-status-tile.c
@@ -24,9 +24,7 @@
#include <sys/statvfs.h>
#include <glib/gi18n.h>
#include <gconf/gconf-client.h>
-
-#include "slab-gnome-util.h"
-#include "libslab-utils.h"
+#include <slab.h>
#define GIGA (1024 * 1024 * 1024)
#define MEGA (1024 * 1024)
diff --git a/main-menu/src/hard-drive-status-tile.h b/main-menu/src/hard-drive-status-tile.h
index 710680d..438eb55 100644
--- a/main-menu/src/hard-drive-status-tile.h
+++ b/main-menu/src/hard-drive-status-tile.h
@@ -21,7 +21,7 @@
#ifndef __HARD_DRIVE_STATUS_TILE_H__
#define __HARD_DRIVE_STATUS_TILE_H__
-#include "nameplate-tile.h"
+#include <slab.h>
G_BEGIN_DECLS
diff --git a/main-menu/src/main-menu-migration.c b/main-menu/src/main-menu-migration.c
index 0511d4e..9dd7bfd 100644
--- a/main-menu/src/main-menu-migration.c
+++ b/main-menu/src/main-menu-migration.c
@@ -33,8 +33,7 @@
# include "bookmark-agent-libslab.h"
#endif
-#include <slab/bookmark-agent.h>
-#include <slab/libslab-utils.h>
+#include <slab.h>
#define SYSTEM_BOOKMARK_FILENAME "system-items.xbel"
#define SYSTEM_BOOKMARK_MIGRATED_TO_NEW_SET "system-items.migrated"
diff --git a/main-menu/src/main-menu-ui.c b/main-menu/src/main-menu-ui.c
index b056dc3..e3b39a1 100644
--- a/main-menu/src/main-menu-ui.c
+++ b/main-menu/src/main-menu-ui.c
@@ -34,20 +34,14 @@
#include <X11/Xlib.h>
#include <gdk/gdkx.h>
#include <gio/gio.h>
+#include <slab.h>
-#include "tile.h"
-#include "application-tile.h"
-#include "document-tile.h"
-#include "directory-tile.h"
-#include "system-tile.h"
#include "hard-drive-status-tile.h"
#include "network-status-tile.h"
#include "tile-table.h"
#include "tomboykeybinder.h"
-#include "libslab-utils.h"
-#include "double-click-detector.h"
#define ROOT_GCONF_DIR "/desktop/gnome/applications/main-menu"
#define CURRENT_PAGE_GCONF_KEY ROOT_GCONF_DIR "/file-area/file_class"
diff --git a/main-menu/src/main-menu.c b/main-menu/src/main-menu.c
index 3def5a3..2142145 100644
--- a/main-menu/src/main-menu.c
+++ b/main-menu/src/main-menu.c
@@ -26,8 +26,8 @@
#include <panel-applet.h>
#include <libgnomeui/libgnomeui.h>
#include <string.h>
+#include <slab.h>
-#include "libslab-utils.h"
#include "main-menu-ui.h"
#include "main-menu-migration.h"
diff --git a/main-menu/src/network-status-agent.c b/main-menu/src/network-status-agent.c
index cc03ace..94abebe 100644
--- a/main-menu/src/network-status-agent.c
+++ b/main-menu/src/network-status-agent.c
@@ -36,8 +36,7 @@
#include <iwlib.h>
#include <glibtop/netlist.h>
#include <glibtop/netload.h>
-
-#include "gnome-utils.h"
+#include <slab.h>
typedef struct
{
diff --git a/main-menu/src/network-status-tile.c b/main-menu/src/network-status-tile.c
index 2c67aed..3b03e8e 100644
--- a/main-menu/src/network-status-tile.c
+++ b/main-menu/src/network-status-tile.c
@@ -23,10 +23,10 @@
#include <string.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
+#include <slab.h>
#include "network-status-agent.h"
#include "network-status-info.h"
-#include "slab-gnome-util.h"
G_DEFINE_TYPE (NetworkStatusTile, network_status_tile, NAMEPLATE_TILE_TYPE)
diff --git a/main-menu/src/network-status-tile.h b/main-menu/src/network-status-tile.h
index 146760e..345dbf4 100644
--- a/main-menu/src/network-status-tile.h
+++ b/main-menu/src/network-status-tile.h
@@ -21,7 +21,7 @@
#ifndef __NETWORK_STATUS_TILE_H__
#define __NETWORK_STATUS_TILE_H__
-#include "nameplate-tile.h"
+#include <slab.h>
G_BEGIN_DECLS
diff --git a/main-menu/src/tile-table.c b/main-menu/src/tile-table.c
index cbb6bdd..bcf21cc 100644
--- a/main-menu/src/tile-table.c
+++ b/main-menu/src/tile-table.c
@@ -20,9 +20,7 @@
#include "tile-table.h"
-#include "tile.h"
-#include "nameplate-tile.h"
-#include "libslab-utils.h"
+#include <slab.h>
G_DEFINE_TYPE (TileTable, tile_table, GTK_TYPE_TABLE)
diff --git a/main-menu/src/tile-table.h b/main-menu/src/tile-table.h
index 4597c90..79b03e6 100644
--- a/main-menu/src/tile-table.h
+++ b/main-menu/src/tile-table.h
@@ -22,9 +22,7 @@
#define __TILE_TABLE_H__
#include <gtk/gtk.h>
-
-#include "tile.h"
-#include "bookmark-agent.h"
+#include <slab.h>
G_BEGIN_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]