1 files changed, 2 insertions, 49 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index aca58d30..be4f07db 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -45,11 +45,6 @@ static struct GNUNET_GTK_MainLoop *ml;
 static struct GNUNET_CONFIGURATION_Handle *cfg;
 
 /**
- * Should gnunet-conversation-gtk start in tray mode?
- */
-static int tray_only;
-
-/**
  * Desired phone line.
  */
 static unsigned int line;
@@ -74,36 +69,6 @@ GCG_get_main_window_object (const char *name)
 
 
 /**
- * Updates the status icon to the image of the given name.
- * TODO: support animations.
- *
- * available icons:
- * gnunet-conversation-offline
- * gnunet-conversation-call-active
- * gnunet-conversation-call-on-hold
- * gnunet-conversation-gtk-tray-available
- * gnunet-conversation-gtk-tray-call-pending
- * gnunet-conversation-gtk-tray-call-ringing
- * gnunet-conversation-gtk-tray-call-incoming
- *
- * @param icon_name name of the icon to use
- */
-void
-GCG_set_status_icon (const char *icon_name)
-{
-  GtkImage *status_icon;
-
-  status_icon = GTK_IMAGE (GCG_get_main_window_object
-                           ("gnunet_conversation_gtk_status_icon"));
-  gtk_image_set_from_icon_name (status_icon,
-                                icon_name,
-                                GTK_ICON_SIZE_BUTTON);
-  GNUNET_GTK_tray_icon_change (icon_name,
-                               NULL /* tooltip */);
-}
-
-
-/**
  * Get our configuration.
  *
  * @return configuration handle
@@ -128,7 +93,6 @@ shutdown_task (void *cls)
   GCG_PHONE_shutdown ();
   GCG_CONTACTS_shutdown ();
   GCG_IMPORT_shutdown ();
-  GNUNET_GTK_tray_icon_destroy ();
   GNUNET_GTK_main_loop_quit (ml);
   ml = NULL;
 }
@@ -176,17 +140,9 @@ run (void *cls)
   main_window = GNUNET_GTK_plug_me ("GNUNET_CONVERSATION_GTK_PLUG",
                                     main_window);
   gtk_window_maximize (GTK_WINDOW (main_window));
-  if (NULL == getenv ("GNUNET_CONVERSATION_GTK_PLUG"))
-    GNUNET_GTK_tray_icon_create (ml,
-                                 GTK_WINDOW (main_window),
-                                 "gnunet-gtk" /* FIXME: different icon? */,
-                                 "gnunet-conversation-gtk");
   /* make GUI visible */
-  if (! tray_only)
-  {
-    gtk_widget_show (main_window);
-    gtk_window_present (GTK_WINDOW (main_window));
-  }
+  gtk_widget_show (main_window);
+  gtk_window_present (GTK_WINDOW (main_window));
   GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
                                  NULL);
   if (NULL == ego_name)
@@ -222,9 +178,6 @@ main (int argc, char *const *argv)
     {'e', "ego", "ego",
      gettext_noop ("select ego to use"), 1,
      &GNUNET_GETOPT_set_string, &ego_name},
-    {'t', "tray", NULL,
-     gettext_noop ("start in tray mode"), 0,
-     &GNUNET_GETOPT_set_one, &tray_only},
     GNUNET_GETOPT_OPTION_END
   };
   int ret;