vinagre r411 - in trunk: . src

[wbolster svn gnome org]

Author: wbolster
Date: Sat Jul 26 12:00:35 2008
New Revision: 411
URL: http://svn.gnome.org/viewvc/vinagre?rev=411&view=rev

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

	Bug 544736 â Use single GTK+ includes

	* src/gossip-cell-renderer-expander.c:
	* src/gossip-cell-renderer-expander.h:
	* src/vinagre-app.c:
	* src/vinagre-app.h:
	* src/vinagre-applet.c:
	* src/vinagre-bacon.c:
	* src/vinagre-bacon.h:
	* src/vinagre-bookmarks.c:
	* src/vinagre-bookmarks.h:
	* src/vinagre-commands.c:
	* src/vinagre-commands.h:
	* src/vinagre-connect.c:
	* src/vinagre-connection.c:
	* src/vinagre-connection.h:
	* src/vinagre-fav.c:
	* src/vinagre-main.c:
	* src/vinagre-mdns.h:
	* src/vinagre-notebook.c:
	* src/vinagre-notebook.h:
	* src/vinagre-prefs.c:
	* src/vinagre-prefs.h:
	* src/vinagre-tab.c:
	* src/vinagre-tab.h:
	* src/vinagre-ui.h:
	* src/vinagre-utils.c:
	* src/vinagre-utils.h:
	* src/vinagre-window-private.h:
	* src/vinagre-window.c:
	* src/vinagre-window.h:

	Use single <gtk/gtk.h> includes. Also fixed malformed
	Vim modelines.



Modified:
   trunk/ChangeLog
   trunk/src/gossip-cell-renderer-expander.c
   trunk/src/gossip-cell-renderer-expander.h
   trunk/src/vinagre-app.c
   trunk/src/vinagre-app.h
   trunk/src/vinagre-applet.c
   trunk/src/vinagre-bacon.c
   trunk/src/vinagre-bacon.h
   trunk/src/vinagre-bookmarks.c
   trunk/src/vinagre-bookmarks.h
   trunk/src/vinagre-commands.c
   trunk/src/vinagre-commands.h
   trunk/src/vinagre-connect.c
   trunk/src/vinagre-connection.c
   trunk/src/vinagre-connection.h
   trunk/src/vinagre-fav.c
   trunk/src/vinagre-main.c
   trunk/src/vinagre-mdns.h
   trunk/src/vinagre-notebook.c
   trunk/src/vinagre-notebook.h
   trunk/src/vinagre-prefs.c
   trunk/src/vinagre-prefs.h
   trunk/src/vinagre-tab.c
   trunk/src/vinagre-tab.h
   trunk/src/vinagre-ui.h
   trunk/src/vinagre-utils.c
   trunk/src/vinagre-utils.h
   trunk/src/vinagre-window-private.h
   trunk/src/vinagre-window.c
   trunk/src/vinagre-window.h

Modified: trunk/src/gossip-cell-renderer-expander.c
==============================================================================
--- trunk/src/gossip-cell-renderer-expander.c	(original)
+++ trunk/src/gossip-cell-renderer-expander.c	Sat Jul 26 12:00:35 2008
@@ -29,7 +29,7 @@
 
 #include "config.h"
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 #include "gossip-cell-renderer-expander.h"
 

Modified: trunk/src/gossip-cell-renderer-expander.h
==============================================================================
--- trunk/src/gossip-cell-renderer-expander.h	(original)
+++ trunk/src/gossip-cell-renderer-expander.h	Sat Jul 26 12:00:35 2008
@@ -21,7 +21,7 @@
 #ifndef __GOSSIP_CELL_RENDERER_EXPANDER_H__
 #define __GOSSIP_CELL_RENDERER_EXPANDER_H__
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/vinagre-app.c
==============================================================================
--- trunk/src/vinagre-app.c	(original)
+++ trunk/src/vinagre-app.c	Sat Jul 26 12:00:35 2008
@@ -317,4 +317,4 @@
   return NULL;
 }
 
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-app.h
==============================================================================
--- trunk/src/vinagre-app.h	(original)
+++ trunk/src/vinagre-app.h	Sat Jul 26 12:00:35 2008
@@ -71,4 +71,4 @@
 G_END_DECLS
 
 #endif  /* __VINAGRE_APP_H__  */
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-applet.c
==============================================================================
--- trunk/src/vinagre-applet.c	(original)
+++ trunk/src/vinagre-applet.c	Sat Jul 26 12:00:35 2008
@@ -20,8 +20,8 @@
 
 #include <string.h>
 #include <glib.h>
+#include <gtk/gtk.h>
 #include <panel-applet.h>
-#include <gtk/gtklabel.h>
 #include "vinagre-bookmarks.h"
 #include "vinagre-mdns.h"
 #include "vinagre-utils.h"

Modified: trunk/src/vinagre-bacon.c
==============================================================================
--- trunk/src/vinagre-bacon.c	(original)
+++ trunk/src/vinagre-bacon.c	Sat Jul 26 12:00:35 2008
@@ -286,4 +286,4 @@
 					     NULL);
     }
 }
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-bacon.h
==============================================================================
--- trunk/src/vinagre-bacon.h	(original)
+++ trunk/src/vinagre-bacon.h	Sat Jul 26 12:00:35 2008
@@ -24,4 +24,4 @@
 void	vinagre_bacon_start (GSList *servers, gboolean new_window);
 
 #endif  /* __VINAGRE_BACON_H__  */
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-bookmarks.c
==============================================================================
--- trunk/src/vinagre-bookmarks.c	(original)
+++ trunk/src/vinagre-bookmarks.c	Sat Jul 26 12:00:35 2008
@@ -618,4 +618,4 @@
   g_signal_emit (book, signals[BOOKMARK_CHANGED], 0);
 }
 
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-bookmarks.h
==============================================================================
--- trunk/src/vinagre-bookmarks.h	(original)
+++ trunk/src/vinagre-bookmarks.h	Sat Jul 26 12:00:35 2008
@@ -75,4 +75,4 @@
 
 G_END_DECLS
 #endif  /* __VINAGRE_BOOKMARKS_H__ */
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-commands.c
==============================================================================
--- trunk/src/vinagre-commands.c	(original)
+++ trunk/src/vinagre-commands.c	Sat Jul 26 12:00:35 2008
@@ -384,4 +384,4 @@
   vinagre_utils_help_about (GTK_WINDOW (window));
 }
 
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-commands.h
==============================================================================
--- trunk/src/vinagre-commands.h	(original)
+++ trunk/src/vinagre-commands.h	Sat Jul 26 12:00:35 2008
@@ -80,4 +80,4 @@
 G_END_DECLS
 
 #endif /* __VINAGRE_COMMANDS_H__ */ 
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-connect.c
==============================================================================
--- trunk/src/vinagre-connect.c	(original)
+++ trunk/src/vinagre-connect.c	Sat Jul 26 12:00:35 2008
@@ -18,9 +18,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
 #include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <avahi-ui/avahi-ui.h>
 #include <string.h>
@@ -270,4 +270,4 @@
   g_object_unref (dialog.xml);
   return conn;
 }
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-connection.c
==============================================================================
--- trunk/src/vinagre-connection.c	(original)
+++ trunk/src/vinagre-connection.c	Sat Jul 26 12:00:35 2008
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 
 #include "vinagre-connection.h"
 #include "vinagre-enums.h"
@@ -759,4 +759,4 @@
   return result;
 }
 
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-connection.h
==============================================================================
--- trunk/src/vinagre-connection.h	(original)
+++ trunk/src/vinagre-connection.h	Sat Jul 26 12:00:35 2008
@@ -114,4 +114,4 @@
 G_END_DECLS
 
 #endif /* __VINAGRE_CONNECTION_H__  */
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-fav.c
==============================================================================
--- trunk/src/vinagre-fav.c	(original)
+++ trunk/src/vinagre-fav.c	Sat Jul 26 12:00:35 2008
@@ -844,4 +844,4 @@
 
   return FALSE;
 }
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-main.c
==============================================================================
--- trunk/src/vinagre-main.c	(original)
+++ trunk/src/vinagre-main.c	Sat Jul 26 12:00:35 2008
@@ -18,12 +18,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/goption.h>
+#include <gtk/gtk.h>
 
-#include <config.h>
 #include "vinagre-connection.h"
 #include "vinagre-commands.h"
 #include "vinagre-bookmarks.h"
@@ -172,4 +174,4 @@
 
   return 0;
 }
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-mdns.h
==============================================================================
--- trunk/src/vinagre-mdns.h	(original)
+++ trunk/src/vinagre-mdns.h	Sat Jul 26 12:00:35 2008
@@ -59,4 +59,4 @@
 G_END_DECLS
 
 #endif /* _VINAGRE_MDNS_H_ */
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-notebook.c
==============================================================================
--- trunk/src/vinagre-notebook.c	(original)
+++ trunk/src/vinagre-notebook.c	Sat Jul 26 12:00:35 2008
@@ -284,4 +284,4 @@
 			(GtkCallback) remove_tab,
 			 nb);
 }
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-notebook.h
==============================================================================
--- trunk/src/vinagre-notebook.h	(original)
+++ trunk/src/vinagre-notebook.h	Sat Jul 26 12:00:35 2008
@@ -22,7 +22,7 @@
 #define __VINAGRE_NOTEBOOK_H__
 
 #include <glib.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
@@ -97,4 +97,4 @@
 G_END_DECLS
 
 #endif /* __VINAGRE_NOTEBOOK_H__ */
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-prefs.c
==============================================================================
--- trunk/src/vinagre-prefs.c	(original)
+++ trunk/src/vinagre-prefs.c	Sat Jul 26 12:00:35 2008
@@ -379,4 +379,4 @@
 						     G_PARAM_READWRITE));
 
 }
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-prefs.h
==============================================================================
--- trunk/src/vinagre-prefs.h	(original)
+++ trunk/src/vinagre-prefs.h	Sat Jul 26 12:00:35 2008
@@ -54,4 +54,4 @@
 G_END_DECLS
 
 #endif /* _VINAGRE_PREFS_H_ */
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-tab.c
==============================================================================
--- trunk/src/vinagre-tab.c	(original)
+++ trunk/src/vinagre-tab.c	Sat Jul 26 12:00:35 2008
@@ -1098,4 +1098,4 @@
   return tab->priv->pointer_grab;
 }
 
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-tab.h
==============================================================================
--- trunk/src/vinagre-tab.h	(original)
+++ trunk/src/vinagre-tab.h	Sat Jul 26 12:00:35 2008
@@ -101,4 +101,4 @@
 G_END_DECLS
 
 #endif  /* __VINAGRE_TAB_H__  */
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-ui.h
==============================================================================
--- trunk/src/vinagre-ui.h	(original)
+++ trunk/src/vinagre-ui.h	Sat Jul 26 12:00:35 2008
@@ -115,4 +115,4 @@
 G_END_DECLS
 
 #endif  /* __VINAGRE_UI_H__  */
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-utils.c
==============================================================================
--- trunk/src/vinagre-utils.c	(original)
+++ trunk/src/vinagre-utils.c	Sat Jul 26 12:00:35 2008
@@ -488,4 +488,4 @@
   g_free (license_trans);
 }
 
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-utils.h
==============================================================================
--- trunk/src/vinagre-utils.h	(original)
+++ trunk/src/vinagre-utils.h	Sat Jul 26 12:00:35 2008
@@ -59,4 +59,4 @@
 void		vinagre_utils_help_contents		(GtkWindow *window);
 void		vinagre_utils_help_about		(GtkWindow *window);
 #endif  /* __VINAGRE_UTILS_H__  */
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-window-private.h
==============================================================================
--- trunk/src/vinagre-window-private.h	(original)
+++ trunk/src/vinagre-window-private.h	Sat Jul 26 12:00:35 2008
@@ -74,4 +74,4 @@
 G_END_DECLS
 
 #endif  /* __VINAGRE_WINDOW_PRIVATE_H__  */
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-window.c
==============================================================================
--- trunk/src/vinagre-window.c	(original)
+++ trunk/src/vinagre-window.c	Sat Jul 26 12:00:35 2008
@@ -1231,4 +1231,4 @@
   return tab;
 }
 
-/* vim: ts=8 */
+/* vim: set ts=8: */

Modified: trunk/src/vinagre-window.h
==============================================================================
--- trunk/src/vinagre-window.h	(original)
+++ trunk/src/vinagre-window.h	Sat Jul 26 12:00:35 2008
@@ -99,4 +99,4 @@
 G_END_DECLS
 
 #endif  /* __VINAGRE_WINDOW_H__  */
-/* vim: ts=8 */
+/* vim: set ts=8: */