[gnome-main-menu] Use <libslab/slab.h> as single include.
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-main-menu] Use <libslab/slab.h> as single include.
- Date: Thu, 23 Jul 2009 23:01:36 +0000 (UTC)
commit a5bba4d51ae3c0dc55901a58e9bb3d3e40446a88
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Sun Jul 12 19:30:55 2009 +0200
Use <libslab/slab.h> as single include.
application-browser/src/application-browser.c | 2 +-
main-menu/src/hard-drive-status-tile.c | 1 -
main-menu/src/hard-drive-status-tile.h | 2 +-
main-menu/src/main-menu-migration.c | 6 +-----
main-menu/src/main-menu-ui.c | 3 ++-
main-menu/src/main-menu.c | 2 +-
main-menu/src/network-status-agent.c | 2 +-
main-menu/src/network-status-tile.c | 1 -
main-menu/src/network-status-tile.h | 2 +-
main-menu/src/tile-table.c | 2 --
main-menu/src/tile-table.h | 2 +-
11 files changed, 9 insertions(+), 16 deletions(-)
---
diff --git a/application-browser/src/application-browser.c b/application-browser/src/application-browser.c
index 2608cd2..38ef3eb 100644
--- a/application-browser/src/application-browser.c
+++ b/application-browser/src/application-browser.c
@@ -27,7 +27,7 @@
#include <unique/unique.h>
#include <stdlib.h>
#include <glib/gi18n.h>
-#include <slab.h>
+#include <libslab/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 4a5c74a..16026dc 100644
--- a/main-menu/src/hard-drive-status-tile.c
+++ b/main-menu/src/hard-drive-status-tile.c
@@ -24,7 +24,6 @@
#include <sys/statvfs.h>
#include <glib/gi18n.h>
#include <gconf/gconf-client.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 438eb55..4fafd4f 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 <slab.h>
+#include <libslab/slab.h>
G_BEGIN_DECLS
diff --git a/main-menu/src/main-menu-migration.c b/main-menu/src/main-menu-migration.c
index 9dd7bfd..fc86961 100644
--- a/main-menu/src/main-menu-migration.c
+++ b/main-menu/src/main-menu-migration.c
@@ -29,11 +29,7 @@
#include <glib/gstdio.h>
#include <unistd.h>
-#if ! GLIB_CHECK_VERSION (2, 12, 0)
-# include "bookmark-agent-libslab.h"
-#endif
-
-#include <slab.h>
+#include <libslab/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 e3b39a1..2006cf3 100644
--- a/main-menu/src/main-menu-ui.c
+++ b/main-menu/src/main-menu-ui.c
@@ -34,7 +34,8 @@
#include <X11/Xlib.h>
#include <gdk/gdkx.h>
#include <gio/gio.h>
-#include <slab.h>
+#include <unistd.h>
+#include <libslab/slab.h>
#include "hard-drive-status-tile.h"
#include "network-status-tile.h"
diff --git a/main-menu/src/main-menu.c b/main-menu/src/main-menu.c
index 2142145..476805b 100644
--- a/main-menu/src/main-menu.c
+++ b/main-menu/src/main-menu.c
@@ -26,7 +26,7 @@
#include <panel-applet.h>
#include <libgnomeui/libgnomeui.h>
#include <string.h>
-#include <slab.h>
+#include <libslab/slab.h>
#include "main-menu-ui.h"
diff --git a/main-menu/src/network-status-agent.c b/main-menu/src/network-status-agent.c
index 94abebe..6568dcd 100644
--- a/main-menu/src/network-status-agent.c
+++ b/main-menu/src/network-status-agent.c
@@ -36,7 +36,7 @@
#include <iwlib.h>
#include <glibtop/netlist.h>
#include <glibtop/netload.h>
-#include <slab.h>
+#include <libslab/slab.h>
typedef struct
{
diff --git a/main-menu/src/network-status-tile.c b/main-menu/src/network-status-tile.c
index 3b03e8e..3b31cfd 100644
--- a/main-menu/src/network-status-tile.c
+++ b/main-menu/src/network-status-tile.c
@@ -23,7 +23,6 @@
#include <string.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
-#include <slab.h>
#include "network-status-agent.h"
#include "network-status-info.h"
diff --git a/main-menu/src/network-status-tile.h b/main-menu/src/network-status-tile.h
index 345dbf4..2800195 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 <slab.h>
+#include <libslab/slab.h>
G_BEGIN_DECLS
diff --git a/main-menu/src/tile-table.c b/main-menu/src/tile-table.c
index bcf21cc..7c709bf 100644
--- a/main-menu/src/tile-table.c
+++ b/main-menu/src/tile-table.c
@@ -20,8 +20,6 @@
#include "tile-table.h"
-#include <slab.h>
-
G_DEFINE_TYPE (TileTable, tile_table, GTK_TYPE_TABLE)
typedef struct {
diff --git a/main-menu/src/tile-table.h b/main-menu/src/tile-table.h
index 79b03e6..2cff95f 100644
--- a/main-menu/src/tile-table.h
+++ b/main-menu/src/tile-table.h
@@ -22,7 +22,7 @@
#define __TILE_TABLE_H__
#include <gtk/gtk.h>
-#include <slab.h>
+#include <libslab/slab.h>
G_BEGIN_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]