Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/acme/ChangeLog,v
retrieving revision 1.98
diff -u -r1.98 ChangeLog
--- ChangeLog	4 Mar 2003 23:14:36 -0000	1.98
+++ ChangeLog	9 Mar 2003 16:48:14 -0000
@@ -1,3 +1,7 @@
+2003-03-09  Andrew Sobala  <aes@gnome.org>
+
+	* src/acme.c: (main): remove notification area icon
+
 2003-03-04  Kenneth Rohde Christiansen  <kenneth@gnu.org>
  
         * configure.in: Added "li" to ALL_LINGUAS.
Index: src/acme.c
===================================================================
RCS file: /cvs/gnome/acme/src/acme.c,v
retrieving revision 1.68
diff -u -r1.68 acme.c
--- src/acme.c	1 Feb 2003 23:59:12 -0000	1.68
+++ src/acme.c	9 Mar 2003 16:48:15 -0000
@@ -41,7 +41,6 @@
 #include <gconf/gconf-client.h>
 #include <libwnck/libwnck.h>
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include "eggtrayicon.h"
 
 #include "acme.h"
 #include "g-volume.h"
@@ -65,11 +64,6 @@
 	GdkDisplay *display;
 	GdkScreen *current_screen;
 	GList *screens;
-
-	/* Tray icon */
-	EggTrayIcon *tray_icon;
-	GtkTooltips *tray_icon_tooltip;
-	GtkWidget *popup_menu;
 } Acme;
 
 enum {
@@ -79,8 +73,6 @@
 	ICON_EJECT,
 };
 
-static void init_tray (Acme *acme);
-
 static void
 selection_get_func (GtkClipboard *clipboard, GtkSelectionData *selection_data,
 		guint info, gpointer user_data_or_owner)
@@ -640,84 +632,6 @@
 	gtk_widget_show(about);
 }
 
-static gboolean
-tray_icon_release (GtkWidget *widget, GdkEventButton *event, Acme *acme)
-{
-	if (event->button == 3)
-	{
-		gtk_menu_popdown (GTK_MENU (acme->popup_menu));
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-
-static gboolean
-tray_icon_press (GtkWidget *widget, GdkEventButton *event, Acme *acme)
-{
-	if (event->button == 3)
-	{
-		gtk_menu_popup (GTK_MENU (acme->popup_menu), NULL, NULL, NULL,
-				NULL, event->button, event->time);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-tray_destroyed (GtkWidget *widget, GdkEvent *event, gpointer user_data)
-{
-	init_tray ((Acme *) user_data);
-	return TRUE;
-}
-
-static void
-init_tray (Acme *acme)
-{
-	GtkWidget *image, *evbox, *item;
-
-	acme->tray_icon = egg_tray_icon_new ("Multimedia Keys daemon");
-	image = gtk_image_new_from_file (ACME_DATA "acme-16.png");
-
-	acme->tray_icon_tooltip = gtk_tooltips_new ();
-	gtk_tooltips_set_tip (acme->tray_icon_tooltip,
-			GTK_WIDGET (acme->tray_icon),
-			_("Multimedia Keys daemon active"),
-			NULL);
-
-	/* Event box */
-	evbox = gtk_event_box_new ();
-	g_signal_connect (G_OBJECT (evbox), "button_press_event",
-			G_CALLBACK (tray_icon_press), (gpointer) acme);
-	g_signal_connect (G_OBJECT (evbox), "button_release_event",
-			G_CALLBACK (tray_icon_release), (gpointer) acme);
-
-	/* Popup menu */
-	acme->popup_menu = gtk_menu_new ();
-	item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PREFERENCES,
-			NULL);
-	g_signal_connect (G_OBJECT (item), "activate",
-			G_CALLBACK (prefs_activated), (gpointer) acme);
-	gtk_widget_show (item);
-	gtk_menu_shell_append (GTK_MENU_SHELL (acme->popup_menu), item);
-
-	item = gtk_image_menu_item_new_from_stock (GNOME_STOCK_ABOUT,
-			NULL);
-	g_signal_connect (G_OBJECT (item), "activate",
-			G_CALLBACK (about_activated), (gpointer) acme);
-	gtk_widget_show (item);
-	gtk_menu_shell_append (GTK_MENU_SHELL (acme->popup_menu), item);
-
-	gtk_container_add (GTK_CONTAINER (evbox), image);
-	gtk_container_add (GTK_CONTAINER (acme->tray_icon), evbox);
-	gtk_widget_show_all (GTK_WIDGET (acme->tray_icon));
-
-	g_signal_connect (G_OBJECT (acme->tray_icon), "destroy-event",
-			G_CALLBACK (tray_destroyed), (gpointer) acme);
-}
-
 static void
 init_sm (Acme *acme)
 {
@@ -1198,7 +1112,6 @@
 		exit (0);
 	}
 	init_sm (acme);
-	init_tray (acme);
 	acme->current_screen = gdk_screen_get_default ();
 	acme->screen = wnck_screen_get_default ();
 	gtk_widget_realize (acme->dialog);
