ekiga r7327 - in trunk: . lib/gui

[sfre svn gnome org]

Author: sfre
Date: Tue Nov 11 18:11:52 2008
New Revision: 7327
URL: http://svn.gnome.org/viewvc/ekiga?rev=7327&view=rev

Log:
Clean up GLib and GTK+ includes

GTK+ is moving toward a model where it is only allowed to include the
'toplevel' headers <glib.h>, <gdk/gdk.h>, <gdk-pixbuf/gdk-pixbuf.h> and
<gtk/gtk.h> can be directly included.

Now Ekiga compiles with
  make CFLAGS+="-DG_DISABLE_SINGLE_INCLUDES
                -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES
                -DGTK_DISABLE_SINGLE_INCLUDES"

Modified:
   trunk/ChangeLog
   trunk/lib/gui/gm-cell-renderer-bitext.h
   trunk/lib/gui/gmcellrendererexpander.c
   trunk/lib/gui/gmcellrendererexpander.h
   trunk/lib/gui/gmlevelmeter.h
   trunk/lib/gui/gmpowermeter.c
   trunk/lib/gui/gmpowermeter.h

Modified: trunk/lib/gui/gm-cell-renderer-bitext.h
==============================================================================
--- trunk/lib/gui/gm-cell-renderer-bitext.h	(original)
+++ trunk/lib/gui/gm-cell-renderer-bitext.h	Tue Nov 11 18:11:52 2008
@@ -41,7 +41,7 @@
 #ifndef __GM_CELL_RENDERER_BITEXT_H__
 #define __GM_CELL_RENDERER_BITEXT_H__
 
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS typedef struct _GmCellRendererBitext GmCellRendererBitext;
 typedef struct _GmCellRendererBitextClass GmCellRendererBitextClass;

Modified: trunk/lib/gui/gmcellrendererexpander.c
==============================================================================
--- trunk/lib/gui/gmcellrendererexpander.c	(original)
+++ trunk/lib/gui/gmcellrendererexpander.c	Tue Nov 11 18:11:52 2008
@@ -28,7 +28,7 @@
  *     start the new one).
  */
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 #include "gmcellrendererexpander.h"
 

Modified: trunk/lib/gui/gmcellrendererexpander.h
==============================================================================
--- trunk/lib/gui/gmcellrendererexpander.h	(original)
+++ trunk/lib/gui/gmcellrendererexpander.h	Tue Nov 11 18:11:52 2008
@@ -22,7 +22,7 @@
 #ifndef __GM_CELL_RENDERER_EXPANDER_H__
 #define __GM_CELL_RENDERER_EXPANDER_H__
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/lib/gui/gmlevelmeter.h
==============================================================================
--- trunk/lib/gui/gmlevelmeter.h	(original)
+++ trunk/lib/gui/gmlevelmeter.h	Tue Nov 11 18:11:52 2008
@@ -40,7 +40,7 @@
 #define __GTK_LEVELMETER_H__
 
 #include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <stdlib.h>
 

Modified: trunk/lib/gui/gmpowermeter.c
==============================================================================
--- trunk/lib/gui/gmpowermeter.c	(original)
+++ trunk/lib/gui/gmpowermeter.c	Tue Nov 11 18:11:52 2008
@@ -26,7 +26,7 @@
  */
 
 
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 #include <math.h>
 
 #include "gmpowermeter.h"

Modified: trunk/lib/gui/gmpowermeter.h
==============================================================================
--- trunk/lib/gui/gmpowermeter.h	(original)
+++ trunk/lib/gui/gmpowermeter.h	Tue Nov 11 18:11:52 2008
@@ -49,8 +49,7 @@
 #define __GM_POWERMETER_H__
 
 #include <glib.h>
-#include <gtk/gtkimage.h>
-#include <gdk/gdkpixbuf.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS