vino r881 - in trunk: . server session

[wbolster svn gnome org]

Author: wbolster
Date: Sat Jul 26 11:59:04 2008
New Revision: 881
URL: http://svn.gnome.org/viewvc/vino?rev=881&view=rev

Log:
2008-07-26  Wouter Bolsterlee  <wbolster svn gnome org>

	Bug 544735 â Use single GTK+ includes

	* server/vino-http.c:
	* server/vino-shell.c:
	* server/vino-status-icon.h:
	* session/vino-session.c:

	Use single <gtk/gtk.h> includes.



Modified:
   trunk/ChangeLog
   trunk/server/vino-http.c
   trunk/server/vino-shell.c
   trunk/server/vino-status-icon.h
   trunk/session/vino-session.c

Modified: trunk/server/vino-http.c
==============================================================================
--- trunk/server/vino-http.c	(original)
+++ trunk/server/vino-http.c	Sat Jul 26 11:59:04 2008
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 
 #include "vino-util.h"
 #include "vino-mdns.h"

Modified: trunk/server/vino-shell.c
==============================================================================
--- trunk/server/vino-shell.c	(original)
+++ trunk/server/vino-shell.c	Sat Jul 26 11:59:04 2008
@@ -26,7 +26,7 @@
 
 #include <string.h>
 #include <gdk/gdkdisplay.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-object.h>
 #include "GNOME_RemoteDesktop.h"

Modified: trunk/server/vino-status-icon.h
==============================================================================
--- trunk/server/vino-status-icon.h	(original)
+++ trunk/server/vino-status-icon.h	Sat Jul 26 11:59:04 2008
@@ -23,7 +23,7 @@
 #ifndef __VINO_STATUS_ICON_H__
 #define __VINO_STATUS_ICON_H__
 
-#include <gtk/gtkstatusicon.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/session/vino-session.c
==============================================================================
--- trunk/session/vino-session.c	(original)
+++ trunk/session/vino-session.c	Sat Jul 26 11:59:04 2008
@@ -26,10 +26,10 @@
 #include <string.h>
 #include <time.h>
 #include <libbonobo.h>
+#include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <gdk/gdkdisplay.h>
-#include <gtk/gtkmain.h>
-#include <glib/gi18n.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-client.h>
 #include <libgnomeui/gnome-ui-init.h>