From 585ee2588599e295273721418db3bf4d54dd053a Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Tue, 6 Mar 2012 10:55:47 -0500
Subject: [PATCH] * #9145: fix "only <glib.h>" can be included error in gnome
 client

---
 gnome/src/actions.c                   |    2 +-
 gnome/src/conference_obj.h            |    2 +-
 gnome/src/config/addressbook-config.h |    2 +-
 gnome/src/config/hooks-config.h       |    2 +-
 gnome/src/config/shortcuts-config.h   |    2 +-
 gnome/src/eel-gconf-extensions.c      |    2 +-
 gnome/src/eel-gconf-extensions.h      |    2 +-
 gnome/src/sflphone_const.h            |    2 +-
 gnome/src/uimanager.c                 |    2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnome/src/actions.c b/gnome/src/actions.c
index 0520be8..abdbddd 100644
--- a/gnome/src/actions.c
+++ b/gnome/src/actions.c
@@ -36,7 +36,7 @@
 #else
 #include <gdk/gdkkeysyms.h>
 #endif
-#include <glib/gprintf.h>
+#include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
diff --git a/gnome/src/conference_obj.h b/gnome/src/conference_obj.h
index e7f0e3a..0e17bad 100644
--- a/gnome/src/conference_obj.h
+++ b/gnome/src/conference_obj.h
@@ -32,7 +32,7 @@
 #define __CONFERENCE_OBJ_H__
 
 #include <gtk/gtk.h>
-#include <glib/gprintf.h>
+#include <glib.h>
 #include <stdlib.h>
 #include <time.h>
 
diff --git a/gnome/src/config/addressbook-config.h b/gnome/src/config/addressbook-config.h
index cb10260..cd7a9ac 100644
--- a/gnome/src/config/addressbook-config.h
+++ b/gnome/src/config/addressbook-config.h
@@ -32,7 +32,7 @@
 #define _ADDRESS_BOOK_CONFIG
 
 #include <gtk/gtk.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #include "addressbook.h"
 #include "actions.h"
diff --git a/gnome/src/config/hooks-config.h b/gnome/src/config/hooks-config.h
index 6f51be9..e35a5b9 100644
--- a/gnome/src/config/hooks-config.h
+++ b/gnome/src/config/hooks-config.h
@@ -32,7 +32,7 @@
 #define _HOOKS_CONFIG
 
 #include <gtk/gtk.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #include "actions.h"
 #include "utils.h"
diff --git a/gnome/src/config/shortcuts-config.h b/gnome/src/config/shortcuts-config.h
index abcb424..123cb9c 100644
--- a/gnome/src/config/shortcuts-config.h
+++ b/gnome/src/config/shortcuts-config.h
@@ -32,7 +32,7 @@
 #define _SHORTCUTS_CONFIG
 
 #include <gtk/gtk.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #include "actions.h"
 #include <utils.h>
diff --git a/gnome/src/eel-gconf-extensions.c b/gnome/src/eel-gconf-extensions.c
index c1947f2..4631981 100644
--- a/gnome/src/eel-gconf-extensions.c
+++ b/gnome/src/eel-gconf-extensions.c
@@ -29,7 +29,7 @@
 #include <gconf/gconf-client.h>
 #include <gconf/gconf.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib.h>
 
 static GConfClient *global_gconf_client = NULL;
 
diff --git a/gnome/src/eel-gconf-extensions.h b/gnome/src/eel-gconf-extensions.h
index 0068b15..d380387 100644
--- a/gnome/src/eel-gconf-extensions.h
+++ b/gnome/src/eel-gconf-extensions.h
@@ -25,7 +25,7 @@
 #ifndef EEL_GCONF_EXTENSIONS_H
 #define EEL_GCONF_EXTENSIONS_H
 
-#include <glib/gerror.h>
+#include <glib.h>
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
diff --git a/gnome/src/sflphone_const.h b/gnome/src/sflphone_const.h
index 3766562..e642e0a 100644
--- a/gnome/src/sflphone_const.h
+++ b/gnome/src/sflphone_const.h
@@ -32,7 +32,7 @@
 #define __SFLPHONE_CONST_H
 
 #include <libintl.h>
-#include <glib/gi18n.h>
+#include <glib.h>
 
 /* @file sflphone_const.h
  * @brief Contains the global variables for the client code
diff --git a/gnome/src/uimanager.c b/gnome/src/uimanager.c
index 36eb623..2953156 100644
--- a/gnome/src/uimanager.c
+++ b/gnome/src/uimanager.c
@@ -36,7 +36,7 @@
 #include "assistant.h"
 #include <gtk/gtk.h>
 #include <string.h>
-#include <glib/gprintf.h>
+#include <glib.h>
 
 #include "uimanager.h"
 #include "statusicon.h"
-- 
1.7.8.6