[vinagre] Drop VinagreProtocolExt
- From: Jonh Wendell <jwendell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vinagre] Drop VinagreProtocolExt
- Date: Wed, 1 Sep 2010 18:18:25 +0000 (UTC)
commit da5ff8e928eef88603e7d72af40d7cc1faa53321
Author: Jonh Wendell <jwendell gnome org>
Date: Wed Sep 1 15:17:05 2010 -0300
Drop VinagreProtocolExt
We can now talk "directly" to the Extension
vinagre/Makefile.am | 3 -
vinagre/vinagre-applet.c | 1 -
vinagre/vinagre-bookmarks-migration.c | 5 +-
vinagre/vinagre-bookmarks-ui.c | 7 +-
vinagre/vinagre-bookmarks.c | 5 +-
vinagre/vinagre-commands.c | 1 -
vinagre/vinagre-connect.c | 13 +-
vinagre/vinagre-connection.c | 23 ++--
vinagre/vinagre-fav.c | 5 +-
vinagre/vinagre-main.c | 5 +-
vinagre/vinagre-mdns.c | 1 -
vinagre/vinagre-plugins-engine.c | 2 +-
vinagre/vinagre-plugins-engine.h | 4 +-
vinagre/vinagre-protocol-ext.c | 197 ---------------------------------
vinagre/vinagre-protocol-ext.h | 60 ----------
vinagre/vinagre-protocol.c | 2 +-
vinagre/vinagre-tab.c | 13 +-
vinagre/vinagre-window.c | 5 +-
18 files changed, 40 insertions(+), 312 deletions(-)
---
diff --git a/vinagre/Makefile.am b/vinagre/Makefile.am
index 27cd178..532bb0f 100644
--- a/vinagre/Makefile.am
+++ b/vinagre/Makefile.am
@@ -46,7 +46,6 @@ INST_H_FILES = \
vinagre-ssh.h \
vinagre-cache-prefs.h \
vinagre-protocol.h \
- vinagre-protocol-ext.h \
vinagre-plugins-engine.h \
$(NULL)
@@ -81,7 +80,6 @@ handwritten_sources = \
vinagre-ssh.c \
vinagre-cache-prefs.c \
vinagre-protocol.c \
- vinagre-protocol-ext.c \
vinagre-plugins-engine.c \
$(NULL)
@@ -178,7 +176,6 @@ vinagre_applet_SOURCES = \
vinagre-ssh.h vinagre-ssh.c \
vinagre-cache-prefs.h vinagre-cache-prefs.c \
vinagre-protocol.h vinagre-protocol.c \
- vinagre-protocol-ext.h vinagre-protocol-ext.c \
vinagre-plugins-engine.h vinagre-plugins-engine.c \
$(NULL)
diff --git a/vinagre/vinagre-applet.c b/vinagre/vinagre-applet.c
index b51fabb..694b3aa 100644
--- a/vinagre/vinagre-applet.c
+++ b/vinagre/vinagre-applet.c
@@ -30,7 +30,6 @@
#include "vinagre-utils.h"
#include "vinagre-connection.h"
#include "vinagre-commands.h"
-#include "vinagre-protocol-ext.h"
#include "vinagre-plugins-engine.h"
#include <config.h>
diff --git a/vinagre/vinagre-bookmarks-migration.c b/vinagre/vinagre-bookmarks-migration.c
index f6debaa..4105e4a 100644
--- a/vinagre/vinagre-bookmarks-migration.c
+++ b/vinagre/vinagre-bookmarks-migration.c
@@ -34,7 +34,6 @@
#include "vinagre-connection.h"
#include "vinagre-bookmarks-migration.h"
#include "vinagre-bookmarks.h"
-#include "vinagre-protocol-ext.h"
#include "vinagre-plugins-engine.h"
#include "vinagre-dirs.h"
#include "vinagre-utils.h"
@@ -156,7 +155,7 @@ create_list (GKeyFile *kf)
GSList *entries;
gchar **conns;
gsize length, i;
- VinagreProtocolExt *ext;
+ VinagreProtocol *ext;
ext = vinagre_plugins_engine_get_plugin_by_protocol (vinagre_plugins_engine_get_default (), "vnc");
@@ -178,7 +177,7 @@ create_list (GKeyFile *kf)
if (!s_value)
continue;
- conn = vinagre_protocol_ext_new_connection (ext);
+ conn = vinagre_protocol_new_connection (ext);
i_value = g_key_file_get_integer (kf, conns[i], "port", NULL);
if (i_value == 0)
i_value = 5900;
diff --git a/vinagre/vinagre-bookmarks-ui.c b/vinagre/vinagre-bookmarks-ui.c
index 91c7d4e..7869cfb 100644
--- a/vinagre/vinagre-bookmarks-ui.c
+++ b/vinagre/vinagre-bookmarks-ui.c
@@ -24,7 +24,6 @@
#include "vinagre-bookmarks-ui.h"
#include "vinagre-utils.h"
#include "vinagre-bookmarks-tree.h"
-#include "vinagre-protocol-ext.h"
#include "vinagre-plugins-engine.h"
static void
@@ -126,7 +125,7 @@ show_dialog_conn (VinagreBookmarks *book,
GtkWidget *plugin_options, *protocol_label;
VinagreConnection *conn;
const gchar *name;
- VinagreProtocolExt *ext;
+ VinagreProtocol *ext;
gchar **props;
xml = vinagre_utils_get_builder (NULL);
@@ -157,13 +156,13 @@ show_dialog_conn (VinagreBookmarks *book,
ext = vinagre_plugins_engine_get_plugin_by_protocol (vinagre_plugins_engine_get_default (),
vinagre_connection_get_protocol (conn));
- plugin_options = vinagre_protocol_ext_get_connect_widget (ext, conn);
+ plugin_options = vinagre_protocol_get_connect_widget (ext, conn);
if (plugin_options)
gtk_box_pack_start (GTK_BOX (plugin_box), plugin_options, TRUE, TRUE, 0);
else
gtk_widget_hide (plugin_box);
- props = vinagre_protocol_ext_get_public_description (ext);
+ props = vinagre_protocol_get_public_description (ext);
/* Translators: %s is a protocol name, like VNC or SSH */
str = g_strdup_printf (_("(Protocol: %s)"), props[0]);
gtk_label_set_label (GTK_LABEL (protocol_label), str);
diff --git a/vinagre/vinagre-bookmarks.c b/vinagre/vinagre-bookmarks.c
index 8ce69a9..25671d2 100644
--- a/vinagre/vinagre-bookmarks.c
+++ b/vinagre/vinagre-bookmarks.c
@@ -30,7 +30,6 @@
#include "vinagre-connection.h"
#include "vinagre-plugins-engine.h"
#include "vinagre-dirs.h"
-#include "vinagre-protocol-ext.h"
struct _VinagreBookmarksPrivate
{
@@ -242,7 +241,7 @@ vinagre_bookmarks_parse_item (xmlNode *root)
xmlNode *curr;
xmlChar *s_value;
gchar *protocol = NULL;
- VinagreProtocolExt *ext;
+ VinagreProtocol *ext;
/* Loop to discover the protocol */
for (curr = root->children; curr; curr = curr->next)
@@ -267,7 +266,7 @@ vinagre_bookmarks_parse_item (xmlNode *root)
goto out;
}
- conn = vinagre_protocol_ext_new_connection (ext);
+ conn = vinagre_protocol_new_connection (ext);
vinagre_connection_parse_item (conn, root);
if (vinagre_connection_get_host (conn))
diff --git a/vinagre/vinagre-commands.c b/vinagre/vinagre-commands.c
index 4597f43..7c1be5c 100644
--- a/vinagre/vinagre-commands.c
+++ b/vinagre/vinagre-commands.c
@@ -39,7 +39,6 @@
#include "vinagre-window-private.h"
#include "vinagre-prefs.h"
#include "vinagre-cache-prefs.h"
-#include "vinagre-protocol-ext.h"
#include "vinagre-plugins-engine.h"
#include "vinagre-plugin-dialog.h"
diff --git a/vinagre/vinagre-connect.c b/vinagre/vinagre-connect.c
index d80f0e4..6b4f46c 100644
--- a/vinagre/vinagre-connect.c
+++ b/vinagre/vinagre-connect.c
@@ -37,7 +37,6 @@
#include "vinagre-prefs.h"
#include "vinagre-cache-prefs.h"
#include "vinagre-plugins-engine.h"
-#include "vinagre-protocol-ext.h"
#include "vinagre-dirs.h"
typedef struct {
@@ -148,19 +147,19 @@ setup_protocol (VinagreConnectDialog *dialog)
{
gchar **description;
GtkWidget *widget;
- VinagreProtocolExt *ext = (VinagreProtocolExt *)value;
+ VinagreProtocol *ext = (VinagreProtocol *)value;
- description = vinagre_protocol_ext_get_public_description (ext);
+ description = vinagre_protocol_get_public_description (ext);
if (!description || !description[0])
continue;
- widget = vinagre_protocol_ext_get_connect_widget (ext, NULL);
+ widget = vinagre_protocol_get_connect_widget (ext, NULL);
gtk_list_store_append (dialog->protocol_store, &tree_iter);
gtk_list_store_set (dialog->protocol_store, &tree_iter,
PROTOCOL_NAME, description[0],
PROTOCOL_DESCRIPTION, description[1],
- PROTOCOL_MDNS, vinagre_protocol_ext_get_mdns_service (ext),
+ PROTOCOL_MDNS, vinagre_protocol_get_mdns_service (ext),
PROTOCOL_OPTIONS, widget,
PROTOCOL_PLUGIN, ext,
-1);
@@ -435,7 +434,7 @@ VinagreConnection *vinagre_connect (VinagreWindow *window)
gint port;
GtkWidget *options;
GtkTreeIter iter;
- VinagreProtocolExt *ext;
+ VinagreProtocol *ext;
host = gtk_combo_box_get_active_text (GTK_COMBO_BOX (dialog.host_entry));
gtk_widget_hide (GTK_WIDGET (dialog.dialog));
@@ -461,7 +460,7 @@ VinagreConnection *vinagre_connect (VinagreWindow *window)
g_free (protocol);
vinagre_cache_prefs_set_boolean ("connection", "fullscreen", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog.fullscreen_check)));
- conn = vinagre_protocol_ext_new_connection (ext);
+ conn = vinagre_protocol_new_connection (ext);
if (vinagre_connection_split_string (host,
vinagre_connection_get_protocol (conn),
&protocol,
diff --git a/vinagre/vinagre-connection.c b/vinagre/vinagre-connection.c
index 42b7d84..da014cc 100644
--- a/vinagre/vinagre-connection.c
+++ b/vinagre/vinagre-connection.c
@@ -26,7 +26,6 @@
#include "vinagre-connection.h"
#include "vinagre-enums.h"
#include "vinagre-bookmarks.h"
-#include "vinagre-protocol-ext.h"
#include "vinagre-plugins-engine.h"
#include "vinagre-utils.h"
@@ -495,7 +494,7 @@ vinagre_connection_split_string (const gchar *uri,
gint lport;
gchar *lhost;
gchar ipv6_host[255] = {0,};
- VinagreProtocolExt *ext;
+ VinagreProtocol *ext;
*error_msg = NULL;
*host = NULL;
@@ -545,12 +544,12 @@ vinagre_connection_split_string (const gchar *uri,
if (g_strrstr (lhost, "::") != NULL)
{
server = g_strsplit (lhost, "::", 2);
- lport = server[1] ? atoi (server[1]) : vinagre_protocol_ext_get_default_port (ext);
+ lport = server[1] ? atoi (server[1]) : vinagre_protocol_get_default_port (ext);
}
else
{
server = g_strsplit (lhost, ":", 2);
- lport = server[1] ? atoi (server[1]) : vinagre_protocol_ext_get_default_port (ext);
+ lport = server[1] ? atoi (server[1]) : vinagre_protocol_get_default_port (ext);
if ((g_str_equal (*protocol, "vnc")) && (lport < 1024))
lport += 5900;
@@ -573,7 +572,7 @@ vinagre_connection_new_from_string (const gchar *uri, gchar **error_msg, gboolea
VinagreConnection *conn = NULL;
gint port;
gchar *host, *protocol;
- VinagreProtocolExt *ext;
+ VinagreProtocol *ext;
if (!vinagre_connection_split_string (uri, NULL, &protocol, &host, &port, error_msg))
return NULL;
@@ -590,7 +589,7 @@ vinagre_connection_new_from_string (const gchar *uri, gchar **error_msg, gboolea
if (!ext)
goto finalize;
- conn = vinagre_protocol_ext_new_connection (ext);
+ conn = vinagre_protocol_new_connection (ext);
vinagre_connection_set_host (conn, host);
vinagre_connection_set_port (conn, port);
}
@@ -640,10 +639,10 @@ vinagre_connection_new_from_file (const gchar *uri, gchar **error_msg, gboolean
g_hash_table_iter_init (&iter, extensions);
while (g_hash_table_iter_next (&iter, NULL, &ext))
{
- conn = vinagre_protocol_ext_new_connection_from_file ((VinagreProtocolExt *)ext,
- data,
- use_bookmarks,
- error_msg);
+ conn = vinagre_protocol_new_connection_from_file ((VinagreProtocol *)ext,
+ data,
+ use_bookmarks,
+ error_msg);
g_free (*error_msg);
*error_msg = NULL;
if (conn)
@@ -667,7 +666,7 @@ vinagre_connection_get_string_rep (VinagreConnection *conn,
GString *uri;
gchar *result;
gboolean is_ipv6;
- VinagreProtocolExt *ext;
+ VinagreProtocol *ext;
g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL);
@@ -689,7 +688,7 @@ vinagre_connection_get_string_rep (VinagreConnection *conn,
ext = vinagre_plugins_engine_get_plugin_by_protocol (vinagre_plugins_engine_get_default (), conn->priv->protocol);
if (ext)
- if (vinagre_protocol_ext_get_default_port (ext) != conn->priv->port)
+ if (vinagre_protocol_get_default_port (ext) != conn->priv->port)
g_string_append_printf (uri, "::%d", conn->priv->port);
result = uri->str;
diff --git a/vinagre/vinagre-fav.c b/vinagre/vinagre-fav.c
index 70c7c6f..375419f 100644
--- a/vinagre/vinagre-fav.c
+++ b/vinagre/vinagre-fav.c
@@ -30,7 +30,6 @@
#include "vinagre-bookmarks-ui.h"
#include "vinagre-window-private.h"
#include "vinagre-bookmarks-entry.h"
-#include "vinagre-protocol-ext.h"
#include "vinagre-plugins-engine.h"
#include "vinagre-commands.h"
@@ -963,7 +962,7 @@ vinagre_fav_fill_bookmarks (GtkTreeStore *store, GSList *list, GtkTreeIter *pare
GSList *l;
GtkTreeIter iter;
VinagreConnection *conn;
- VinagreProtocolExt *ext;
+ VinagreProtocol *ext;
for (l = list; l; l = l->next)
{
@@ -999,7 +998,7 @@ vinagre_fav_fill_bookmarks (GtkTreeStore *store, GSList *list, GtkTreeIter *pare
ext = vinagre_plugins_engine_get_plugin_by_protocol (vinagre_plugins_engine_get_default (),
vinagre_connection_get_protocol (conn));
- pixbuf = vinagre_protocol_ext_get_icon (ext, 16);
+ pixbuf = vinagre_protocol_get_icon (ext, 16);
gtk_tree_store_append (store, &iter, parent_iter);
gtk_tree_store_set (store, &iter,
diff --git a/vinagre/vinagre-main.c b/vinagre/vinagre-main.c
index aeb6a93..9e08bc9 100644
--- a/vinagre/vinagre-main.c
+++ b/vinagre/vinagre-main.c
@@ -37,7 +37,6 @@
#include "vinagre-debug.h"
#include "vinagre-ssh.h"
#include "vinagre-options.h"
-#include "vinagre-protocol-ext.h"
#include "vinagre-plugins-engine.h"
#ifdef HAVE_TELEPATHY
@@ -55,7 +54,7 @@ int main (int argc, char **argv) {
GtkApplication *app;
GHashTable *extensions;
GHashTableIter iter;
- VinagreProtocolExt *extension;
+ VinagreProtocol *extension;
#ifdef HAVE_TELEPATHY
VinagreTubesManager *vinagre_tubes_manager;
#endif
@@ -91,7 +90,7 @@ int main (int argc, char **argv) {
{
GSList *groups, *l;
- groups = vinagre_protocol_ext_get_context_groups (extension);
+ groups = vinagre_protocol_get_context_groups (extension);
for (l = groups; l; l = l->next)
g_option_context_add_group (context, (GOptionGroup *)l->data);
g_slist_free (groups);
diff --git a/vinagre/vinagre-mdns.c b/vinagre/vinagre-mdns.c
index 704d254..44a9211 100644
--- a/vinagre/vinagre-mdns.c
+++ b/vinagre/vinagre-mdns.c
@@ -27,7 +27,6 @@
#include "vinagre-connection.h"
#include "vinagre-bookmarks-entry.h"
#include "vinagre-plugins-engine.h"
-#include "vinagre-protocol-ext.h"
typedef struct {void *plugin; char*name;} VinagrePluginInfo;
diff --git a/vinagre/vinagre-plugins-engine.c b/vinagre/vinagre-plugins-engine.c
index 6188224..7cfd581 100644
--- a/vinagre/vinagre-plugins-engine.c
+++ b/vinagre/vinagre-plugins-engine.c
@@ -249,7 +249,7 @@ vinagre_plugins_engine_get_default (void)
}
-VinagreProtocolExt *
+VinagreProtocol *
vinagre_plugins_engine_get_plugin_by_protocol (VinagrePluginsEngine *engine,
const gchar *protocol)
{
diff --git a/vinagre/vinagre-plugins-engine.h b/vinagre/vinagre-plugins-engine.h
index 78b343f..812f5f9 100644
--- a/vinagre/vinagre-plugins-engine.h
+++ b/vinagre/vinagre-plugins-engine.h
@@ -23,7 +23,7 @@
#include <glib.h>
#include <libpeas/peas.h>
-#include "vinagre-protocol-ext.h"
+#include "vinagre-protocol.h"
G_BEGIN_DECLS
@@ -52,7 +52,7 @@ struct _VinagrePluginsEngineClass
GType vinagre_plugins_engine_get_type (void) G_GNUC_CONST;
VinagrePluginsEngine *vinagre_plugins_engine_get_default (void);
-VinagreProtocolExt *vinagre_plugins_engine_get_plugin_by_protocol (VinagrePluginsEngine *engine,
+VinagreProtocol *vinagre_plugins_engine_get_plugin_by_protocol (VinagrePluginsEngine *engine,
const gchar *protocol);
GHashTable *vinagre_plugins_engine_get_plugins_by_protocol (VinagrePluginsEngine *engine);
G_END_DECLS
diff --git a/vinagre/vinagre-protocol.c b/vinagre/vinagre-protocol.c
index c0a04f5..4897ff3 100644
--- a/vinagre/vinagre-protocol.c
+++ b/vinagre/vinagre-protocol.c
@@ -283,7 +283,7 @@ vinagre_protocol_new_connection_from_file (VinagreProtocol *protocol,
*
* @protocol: a protocol
* @initial_settings: (allow-none): bla bla
- * @returns: (allow-none): a widget
+ * Return value: (allow-none): a widget
*/
GtkWidget *
vinagre_protocol_get_connect_widget (VinagreProtocol *protocol,
diff --git a/vinagre/vinagre-tab.c b/vinagre/vinagre-tab.c
index 3dd90f6..bb4bf0c 100644
--- a/vinagre/vinagre-tab.c
+++ b/vinagre/vinagre-tab.c
@@ -31,7 +31,6 @@
#include "vinagre-utils.h"
#include "vinagre-prefs.h"
#include "view/autoDrawer.h"
-#include "vinagre-protocol-ext.h"
#include "vinagre-plugins-engine.h"
#define VINAGRE_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_TAB, VinagreTabPrivate))
@@ -251,7 +250,7 @@ active_connections_button_clicked (GtkToolButton *button,
VinagreTab *tab)
{
GSList *connections, *l;
- VinagreProtocolExt *ext;
+ VinagreProtocol *ext;
VinagreConnection *conn;
GtkWidget *menu, *item, *image;
gchar *str, *label;
@@ -265,7 +264,7 @@ active_connections_button_clicked (GtkToolButton *button,
ext = vinagre_plugins_engine_get_plugin_by_protocol (vinagre_plugins_engine_get_default (),
vinagre_connection_get_protocol (conn));
item = gtk_image_menu_item_new_with_label ("");
- image = gtk_image_new_from_icon_name (vinagre_protocol_ext_get_icon_name (ext),
+ image = gtk_image_new_from_icon_name (vinagre_protocol_get_icon_name (ext),
GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
@@ -524,7 +523,7 @@ vinagre_tab_init (VinagreTab *tab)
GtkWidget *
vinagre_tab_new (VinagreConnection *conn, VinagreWindow *window)
{
- VinagreProtocolExt *ext;
+ VinagreProtocol *ext;
const gchar *protocol = vinagre_connection_get_protocol (conn);
ext = vinagre_plugins_engine_get_plugin_by_protocol (vinagre_plugins_engine_get_default (), protocol);
@@ -534,7 +533,7 @@ vinagre_tab_new (VinagreConnection *conn, VinagreWindow *window)
return NULL;
}
- return vinagre_protocol_ext_new_tab (ext, conn, window);
+ return vinagre_protocol_new_tab (ext, conn, window);
}
gchar *
@@ -938,7 +937,7 @@ const gchar *
vinagre_tab_get_icon_name (VinagreTab *tab)
{
const gchar *protocol;
- VinagreProtocolExt *ext;
+ VinagreProtocol *ext;
g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL);
@@ -946,7 +945,7 @@ vinagre_tab_get_icon_name (VinagreTab *tab)
ext = vinagre_plugins_engine_get_plugin_by_protocol (vinagre_plugins_engine_get_default (), protocol);
g_return_val_if_fail (ext != NULL, NULL);
- return vinagre_protocol_ext_get_icon_name (ext);
+ return vinagre_protocol_get_icon_name (ext);
}
/* vim: set ts=8: */
diff --git a/vinagre/vinagre-window.c b/vinagre/vinagre-window.c
index 3945635..9174790 100644
--- a/vinagre/vinagre-window.c
+++ b/vinagre/vinagre-window.c
@@ -42,7 +42,6 @@
#include "vinagre-ui.h"
#include "vinagre-window-private.h"
#include "vinagre-bookmarks-entry.h"
-#include "vinagre-protocol-ext.h"
#include "vinagre-plugins-engine.h"
#include "vinagre-dirs.h"
@@ -503,7 +502,7 @@ vinagre_window_populate_bookmarks (VinagreWindow *window,
GtkAction *action;
VinagreWindowPrivate *p = window->priv;
VinagreConnection *conn;
- VinagreProtocolExt *ext;
+ VinagreProtocol *ext;
for (l = entries; l; l = l->next)
{
@@ -560,7 +559,7 @@ vinagre_window_populate_bookmarks (VinagreWindow *window,
NULL);
g_object_set (G_OBJECT (action),
"icon-name",
- vinagre_protocol_ext_get_icon_name (ext),
+ vinagre_protocol_get_icon_name (ext),
NULL);
g_object_set_data (G_OBJECT (action), "conn", conn);
gtk_action_group_add_action (p->bookmarks_list_action_group,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]