GNOME.org
 

[vinagre] Rename source file and update includes

commit 9be4c669db0fca61b6270553ab4cf4c2a88f1751
Author: David King <amigadave amigadave com>
Date:   Sat May 7 13:15:29 2011 +0200

    Rename source file and update includes

 Makefile.am                                        |    4 ++--
 plugins/rdp/vinagre-rdp-connection.c               |    2 +-
 plugins/rdp/vinagre-rdp-tab.c                      |    2 +-
 .../vinagre-reverse-vnc-listener-dialog.c          |    2 +-
 plugins/reverse-vnc/vinagre-reverse-vnc-listener.c |    2 +-
 plugins/spice/vinagre-spice-connection.c           |    2 +-
 plugins/spice/vinagre-spice-tab.c                  |    2 +-
 plugins/ssh/vinagre-ssh-connection.c               |    2 +-
 plugins/ssh/vinagre-ssh-tab.c                      |    2 +-
 plugins/vnc/vinagre-vnc-connection.c               |    2 +-
 plugins/vnc/vinagre-vnc-tab.c                      |    2 +-
 vinagre/vinagre-bookmarks-migration.c              |    2 +-
 vinagre/vinagre-bookmarks-ui.c                     |    2 +-
 vinagre/vinagre-commands.c                         |    2 +-
 vinagre/vinagre-connect.c                          |    2 +-
 vinagre/vinagre-connection.c                       |    2 +-
 vinagre/vinagre-fav.c                              |    2 +-
 vinagre/vinagre-main.c                             |    2 +-
 vinagre/vinagre-notebook.c                         |    2 +-
 vinagre/vinagre-options.c                          |    2 +-
 vinagre/vinagre-prefs.c                            |    2 +-
 vinagre/vinagre-ssh.c                              |    2 +-
 vinagre/vinagre-tab.c                              |    2 +-
 vinagre/vinagre-tube-handler.c                     |    2 +-
 vinagre/{vinagre-utils.c => vinagre-util.c}        |    8 ++++----
 vinagre/{vinagre-utils.h => vinagre-util.h}        |    0
 vinagre/vinagre-window.c                           |    2 +-
 27 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 750125b..c4ecd39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,7 +59,7 @@ vinagreh_HEADERS = \
 	vinagre/vinagre-prefs.h \
 	vinagre/vinagre-tab.h \
 	vinagre/vinagre-ui.h \
-	vinagre/vinagre-utils.h \
+	vinagre/vinagre-util.h \
 	vinagre/vinagre-window.h \
 	vinagre/vinagre-dnd.h \
 	vinagre/vinagre-ssh.h \
@@ -95,7 +95,7 @@ handwritten_sources = \
 	vinagre/vinagre-plugin-dialog.c \
 	vinagre/vinagre-prefs.c \
 	vinagre/vinagre-tab.c \
-	vinagre/vinagre-utils.c \
+	vinagre/vinagre-util.c \
 	vinagre/vinagre-window.c \
 	vinagre/pty_open.c \
 	vinagre/vinagre-ssh.c \
diff --git a/plugins/rdp/vinagre-rdp-connection.c b/plugins/rdp/vinagre-rdp-connection.c
index 9e2c91f..23ed2ca 100644
--- a/plugins/rdp/vinagre-rdp-connection.c
+++ b/plugins/rdp/vinagre-rdp-connection.c
@@ -20,7 +20,7 @@
  */
 
 #include <glib/gi18n.h>
-#include <vinagre/vinagre-utils.h>
+#include "vinagre/vinagre-util.h"
 #include <vinagre/vinagre-cache-prefs.h>
 #include "vinagre-rdp-connection.h"
 
diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c
index 8346d8f..6ef3961 100644
--- a/plugins/rdp/vinagre-rdp-tab.c
+++ b/plugins/rdp/vinagre-rdp-tab.c
@@ -26,7 +26,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtkx.h>
 
-#include <vinagre/vinagre-utils.h>
+#include "vinagre/vinagre-util.h"
 #include <vinagre/vinagre-prefs.h>
 
 #include "vinagre-rdp-tab.h"
diff --git a/plugins/reverse-vnc/vinagre-reverse-vnc-listener-dialog.c b/plugins/reverse-vnc/vinagre-reverse-vnc-listener-dialog.c
index b7bc542..23676f4 100644
--- a/plugins/reverse-vnc/vinagre-reverse-vnc-listener-dialog.c
+++ b/plugins/reverse-vnc/vinagre-reverse-vnc-listener-dialog.c
@@ -39,7 +39,7 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include <vinagre/vinagre-utils.h>
+#include "vinagre/vinagre-util.h"
 #include <vinagre/vinagre-prefs.h>
 #include "vinagre-reverse-vnc-listener-dialog.h"
 #include "vinagre-reverse-vnc-listener.h"
diff --git a/plugins/reverse-vnc/vinagre-reverse-vnc-listener.c b/plugins/reverse-vnc/vinagre-reverse-vnc-listener.c
index 47917b1..8176e9c 100644
--- a/plugins/reverse-vnc/vinagre-reverse-vnc-listener.c
+++ b/plugins/reverse-vnc/vinagre-reverse-vnc-listener.c
@@ -35,7 +35,7 @@
 #include <glib/gi18n.h>
 
 #include <vinagre/vinagre-commands.h>
-#include <vinagre/vinagre-utils.h>
+#include "vinagre/vinagre-util.h"
 #include "vinagre-reverse-vnc-listener.h"
 #include "../vnc/vinagre-vnc-connection.h"
 
diff --git a/plugins/spice/vinagre-spice-connection.c b/plugins/spice/vinagre-spice-connection.c
index 210b462..81d2581 100644
--- a/plugins/spice/vinagre-spice-connection.c
+++ b/plugins/spice/vinagre-spice-connection.c
@@ -22,7 +22,7 @@
 
 #include <glib/gi18n.h>
 #include <stdlib.h>
-#include <vinagre/vinagre-utils.h>
+#include "vinagre/vinagre-util.h"
 #include <vinagre/vinagre-cache-prefs.h>
 
 #include "vinagre-spice-connection.h"
diff --git a/plugins/spice/vinagre-spice-tab.c b/plugins/spice/vinagre-spice-tab.c
index 435c054..570ce6c 100644
--- a/plugins/spice/vinagre-spice-tab.c
+++ b/plugins/spice/vinagre-spice-tab.c
@@ -27,7 +27,7 @@
 #include <spice-client-gtk-3.0/spice-widget.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <vinagre/vinagre-utils.h>
+#include "vinagre/vinagre-util.h"
 #include <vinagre/vinagre-prefs.h>
 
 #include "vinagre-spice-tab.h"
diff --git a/plugins/ssh/vinagre-ssh-connection.c b/plugins/ssh/vinagre-ssh-connection.c
index e4c0efc..f1214f5 100644
--- a/plugins/ssh/vinagre-ssh-connection.c
+++ b/plugins/ssh/vinagre-ssh-connection.c
@@ -20,7 +20,7 @@
  */
 
 #include <glib/gi18n.h>
-#include <vinagre/vinagre-utils.h>
+#include "vinagre/vinagre-util.h"
 #include <vinagre/vinagre-cache-prefs.h>
 #include "vinagre-ssh-connection.h"
 
diff --git a/plugins/ssh/vinagre-ssh-tab.c b/plugins/ssh/vinagre-ssh-tab.c
index 43b0147..5abfdb2 100644
--- a/plugins/ssh/vinagre-ssh-tab.c
+++ b/plugins/ssh/vinagre-ssh-tab.c
@@ -24,7 +24,7 @@
 #include <vte/vte.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <vinagre/vinagre-utils.h>
+#include "vinagre/vinagre-util.h"
 #include <vinagre/vinagre-prefs.h>
 
 #include "vinagre-ssh-tab.h"
diff --git a/plugins/vnc/vinagre-vnc-connection.c b/plugins/vnc/vinagre-vnc-connection.c
index 8a8ad87..01f63a8 100644
--- a/plugins/vnc/vinagre-vnc-connection.c
+++ b/plugins/vnc/vinagre-vnc-connection.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #include <glib/gi18n.h>
 #include <stdlib.h>
-#include <vinagre/vinagre-utils.h>
+#include "vinagre/vinagre-util.h"
 #include <vinagre/vinagre-cache-prefs.h>
 
 #include "vinagre-vnc-connection.h"
diff --git a/plugins/vnc/vinagre-vnc-tab.c b/plugins/vnc/vinagre-vnc-tab.c
index d3af930..bf4522e 100644
--- a/plugins/vnc/vinagre-vnc-tab.c
+++ b/plugins/vnc/vinagre-vnc-tab.c
@@ -24,7 +24,7 @@
 #include <vncdisplay.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <vinagre/vinagre-utils.h>
+#include "vinagre/vinagre-util.h"
 #include <vinagre/vinagre-prefs.h>
 
 #include "vinagre-vnc-tab.h"
diff --git a/vinagre/vinagre-bookmarks-migration.c b/vinagre/vinagre-bookmarks-migration.c
index 218b93d..a6650ba 100644
--- a/vinagre/vinagre-bookmarks-migration.c
+++ b/vinagre/vinagre-bookmarks-migration.c
@@ -37,7 +37,7 @@
 #include "vinagre-bookmarks.h"
 #include "vinagre-plugins-engine.h"
 #include "vinagre-dirs.h"
-#include "vinagre-utils.h"
+#include "vinagre-util.h"
 
 static void
 fill_xml (GSList *list, xmlTextWriter *writer)
diff --git a/vinagre/vinagre-bookmarks-ui.c b/vinagre/vinagre-bookmarks-ui.c
index 17a3676..31e66b8 100644
--- a/vinagre/vinagre-bookmarks-ui.c
+++ b/vinagre/vinagre-bookmarks-ui.c
@@ -23,7 +23,7 @@
 #include <glib/gi18n.h>
 
 #include "vinagre-bookmarks-ui.h"
-#include "vinagre-utils.h"
+#include "vinagre-util.h"
 #include "vinagre-bookmarks-tree.h"
 #include "vinagre-plugins-engine.h"
 
diff --git a/vinagre/vinagre-commands.c b/vinagre/vinagre-commands.c
index 278874d..d01556f 100644
--- a/vinagre/vinagre-commands.c
+++ b/vinagre/vinagre-commands.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include "vinagre-commands.h"
-#include "vinagre-utils.h"
+#include "vinagre-util.h"
 #include "vinagre-connection.h"
 #include "vinagre-notebook.h"
 #include "vinagre-tab.h"
diff --git a/vinagre/vinagre-connect.c b/vinagre/vinagre-connect.c
index 5162f88..20e2d65 100644
--- a/vinagre/vinagre-connect.c
+++ b/vinagre/vinagre-connect.c
@@ -32,7 +32,7 @@
 #endif
 
 #include "vinagre-connect.h"
-#include "vinagre-utils.h"
+#include "vinagre-util.h"
 #include "vinagre-bookmarks.h"
 #include "vinagre-prefs.h"
 #include "vinagre-cache-prefs.h"
diff --git a/vinagre/vinagre-connection.c b/vinagre/vinagre-connection.c
index 8f13273..d4b8156 100644
--- a/vinagre/vinagre-connection.c
+++ b/vinagre/vinagre-connection.c
@@ -27,7 +27,7 @@
 #include "vinagre-connection.h"
 #include "vinagre-bookmarks.h"
 #include "vinagre-plugins-engine.h"
-#include "vinagre-utils.h"
+#include "vinagre-util.h"
 
 struct _VinagreConnectionPrivate
 {
diff --git a/vinagre/vinagre-fav.c b/vinagre/vinagre-fav.c
index b0ddb5d..33aaea3 100644
--- a/vinagre/vinagre-fav.c
+++ b/vinagre/vinagre-fav.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n.h>
 #include "vinagre-fav.h"
-#include "vinagre-utils.h"
+#include "vinagre-util.h"
 #include "vinagre-dnd.h"
 #include "vinagre-bookmarks.h"
 #include "vinagre-bookmarks-ui.h"
diff --git a/vinagre/vinagre-main.c b/vinagre/vinagre-main.c
index 172875c..f3cdfa8 100644
--- a/vinagre/vinagre-main.c
+++ b/vinagre/vinagre-main.c
@@ -31,7 +31,7 @@
 #include <locale.h>
 
 #include "vinagre-window.h"
-#include "vinagre-utils.h"
+#include "vinagre-util.h"
 #include "vinagre-prefs.h"
 #include "vinagre-cache-prefs.h"
 #include "vinagre-debug.h"
diff --git a/vinagre/vinagre-notebook.c b/vinagre/vinagre-notebook.c
index d349e6f..883f2c8 100644
--- a/vinagre/vinagre-notebook.c
+++ b/vinagre/vinagre-notebook.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n.h>
 
-#include "vinagre-utils.h"
+#include "vinagre-util.h"
 #include "vinagre-dnd.h"
 #include "vinagre-prefs.h"
 
diff --git a/vinagre/vinagre-options.c b/vinagre/vinagre-options.c
index df0da47..165010f 100644
--- a/vinagre/vinagre-options.c
+++ b/vinagre/vinagre-options.c
@@ -23,7 +23,7 @@
 #include "vinagre-connection.h"
 #include "vinagre-window.h"
 #include "vinagre-commands.h"
-#include "vinagre-utils.h"
+#include "vinagre-util.h"
 
 const GOptionEntry all_options [] =
 {
diff --git a/vinagre/vinagre-prefs.c b/vinagre/vinagre-prefs.c
index 36cf73d..5366e8a 100644
--- a/vinagre/vinagre-prefs.c
+++ b/vinagre/vinagre-prefs.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #include <glib/gi18n.h>
 #include "vinagre-prefs.h"
-#include "vinagre-utils.h"
+#include "vinagre-util.h"
 
 #define VINAGRE_SCHEMA_NAME		"org.gnome.Vinagre"
 #define VM_ALWAYS_SHOW_TABS		"always-show-tabs"
diff --git a/vinagre/vinagre-ssh.c b/vinagre/vinagre-ssh.c
index b7f8947..7a95985 100644
--- a/vinagre/vinagre-ssh.c
+++ b/vinagre/vinagre-ssh.c
@@ -30,7 +30,7 @@
 #include <gnome-keyring.h>
 
 #include "vinagre-ssh.h"
-#include "vinagre-utils.h"
+#include "vinagre-util.h"
 #include "pty_open.h"
 
 #define SSH_READ_TIMEOUT 40   /* seconds */
diff --git a/vinagre/vinagre-tab.c b/vinagre/vinagre-tab.c
index 57e06de..4836b35 100644
--- a/vinagre/vinagre-tab.c
+++ b/vinagre/vinagre-tab.c
@@ -28,7 +28,7 @@
 
 #include "vinagre-tab.h"
 #include "vinagre-notebook.h"
-#include "vinagre-utils.h"
+#include "vinagre-util.h"
 #include "vinagre-prefs.h"
 #include "view/autoDrawer.h"
 #include "vinagre-plugins-engine.h"
diff --git a/vinagre/vinagre-tube-handler.c b/vinagre/vinagre-tube-handler.c
index 16e4f9e..dbeb048 100644
--- a/vinagre/vinagre-tube-handler.c
+++ b/vinagre/vinagre-tube-handler.c
@@ -39,7 +39,7 @@
 #include "vinagre-debug.h"
 #include "vinagre-protocol.h"
 #include "vinagre-plugins-engine.h"
-#include "vinagre-utils.h"
+#include "vinagre-util.h"
 
 G_DEFINE_TYPE (VinagreTubeHandler, vinagre_tube_handler, G_TYPE_OBJECT);
 
diff --git a/vinagre/vinagre-utils.c b/vinagre/vinagre-util.c
similarity index 99%
rename from vinagre/vinagre-utils.c
rename to vinagre/vinagre-util.c
index 80975a0..a5d854b 100644
--- a/vinagre/vinagre-utils.c
+++ b/vinagre/vinagre-util.c
@@ -20,7 +20,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include "vinagre-utils.h"
+#include "vinagre-util.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -51,7 +51,7 @@ vinagre_utils_show_error (const gchar *title, const gchar *message, GtkWindow *p
 					      message);
 
   g_signal_connect_swapped (d,
-			    "response", 
+			    "response",
 			    G_CALLBACK (gtk_widget_destroy),
 			    d);
   gtk_widget_show_all (GTK_WIDGET(d));
@@ -137,7 +137,7 @@ vinagre_utils_get_builder (const gchar *filename)
 /*
  * Doubles underscore to avoid spurious menu accels.
  */
-gchar * 
+gchar *
 vinagre_utils_escape_underscores (const gchar* text,
 				  gssize       length)
 {
@@ -196,7 +196,7 @@ vinagre_utils_help_contents (GtkWindow *window, const gchar *section)
 		&error);
 
   g_free (uri);
-  if (error != NULL) 
+  if (error != NULL)
     {
       vinagre_utils_show_error (NULL, error->message, GTK_IS_WINDOW (window) ? window : NULL);
       g_error_free (error);
diff --git a/vinagre/vinagre-utils.h b/vinagre/vinagre-util.h
similarity index 100%
rename from vinagre/vinagre-utils.h
rename to vinagre/vinagre-util.h
diff --git a/vinagre/vinagre-window.c b/vinagre/vinagre-window.c
index 15b1cc2..0a4d1e0 100644
--- a/vinagre/vinagre-window.c
+++ b/vinagre/vinagre-window.c
@@ -37,7 +37,7 @@
 #include "vinagre-fav.h"
 #include "vinagre-prefs.h"
 #include "vinagre-cache-prefs.h"
-#include "vinagre-utils.h"
+#include "vinagre-util.h"
 #include "vinagre-bookmarks.h"
 #include "vinagre-ui.h"
 #include "vinagre-window-private.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]