# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1183247749 0
# Node ID c9a28619cfd585a1cb86274cc3036e176f23211e
# Parent  22b9b6f148bea1fa21753673142845c327892d9a# Parent  95c45d72c6e7d0b42a8da26d85f765c27bab4785
merge of 'afceda354033d5b3b9ee155fbc6d592b8b1edb2f'
     and 'ea892e1af1550c458bff82d681f007879dc52d8a'

diff -r 95c45d72c6e7 -r c9a28619cfd5 finch/plugins/pietray.py
--- a/finch/plugins/pietray.py	Sat Jun 30 23:15:31 2007 +0000
+++ b/finch/plugins/pietray.py	Sat Jun 30 23:55:49 2007 +0000
@@ -78,9 +78,27 @@
 def toggle_pref(item, pref):
 	purple.PurplePrefsSetBool(pref, item.get_active())
 
+def quit_finch(item, null):
+	# XXX: Ask first
+	purple.PurpleCoreQuit()
+	gtk.main_quit()
+
+def close_docklet(item, null):
+	gtk.main_quit()
+
 def popup_menu(icon, button, tm, none):
 	menu = gtk.Menu()
 
+	#item = gtk.ImageMenuItem(gtk.STOCK_QUIT)
+	#item.connect("activate", quit_finch, None)
+	#menu.append(item)
+
+	item = gtk.ImageMenuItem(gtk.STOCK_CLOSE)
+	item.connect("activate", close_docklet, None)
+	menu.append(item)
+
+	menu.append(gtk.MenuItem())
+
 	item = gtk.CheckMenuItem("Blink for unread IM")
 	item.set_active(purple.PurplePrefsGetBool("/plugins/dbus/docklet/blink/im"))
 	item.connect("activate", toggle_pref, "/plugins/dbus/docklet/blink/im")
@@ -176,8 +194,14 @@
 t = gtk.StatusIcon()
 t.connect("popup-menu", popup_menu, None)
 
-init_prefs()
-detect_unread_conversations()
+try:
+	init_prefs()
+	detect_unread_conversations()
+	gtk.main ()
+except:
+	dialog = gtk.Dialog("pietray: Error", None, gtk.DIALOG_NO_SEPARATOR | gtk.DIALOG_MODAL, ("Close", gtk.RESPONSE_CLOSE))
+	dialog.set_resizable(False)
+	dialog.vbox.pack_start(gtk.Label("There was some error. Perhaps a purple client is not running."), False, False, 0)
+	dialog.show_all()
+	dialog.run()
 
-gtk.main ()
-