[vino] Remove telepathy stuff in VinoStatusIcon
- From: Jonh Wendell <jwendell src gnome org>
- To: svn-commits-list gnome org
- Subject: [vino] Remove telepathy stuff in VinoStatusIcon
- Date: Thu, 23 Jul 2009 19:18:58 +0000 (UTC)
commit 06a8964e3f1174138686a6542aa8ff27342916ee
Author: Arnaud Maillet <arnaud maillet collabora co uk>
Date: Fri Jul 17 22:04:01 2009 +0200
Remove telepathy stuff in VinoStatusIcon
server/vino-status-icon.c | 67 ---------------------------------------------
1 files changed, 0 insertions(+), 67 deletions(-)
---
diff --git a/server/vino-status-icon.c b/server/vino-status-icon.c
index 6969735..0e28a15 100644
--- a/server/vino-status-icon.c
+++ b/server/vino-status-icon.c
@@ -33,10 +33,6 @@
#include "vino-enums.h"
#include "vino-util.h"
-#ifdef HAVE_TELEPATHY_GLIB
-#include "vino-tube-server.h"
-#endif
-
struct _VinoStatusIconPrivate
{
GtkMenu *menu;
@@ -336,23 +332,6 @@ vino_status_icon_disconnect_confirm (VinoStatusIconNotify *a)
return;
}
-#ifdef HAVE_TELEPATHY_GLIB
- if (VINO_IS_TUBE_SERVER (icon->priv->server))
- {
- /* Translators: %s is the alias of the telepathy contact */
- primary_msg = g_strdup_printf
- (_("Are you sure you want to disconnect '%s'?"),
- vino_tube_server_get_alias (VINO_TUBE_SERVER
- (icon->priv->server)));
- secondary_msg = g_strdup_printf
- (_("The remote user '%s' will be disconnected. Are you sure?"),
- vino_tube_server_get_alias (VINO_TUBE_SERVER
- (icon->priv->server)));
- }
- else
- {
-#endif
-
if (client != NULL)
{
/* Translators: %s is a hostname */
@@ -371,10 +350,6 @@ vino_status_icon_disconnect_confirm (VinoStatusIconNotify *a)
(_("All remote users will be disconnected. Are you sure?"));
}
-#ifdef HAVE_TELEPATHY_GLIB
- }
-#endif
-
icon->priv->disconnect_dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
@@ -448,15 +423,6 @@ vino_status_icon_popup_menu (GtkStatusIcon *status_icon,
a->icon = icon;
a->client = client;
-#ifdef HAVE_TELEPATHY_GLIB
- if (VINO_IS_TUBE_SERVER (icon->priv->server))
- /* Translators: %s is the alias of the telepathy contact */
- str = g_strdup_printf (_("Disconnect %s"),
- vino_tube_server_get_alias (VINO_TUBE_SERVER
- (icon->priv->server)));
- else
-#endif
-
/* Translators: %s is a hostname */
str = g_strdup_printf (_("Disconnect %s"),
vino_client_get_hostname (client));
@@ -612,10 +578,6 @@ vino_status_icon_show_new_client_notification (gpointer user_data)
VinoStatusIcon *icon = a->icon;
VinoClient *client = a->client;
-#ifdef HAVE_TELEPATHY_GLIB
- const gchar *filename = NULL;
-#endif
-
if (vino_server_get_prompt_enabled (icon->priv->server))
{
g_free (user_data);
@@ -642,31 +604,6 @@ vino_status_icon_show_new_client_notification (gpointer user_data)
icon->priv->new_client_notification = NULL;
}
-#ifdef HAVE_TELEPATHY_GLIB
- if (VINO_IS_TUBE_SERVER (icon->priv->server))
- {
- /* Translators: %s is the alias of the telepathy contact */
- summary = _("Another user is controlling your desktop");
- body = g_strdup_printf
- (_("'%s' is remotely controlling your desktop."),
- vino_tube_server_get_alias (VINO_TUBE_SERVER
- (icon->priv->server)));
- filename = vino_tube_server_get_avatar_filename (VINO_TUBE_SERVER
- (icon->priv->server));
-
- if (filename == NULL)
- filename = "stock_person";
-
- icon->priv->new_client_notification =
- notify_notification_new_with_status_icon (summary,
- body,
- filename,
- GTK_STATUS_ICON (icon));
- }
- else
- {
-#endif
-
if (vino_server_get_view_only (icon->priv->server))
{
/* Translators: %s is a hostname */
@@ -690,10 +627,6 @@ vino_status_icon_show_new_client_notification (gpointer user_data)
"preferences-desktop-remote-desktop",
GTK_STATUS_ICON (icon));
-#ifdef HAVE_TELEPATHY_GLIB
- }
-#endif
-
g_free (body);
g_signal_connect_swapped (icon->priv->new_client_notification, "closed",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]