Pidgin

Update of /cvsroot/gaim/gaim/src/protocols/yahoo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18641

Modified Files:
	yahoo.c 
Log Message:
This should fix Gideon N. Guillen's blank system message problem.

I'm getting married tomorrow. Don't expect a lot of patches out of me.


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -d -p -r1.279 -r1.280
--- yahoo.c	10 Sep 2004 19:51:51 -0000	1.279
+++ yahoo.c	29 Sep 2004 15:01:33 -0000	1.280
@@ -913,7 +913,7 @@ static void yahoo_process_message(GaimCo
 static void yahoo_process_sysmessage(GaimConnection *gc, struct yahoo_packet *pkt)
 {
 	GSList *l = pkt->hash;
-	char *prim, *me = NULL, *msg = NULL;
+	char *prim, *me = NULL, *msg = NULL, *escmsg = NULL;
 
 	while (l) {
 		struct yahoo_pair *pair = l->data;
@@ -926,13 +926,16 @@ static void yahoo_process_sysmessage(Gai
 		l = l->next;
 	}
 
-	if (!msg)
+	if (!msg || !g_utf8_validate(msg, -1, NULL))
 		return;
 
+	escmsg = gaim_escape_html(msg);
+
 	prim = g_strdup_printf(_("Yahoo! system message for %s:"),
 	                       me?me:gaim_connection_get_display_name(gc));
-	gaim_notify_info(NULL, NULL, prim, msg);
+	gaim_notify_info(NULL, NULL, prim, escmsg);
 	g_free(prim);
+	g_free(escmsg);
 }
 
 static void yahoo_buddy_added_us(GaimConnection *gc, struct yahoo_packet *pkt) {

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9533/src/protocols/msn

Modified Files:
	msn.c 
Log Message:
" msn_act_id() checks the length of the string it is
passed to ensure that it is less than
BUDDY_ALIAS_MAXLEN before attempting to send the
command to the server. However, it checks the string
before encoding it so if you pass a string that becomes
longer than BUDDY_ALIAS_MAXLEN after encoding it then
MSN will drop the connection when attempting to update
your friendly name.

Patch is for cvs head. I also have a patch for 1.0.0,
if interested." --dbattams

patch okayed by shx


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -d -p -r1.329 -r1.330
--- msn.c	28 Sep 2004 00:22:47 -0000	1.329
+++ msn.c	29 Sep 2004 01:53:36 -0000	1.330
@@ -107,7 +107,10 @@ msn_act_id(GaimConnection *gc, const cha
 	cmdproc = session->notification->cmdproc;
 	account = gaim_connection_get_account(gc);
 
-	alias = (entry && *entry) ? entry : "";
+	if(entry && strlen(entry))
+		alias = gaim_url_encode(entry);
+	else
+		alias = "";
 
 	if (strlen(alias) > BUDDY_ALIAS_MAXLEN)
 	{
@@ -118,7 +121,7 @@ msn_act_id(GaimConnection *gc, const cha
 
 	msn_cmdproc_send(cmdproc, "REA", "%s %s",
 					 gaim_account_get_username(account),
-					 gaim_url_encode(alias));
+					 alias);
 }
 
 static void

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9533

Modified Files:
	COPYRIGHT 
Log Message:
" msn_act_id() checks the length of the string it is
passed to ensure that it is less than
BUDDY_ALIAS_MAXLEN before attempting to send the
command to the server. However, it checks the string
before encoding it so if you pass a string that becomes
longer than BUDDY_ALIAS_MAXLEN after encoding it then
MSN will drop the connection when attempting to update
your friendly name.

Patch is for cvs head. I also have a patch for 1.0.0,
if interested." --dbattams

patch okayed by shx


Index: COPYRIGHT
===================================================================
RCS file: /cvsroot/gaim/gaim/COPYRIGHT,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -p -r1.94 -r1.95
--- COPYRIGHT	27 Sep 2004 21:46:01 -0000	1.94
+++ COPYRIGHT	29 Sep 2004 01:53:36 -0000	1.95
@@ -8,6 +8,7 @@ Daniel Atallah
 Paul Aurich
 Patrick Aussems
 Kevin Barry
+Derek Battams
 Curtis Beattie
 Dave Bell
 Brian Bernas

Update of /cvsroot/gaim/gaim/pixmaps/status/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19994/pixmaps/status/default

Modified Files:
	Makefile.am 
Log Message:
(20:18:34) sanmarcos: remember the patch to show if somebody blocked you in
msn?, well I just found out it breaks the display of the away icon on your
buddy list
(20:18:46) sanmarcos: meaning, a user is away in msn, and the msn dude
appears without an away icon overlayed
(20:19:43) LSchiere: lovely
(20:19:43) sanmarcos: only in the small buddy list though, I might be wrong
and maybe it is not the patch
(20:19:57) LSchiere: the small list should only show one overlay at a time
(20:20:04) LSchiere: so if its showing some other...
(20:20:05) sanmarcos: yep
(20:20:21) sanmarcos: no, I just trying setting myself away (I dont have
mobile or anything setup), and it doesnt show it
(20:20:50) sanmarcos: besides setting the mobile number is pretty broken,
afaik
(20:21:45) sanmarcos: s/trying/tried


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/status/default/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -p -r1.25 -r1.26
--- Makefile.am	27 Sep 2004 02:50:47 -0000	1.25
+++ Makefile.am	28 Sep 2004 00:22:47 -0000	1.26
@@ -36,9 +36,7 @@ EXTRA_DIST = \
 	voice.png \
 	wireless.png \
 	yahoo.png \
-	zephyr.png \
-	blocked.png \
-	nr.png
+	zephyr.png
 
 gaimstatuspixdir = $(datadir)/pixmaps/gaim/status/default

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19994/src/protocols/msn

Modified Files:
	msn.c 
Log Message:
(20:18:34) sanmarcos: remember the patch to show if somebody blocked you in
msn?, well I just found out it breaks the display of the away icon on your
buddy list
(20:18:46) sanmarcos: meaning, a user is away in msn, and the msn dude
appears without an away icon overlayed
(20:19:43) LSchiere: lovely
(20:19:43) sanmarcos: only in the small buddy list though, I might be wrong
and maybe it is not the patch
(20:19:57) LSchiere: the small list should only show one overlay at a time
(20:20:04) LSchiere: so if its showing some other...
(20:20:05) sanmarcos: yep
(20:20:21) sanmarcos: no, I just trying setting myself away (I dont have
mobile or anything setup), and it doesnt show it
(20:20:50) sanmarcos: besides setting the mobile number is pretty broken,
afaik
(20:21:45) sanmarcos: s/trying/tried


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -d -p -r1.328 -r1.329
--- msn.c	27 Sep 2004 02:50:48 -0000	1.328
+++ msn.c	28 Sep 2004 00:22:47 -0000	1.329
@@ -394,30 +394,13 @@ msn_list_emblems(GaimBuddy *b, const cha
 	MsnUser *user;
 	GaimPresence *presence;
 	const char *emblems[4] = { NULL, NULL, NULL, NULL };
-	int i = 1;
+	int i = 0;
 
 	user = b->proto_data;
 	presence = gaim_buddy_get_presence(b);
 
-	if (user == NULL)
-	{
-		emblems[0] = "offline";
-	}
-	else
-	{
-		if (!(user->list_op & (1 << MSN_LIST_RL)))
-			emblems[0] = "nr";
-		if (user->list_op & (1 << MSN_LIST_BL))
-			emblems[i++] = "blocked";
-		if (user->mobile)
-			emblems[i++] = "wireless";
-	}
-
 	if (!gaim_presence_is_online(presence))
-	{
-		if (emblems[0] == NULL)
-			emblems[0] = "offline";
-	}
+		emblems[i++] = "offline";
 	else if (gaim_presence_is_status_active(presence, "busy") ||
 			 gaim_presence_is_status_active(presence, "phone"))
 		emblems[i++] = "occupied";
@@ -425,6 +408,13 @@ msn_list_emblems(GaimBuddy *b, const cha
 			 gaim_presence_is_idle(presence))
 		emblems[i++] = "away";
 
+	if (user == NULL)
+	{
+		emblems[0] = "offline";
+	}
+	else if (user->mobile)
+		emblems[i++] = "wireless";
+
 	*se = emblems[0];
 	*sw = emblems[1];
 	*nw = emblems[2];
@@ -466,17 +456,9 @@ msn_tooltip_text(GaimBuddy *buddy)
 							   _("Idle") : gaim_status_get_name(status));
 	}
 
-	if (user)
-	{
-		g_string_append_printf(s, _("\n<b>%s:</b> %s"), _("Has you"),
-							   (user->list_op & (1 << MSN_LIST_RL)) ?
-							   _("Yes") : _("No"));
-
-		g_string_append_printf(s, _("\n<b>%s:</b> %s"), _("Blocked"),
-							   (user->list_op & (1 << MSN_LIST_BL)) ?
-							   _("Yes") : _("No"));
-	}
-
+	g_string_append_printf(s, _("\n<b>%s:</b> %s"), _("Has you"),
+						   (user->list_op & (1 << MSN_LIST_RL)) ?
+						   _("Yes") : _("No"));
 
 	return g_string_free(s, FALSE);
 }

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16894

Modified Files:
	COPYRIGHT 
Log Message:
sf patch 1035572, give a title to the disconnected window.
Thanks to Philip Van Hoof (freax)


Index: COPYRIGHT
===================================================================
RCS file: /cvsroot/gaim/gaim/COPYRIGHT,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -p -r1.93 -r1.94
--- COPYRIGHT	27 Sep 2004 02:50:46 -0000	1.93
+++ COPYRIGHT	27 Sep 2004 21:46:01 -0000	1.94
@@ -169,6 +169,7 @@ Tom Tromey
 Chris Toshok
 Junichi Uekawa
 István Váradi
+Philip Van Hoof
 David Vermeille
 Bjoern Voigt
 Nathan Walp

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20244/src

Modified Files:
	account.c status.c status.h 
Log Message:
This is sf patch 1031460, Added gaim_status_[type_]is_exclusive

So we can do
gaim_status_type_is_exlusive(status_type)
instead of
!gaim_status_type_is_independent(status_type)

Also, I'll be out of town all next week, starting Saturday (not that
it'll matter, I've barely had any Gaim-time the last week or two)


Index: account.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/account.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -p -r1.103 -r1.104
--- account.c	19 Sep 2004 21:19:54 -0000	1.103
+++ account.c	27 Sep 2004 22:05:16 -0000	1.104
@@ -568,7 +568,7 @@ gaim_account_set_status(GaimAccount *acc
 		return;
 	}
 
-	if (!active && gaim_status_is_independent(status))
+	if (!active && gaim_status_is_exclusive(status))
 	{
 		gaim_debug(GAIM_DEBUG_ERROR, "accounts",
 				   "Cannot deactivate an exclusive status.\n");

Index: status.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/status.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -p -r1.21 -r1.22
--- status.c	21 Sep 2004 00:58:41 -0000	1.21
+++ status.c	27 Sep 2004 22:05:17 -0000	1.22
@@ -1,5 +1,5 @@
 /**
- * @file status.h Status API
+ * @file status.c Status API
  * @ingroup core
  *
  * gaim
@@ -372,6 +372,14 @@ gaim_status_type_is_independent(const Ga
 }
 
 gboolean
+gaim_status_type_is_exclusive(const GaimStatusType *status_type)
+{
+	g_return_val_if_fail(status_type != NULL, FALSE);
+
+	return !status_type->independent;
+}
+
+gboolean
 gaim_status_type_is_available(const GaimStatusType *status_type)
 {
 	GaimStatusPrimitive primitive;
@@ -619,7 +627,7 @@ gaim_status_set_active(GaimStatus *statu
 
 	status_type = gaim_status_get_type(status);
 
-	if (!active && !gaim_status_type_is_independent(status_type))
+	if (!active && gaim_status_type_is_exclusive(status_type))
 	{
 		gaim_debug_error("status",
 				   "Cannot deactivate an exclusive status (%s).\n",
@@ -630,7 +638,7 @@ gaim_status_set_active(GaimStatus *statu
 	presence   = gaim_status_get_presence(status);
 	old_status = gaim_presence_get_active_status(presence);
 
-	if (!gaim_status_type_is_independent(status_type))
+	if (gaim_status_type_is_exclusive(status_type))
 	{
 		const GList *l;
 
@@ -773,6 +781,14 @@ gaim_status_is_independent(const GaimSta
 }
 
 gboolean
+gaim_status_is_exclusive(const GaimStatus *status)
+{
+	g_return_val_if_fail(status != NULL, FALSE);
+
+	return gaim_status_type_is_exclusive(gaim_status_get_type(status));
+}
+
+gboolean
 gaim_status_is_available(const GaimStatus *status)
 {
 	g_return_val_if_fail(status != NULL, FALSE);
@@ -1080,7 +1096,7 @@ gaim_presence_set_status_active(GaimPres
 
 	g_return_if_fail(status != NULL);
 
-	if (!gaim_status_is_independent(status))
+	if (gaim_status_is_exclusive(status))
 	{
 		if (!active)
 		{

Index: status.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/status.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -p -r1.6 -r1.7
--- status.h	18 Sep 2004 23:17:38 -0000	1.6
+++ status.h	27 Sep 2004 22:05:27 -0000	1.7
@@ -246,6 +246,15 @@ gboolean gaim_status_type_is_user_settab
 gboolean gaim_status_type_is_independent(const GaimStatusType *status_type);
 
 /**
+ * Returns whether or not the status type is exlusive.
+ *
+ * @param status_type The status type.
+ *
+ * @return TRUE if the status type is exclusive, FALSE otherwise.
+ */
+gboolean gaim_status_type_is_exclusive(const GaimStatusType *status_type);
+
+/**
  * Returns whether or not a status type is available.
  *
  * Available status types are online and possibly hidden, but not away.
@@ -458,6 +467,18 @@ const char *gaim_status_get_name(const G
 gboolean gaim_status_is_independent(const GaimStatus *status);
 
 /**
+ * Returns whether or not a status is exclusive.
+ *
+ * This is a convenience method for
+ * gaim_status_type_is_exclusive(gaim_status_get_type(status)).
+ *
+ * @param status The status.
+ *
+ * @return TRUE if the status is exclusive, FALSE otherwise.
+ */
+gboolean gaim_status_is_exclusive(const GaimStatus *status);
+
+/**
  * Returns whether or not a status is available.
  *
  * Available statuses are online and possibly hidden, but not away or idle.

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17773/src

Modified Files:
      Tag: oldstatus
	prefs.h 
Log Message:
Add prefs.h to the right place in doxygen.  Thanks to Gary Kramlich


Index: prefs.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.h,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -p -r1.17 -r1.17.2.1
--- prefs.h	8 Aug 2004 05:37:58 -0000	1.17
+++ prefs.h	27 Sep 2004 21:50:39 -0000	1.17.2.1
@@ -1,5 +1,6 @@
 /**
  * @file prefs.h Prefs API
+ * @ingroup core
  *
  * gaim
  *

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17464

Modified Files:
	prefs.h 
Log Message:
Rrrrrrrrrrrr, thanks to Gary Kramlich for 'aving the eyes of a parrot.


Index: prefs.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -p -r1.17 -r1.18
--- prefs.h	8 Aug 2004 05:37:58 -0000	1.17
+++ prefs.h	27 Sep 2004 21:48:56 -0000	1.18
@@ -1,5 +1,6 @@
 /**
  * @file prefs.h Prefs API
+ * @ingroup core
  *
  * gaim
  *

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16894/src

Modified Files:
	gtkconn.c 
Log Message:
sf patch 1035572, give a title to the disconnected window.
Thanks to Philip Van Hoof (freax)


Index: gtkconn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconn.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -p -r1.52 -r1.53
--- gtkconn.c	9 Sep 2004 03:36:34 -0000	1.52
+++ gtkconn.c	27 Sep 2004 21:46:01 -0000	1.53
@@ -377,7 +377,7 @@ static void disconnect_response_cb(GtkDi
 	GtkTreeSelection *sel = NULL;
 	GtkTreeModel *model = NULL;
 	GaimAccount *account = NULL;
-	
+
 	switch (id) {
 	case GTK_RESPONSE_APPLY: /* Reconnect All */
 		model = gtk_tree_view_get_model(GTK_TREE_VIEW(disconnect_window->treeview));
@@ -572,6 +572,7 @@ gaim_gtk_connection_report_disconnect(Ga
 
 		gtk_container_set_border_width(GTK_CONTAINER(disconnect_window->window), 6);
 		gtk_window_set_resizable(GTK_WINDOW(disconnect_window->window), FALSE);
+		gtk_window_set_title(GTK_WINDOW(disconnect_window->window), _("Disconnected"));
 		gtk_dialog_set_has_separator(GTK_DIALOG(disconnect_window->window), FALSE);
 		gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(disconnect_window->window)->vbox), 12);
 		gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(disconnect_window->window)->vbox), 6);
@@ -631,7 +632,7 @@ gaim_gtk_connection_report_disconnect(Ga
 		col = gtk_tree_view_column_new_with_attributes (_("Time"),
 								rend, "text", 2, NULL);
 		gtk_tree_view_append_column (GTK_TREE_VIEW(disconnect_window->treeview), col);
-		
+
 		g_object_unref(G_OBJECT(list_store));
 		gtk_container_add(GTK_CONTAINER(disconnect_window->sw), disconnect_window->treeview);

Update of /cvsroot/gaim/gaim/pixmaps/status/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18561/pixmaps/status/default

Added Files:
	blocked.png nr.png 
Log Message:
these are the graphics to make the previous commit work. it has been
suggested that they could be better, but i'm not artist enough to try to
fix them.


--- NEW FILE: blocked.png ---
‰PNG




--- NEW FILE: nr.png ---
‰PNG



yÒÒÁÂÆBÈ$J±¶ÔBk€"‚66b#ˆ`Rˆ­b!‚… BÀÂ2`ã
a@... ž€
pkÒÙçX
LZ÷ìÝ?üx—,}rOá

Update of /cvsroot/gaim/gaim/pixmaps/status/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18215/pixmaps/status/default

Modified Files:
	Makefile.am 
Log Message:
this lets you see who you have blocked and who doesn't have you on your
list as emblems for msn. it looks like its extendable to the other
protocols? thanks to Fernando Herrera for this. 


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/status/default/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -p -r1.24 -r1.25
--- Makefile.am	24 Jul 2004 15:31:14 -0000	1.24
+++ Makefile.am	27 Sep 2004 02:50:47 -0000	1.25
@@ -36,7 +36,9 @@ EXTRA_DIST = \
 	voice.png \
 	wireless.png \
 	yahoo.png \
-	zephyr.png
+	zephyr.png \
+	blocked.png \
+	nr.png
 
 gaimstatuspixdir = $(datadir)/pixmaps/gaim/status/default

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18215/src/protocols/msn

Modified Files:
	msn.c 
Log Message:
this lets you see who you have blocked and who doesn't have you on your
list as emblems for msn. it looks like its extendable to the other
protocols? thanks to Fernando Herrera for this. 


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -d -p -r1.327 -r1.328
--- msn.c	21 Sep 2004 01:00:04 -0000	1.327
+++ msn.c	27 Sep 2004 02:50:48 -0000	1.328
@@ -394,13 +394,30 @@ msn_list_emblems(GaimBuddy *b, const cha
 	MsnUser *user;
 	GaimPresence *presence;
 	const char *emblems[4] = { NULL, NULL, NULL, NULL };
-	int i = 0;
+	int i = 1;
 
 	user = b->proto_data;
 	presence = gaim_buddy_get_presence(b);
 
+	if (user == NULL)
+	{
+		emblems[0] = "offline";
+	}
+	else
+	{
+		if (!(user->list_op & (1 << MSN_LIST_RL)))
+			emblems[0] = "nr";
+		if (user->list_op & (1 << MSN_LIST_BL))
+			emblems[i++] = "blocked";
+		if (user->mobile)
+			emblems[i++] = "wireless";
+	}
+
 	if (!gaim_presence_is_online(presence))
-		emblems[i++] = "offline";
+	{
+		if (emblems[0] == NULL)
+			emblems[0] = "offline";
+	}
 	else if (gaim_presence_is_status_active(presence, "busy") ||
 			 gaim_presence_is_status_active(presence, "phone"))
 		emblems[i++] = "occupied";
@@ -408,13 +425,6 @@ msn_list_emblems(GaimBuddy *b, const cha
 			 gaim_presence_is_idle(presence))
 		emblems[i++] = "away";
 
-	if (user == NULL)
-	{
-		emblems[0] = "offline";
-	}
-	else if (user->mobile)
-		emblems[i++] = "wireless";
-
 	*se = emblems[0];
 	*sw = emblems[1];
 	*nw = emblems[2];
@@ -456,9 +466,17 @@ msn_tooltip_text(GaimBuddy *buddy)
 							   _("Idle") : gaim_status_get_name(status));
 	}
 
-	g_string_append_printf(s, _("\n<b>%s:</b> %s"), _("Has you"),
-						   (user->list_op & (1 << MSN_LIST_RL)) ?
-						   _("Yes") : _("No"));
+	if (user)
+	{
+		g_string_append_printf(s, _("\n<b>%s:</b> %s"), _("Has you"),
+							   (user->list_op & (1 << MSN_LIST_RL)) ?
+							   _("Yes") : _("No"));
+
+		g_string_append_printf(s, _("\n<b>%s:</b> %s"), _("Blocked"),
+							   (user->list_op & (1 << MSN_LIST_BL)) ?
+							   _("Yes") : _("No"));
+	}
+
 
 	return g_string_free(s, FALSE);
 }

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18215

Modified Files:
	COPYRIGHT 
Log Message:
this lets you see who you have blocked and who doesn't have you on your
list as emblems for msn. it looks like its extendable to the other
protocols? thanks to Fernando Herrera for this. 


Index: COPYRIGHT
===================================================================
RCS file: /cvsroot/gaim/gaim/COPYRIGHT,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -p -r1.92 -r1.93
--- COPYRIGHT	23 Sep 2004 03:09:44 -0000	1.92
+++ COPYRIGHT	27 Sep 2004 02:50:46 -0000	1.93
@@ -67,10 +67,11 @@ Ignacy Gawedzki
 Michael Golden
 Ryan C. Gordon
 Christian Hammond
-Benjamin Herrenschmidt
 Andy Harrison
 G. Sumner Hayes
 Mike Heffner
+Benjamin Herrenschmidt
+Fernando Herrera
 Casey Ho
 Iain Holmes
 Karsten Huneycutt

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22361

Modified Files:
	gtkgaim.h gtkimhtml.c 
Log Message:
marv has mentioned several times in #gaim that we were never using
GTK_WORD_WRAP_CHAR because we were checking if an enum is #ifdef
This fixes that.



Index: gtkgaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkgaim.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- gtkgaim.h	20 Aug 2004 05:11:30 -0000	1.1
+++ gtkgaim.h	26 Sep 2004 16:17:08 -0000	1.2
@@ -38,11 +38,11 @@
 #endif
 
 /*
- * This is backwards-compatibility code for old versions of GTK+ (2.2.1 and
- * earlier).  It defines the new wrap behavior (unknown in earlier versions)
+ * This is backwards-compatibility code for older versions of GTK+ (< 2.4.x)
+ * It defines the new wrap behavior (unknown in earlier versions)
  * as the old (slightly buggy) wrap behavior.
  */
-#ifndef GTK_WRAP_WORD_CHAR
+#if (!GTK_CHECK_VERSION(2,4,0))
 #define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
 #endif
 

Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -d -p -r1.366 -r1.367
--- gtkimhtml.c	11 Sep 2004 19:18:58 -0000	1.366
+++ gtkimhtml.c	26 Sep 2004 16:17:09 -0000	1.367
@@ -59,8 +59,8 @@
 
 #include <pango/pango-font.h>
 
-/* GTK+ < 2.2.2 hack, see gtkdialogs.h for details. */
-#ifndef GTK_WRAP_WORD_CHAR
+/* GTK+ < 2.4.x hack, see gtkgaim.h for details. */
+#if (!GTK_CHECK_VERSION(2,4,0))
 #define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
 #endif

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21599

Modified Files:
      Tag: oldstatus
	gtkgaim.h gtkimhtml.c 
Log Message:
marv has mentioned several times in #gaim that we were never using
GTK_WORD_WRAP_CHAR because we were checking if an enum is #ifdef
This fixes that.



Index: gtkgaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkgaim.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -p -r1.1 -r1.1.2.1
--- gtkgaim.h	20 Aug 2004 05:11:30 -0000	1.1
+++ gtkgaim.h	26 Sep 2004 16:16:54 -0000	1.1.2.1
@@ -38,11 +38,11 @@
 #endif
 
 /*
- * This is backwards-compatibility code for old versions of GTK+ (2.2.1 and
- * earlier).  It defines the new wrap behavior (unknown in earlier versions)
+ * This is backwards-compatibility code for older versions of GTK+ (< 2.4.x)
+ * It defines the new wrap behavior (unknown in earlier versions)
  * as the old (slightly buggy) wrap behavior.
  */
-#ifndef GTK_WRAP_WORD_CHAR
+#if (!GTK_CHECK_VERSION(2,4,0))
 #define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
 #endif
 

Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.364.2.1
retrieving revision 1.364.2.2
diff -u -d -p -r1.364.2.1 -r1.364.2.2
--- gtkimhtml.c	11 Sep 2004 15:38:32 -0000	1.364.2.1
+++ gtkimhtml.c	26 Sep 2004 16:16:54 -0000	1.364.2.2
@@ -59,8 +59,8 @@
 
 #include <pango/pango-font.h>
 
-/* GTK+ < 2.2.2 hack, see gtkdialogs.h for details. */
-#ifndef GTK_WRAP_WORD_CHAR
+/* GTK+ < 2.4.x hack, see gtkgaim.h for details. */
+#if (!GTK_CHECK_VERSION(2,4,0))
 #define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
 #endif

Update of /cvsroot/gaim/web/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11123

Modified Files:
	faq-ssl.txt 
Log Message:
<SimGuy> nosnilmot: there is a typo on the SSL FAQ :)
<nosnilmot> oops
<SimGuy> nosnilmot: Distribution Specific Tips says "Specifc"
<SimGuy> apparently that went unnoticed for a rather long time
<Sebulba02> Who reads it anyways? :)

... hopefully most people who have problems with SSL.



Index: faq-ssl.txt
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/faq-ssl.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -p -r1.17 -r1.18
--- faq-ssl.txt	25 Sep 2004 17:38:56 -0000	1.17
+++ faq-ssl.txt	26 Sep 2004 00:37:20 -0000	1.18
@@ -24,7 +24,7 @@ OpenSSL is not an option for SSL support
 (<a href="http://www.gnu.org/licenses/gpl.html">GPL</a>)
 </p>
 
-!SECTION	Distribution Specifc Tips
+!SECTION	Distribution Specific Tips
 
 Q:	Debian
 A:	Use the debs

Update of /cvsroot/gaim/web/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12359/scripts

Modified Files:
	updatesite.sh 
Log Message:
Several FAQ SSL updates, one minor FAQ update, and a tweak to updatesite.sh to
allow me to be lazy and not specify my sf username on the command line.

If you want to be lazy like me, add something like these two lines to the file ~/.ssh/config:
Host *.sf.net *.sourceforge.net
User sourceforge_username



Index: updatesite.sh
===================================================================
RCS file: /cvsroot/gaim/web/scripts/updatesite.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- updatesite.sh	2 Oct 2002 07:30:57 -0000	1.2
+++ updatesite.sh	25 Sep 2004 17:38:57 -0000	1.3
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 if test "x$1" != x; then
-	SFUSER=$1
+	/usr/bin/ssh $1@... 'cd /home/groups/g/ga/gaim && cvs -z3 update -Pd'
 else
-	SFUSER=$USER
+	/usr/bin/ssh shell1.sourceforge.net 'cd /home/groups/g/ga/gaim && cvs -z3 update -Pd'
 fi
 
-/usr/bin/ssh $SFUSER@... 'cd /home/groups/g/ga/gaim && cvs -z3 update -Pd'

Update of /cvsroot/gaim/web/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12359/htdocs

Modified Files:
	faq-ssl.txt faq.txt 
Log Message:
Several FAQ SSL updates, one minor FAQ update, and a tweak to updatesite.sh to
allow me to be lazy and not specify my sf username on the command line.

If you want to be lazy like me, add something like these two lines to the file ~/.ssh/config:
Host *.sf.net *.sourceforge.net
User sourceforge_username



Index: faq-ssl.txt
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/faq-ssl.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -p -r1.16 -r1.17
--- faq-ssl.txt	11 Sep 2004 21:49:57 -0000	1.16
+++ faq-ssl.txt	25 Sep 2004 17:38:56 -0000	1.17
@@ -18,8 +18,10 @@ Mozilla that misses out some .h files (o
 install mozilla-{nss,nspr}{,-devel} from 1.4, or install nss from source,  in
 parallel and link against those for Gaim. Or just use GnuTLS.</p>
 <p>
-OpenSSL is not an option for SSL support in Gaim because the OpenSSL license
-(BSD-style) is not compatible with the Gaim license (GPL)
+OpenSSL is not an option for SSL support in Gaim because the OpenSSL 
+<a href="http://www.openssl.org/source/license.html">license</a>
+(BSD-style) is not compatible with the Gaim license
+(<a href="http://www.gnu.org/licenses/gpl.html">GPL</a>)
 </p>
 
 !SECTION	Distribution Specifc Tips
@@ -28,7 +30,7 @@ Q:	Debian
 A:	Use the debs
 <p>
 If you want to compile from source, make sure you have
-<code>libgnutls10-dev</code> installed.
+<code>libgnutls11-dev</code> installed.
 </p>
 <p>
 Note: libgnutls &amp; libgnutls-dev (from stable) are known to NOT work
@@ -82,7 +84,7 @@ Q:	Linux From Scratch
 A:	If you're crazy enough to actually use LFS surely you're crazy enough to
 figure this out on your own? (or just see below on compiling from source)
 
-Q:	Mandrake (9.1, 9.2 &amp; 10)
+Q:	Mandrake (9.1, 9.2 &amp; 10.0)
 A:	Use the Gaim provided packages : <a href="http://sourceforge.net/project/showfiles.php?group_id=235">
 http://sourceforge.net/project/showfiles.php?group_id=235</a>
 <!--
@@ -161,8 +163,8 @@ http://www.uidzero.co.uk/rpms/rh80/</a>
 </p> -->
 
 Q:	Red Hat Linux (7.3)
-A:	There's a 3rd party RPM (built from almost the same .spec file as the
-ones on sf.net - gtkspell support is not included)
+A:	There's sometimes a 3rd party RPM (built from almost the same .spec
+file as the ones on sf.net - gtkspell support is not included)
 for Red Hat Linux 7.3 here : <a href="http://www.uidzero.co.uk/rpms/rh73/">
 http://www.uidzero.co.uk/rpms/rh73/</a>
 <!--
@@ -193,13 +195,10 @@ Q:	Red Hat Linux (&lt;7.3)
 A:	Please join this century
 
 
-Q:	Slackware (9.1)
-A:	There's a 3rd party package for Slackware 9.1 here : <a href="http://www.uidzero.co.uk/pkg/slack91/">
-http://www.uidzero.co.uk/pkg/slack91/</a>
-This package does not have gtkspell support because gtkspell is not part of
-the base Slackware distribution (same package is also at <a
-href="http://www.linuxpackages.net/">http://www.linuxpackages.net/</a>).
-This one should work out of the box.
+Q:	Slackware (9.1 &amp; 10.0)
+A:	There are 3rd party packages for Slackware 9.1 and 10.0 here : 
+<a href="http://www.linuxpackages.net/">http://www.linuxpackages.net/</a>).
+These packages may depend on other packages available from the same site.
 </p>
 <p>
 Or you can use the Gaim source, with mozilla-1.4 installed (if you have another
@@ -224,7 +223,7 @@ root:</p>
 /usr/lib/MozillaFirebird-0.7
 </pre>
 <p>This has been reported to work with Mozilla Firebird 0.7, other versions
-might work but this has not been thoroughly tested
+might work but this has not been thoroughly tested.
 </p>
 
 Q:	SuSE (8.2, 9.0 &amp; 9.1)
@@ -233,8 +232,8 @@ A:	There are 3rd party RPMs for SuSE 8.2
 http://linux01.gwdg.de/~pbleser/rpm-navigation.php?cat=Network%2Fgaim/</a>
 <p>
 <b>Note</b>: These RPMs use GnuTLS for SSL support, but GnuTLS is not shipped
-with SuSE. You can get RPMs of GnuTLS (and OpenCDK which is needed by GnuTLS)
-from the same site.
+with SuSE. You can get RPMs of GnuTLS (and OpenCDK &amp; libtasn1, which are
+required by GnuTLS) from the same site.
 </p>
 
 Q:	FreeBSD (5.1)
@@ -345,8 +344,8 @@ option, but I've witnessed more success 
 
 Q:	Mozilla NSS &amp; NSPR
 A:	Mozilla NSS &amp; NSPR can be found here:<br>
-<a href="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_8_RTM/src/nss-3.8.tar.gz">
-ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_8_RTM/src/nss-3.8.tar.gz</a>
+<a href="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_9_2_RTM/src/nss-3.9.2.tar.gz ">
+ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_9_2_RTM/src/nss-3.9.2.tar.gz</a>
 (despite it's name, it contains both NSS &amp; NSPR)
 <p>
 --with-{nss,nspr}-includes should point to the directory with the .h files in (eg. nspr.h)
@@ -444,7 +443,7 @@ on, you need to configure Gaim to instal
 eg:
 </p>
 <pre>
-./configure --prefix=/home/username
+./configure --prefix=$HOME
 </pre>
 <p>
 If there are additional dependancies required that are not installed on
@@ -454,13 +453,13 @@ correct locations to Gaim's ./configure 
 
 Q:	Non-root including mozilla-{nss,nspr}
 A:	Download NSS &amp; NSPR source from here:
-<a href="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_8_RTM/src/nss-3.8.tar.gz">
-ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_8_RTM/src/nss-3.8.tar.gz</a>
+<a href="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_9_2_RTM/src/nss-3.9.2.tar.gz ">
+ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_9_2_RTM/src/nss-3.9.2.tar.gz</a>
 <p>
-Extract nss-3.8.tar.gz
+Extract nss-3.9.2.tar.gz
 </p>
 <pre>
-cd nss-3.8/mozilla/security/nss
+cd nss-3.9.2/mozilla/security/nss
 make nss_build_all
 make install
 </pre>
@@ -478,13 +477,13 @@ NS_USE_GCC=1 make install
 (on systems where make is not GNU make, use gmake)
 </p>
 <pre>
-mkdir -p /home/username/lib
-mkdir -p /home/username/include/nspr
+mkdir -p $HOME/lib
+mkdir -p $HOME/include/nspr
 find ../../dist/*/lib -type l \
                 \( -name "*.so" -o -name "*.chk" \) \
-                -exec cp -L {} /home/username/lib \;
-cp -Lr ../../dist/public/* /home/username/include
-cp -Lr ../../dist/*/include/* /home/username/include/nspr
+                -exec cp -L {} $HOME/lib \;
+cp -Lr ../../dist/public/* $HOME/include
+cp -Lr ../../dist/*/include/* $HOME/include/nspr
 </pre>
 <p>
 The above lines require GNU find &amp; GNU cp, on Solaris you can get these from
@@ -496,18 +495,18 @@ before the OS versions).
 Gaim:
 </p>
 <pre>
-./configure --prefix=/home/username \
-            --with-nss-includes=/home/username/include/nss \
-            --with-nspr-includes=/home/username/include/nspr \
-            --with-nss-libs=/home/username/lib \
-            --with-nspr-libs=/home/username/lib
+./configure --prefix=$HOME \
+            --with-nss-includes=$HOME/include/nss \
+            --with-nspr-includes=$HOME/include/nspr \
+            --with-nss-libs=$HOME/lib \
+            --with-nspr-libs=$HOME/lib
 make
 make install
 </pre>
 <p>
-You should now be able to use Gaim by running <code>/home/username/bin/gaim</code><br>
+You should now be able to use Gaim by running <code>$HOME/bin/gaim</code><br>
 In some cases, it might be necessary to set
-<code>LD_LIBRARY_PATH=/home/username/lib</code>
+<code>LD_LIBRARY_PATH=$HOME/lib</code>
 before running Gaim
 </p>
 
@@ -519,7 +518,7 @@ includes a version of libtasn1 which see
 <p>
 libgpg-error:
 <pre>
-./configure --prefix=/home/username
+./configure --prefix=$HOME
 make
 make install
 </pre>
@@ -529,7 +528,7 @@ libgcrypt:
 <pre>
 # fix the configure script!
 perl -pi -e 's/ --prefix=\$gpg_error_config_prefix//' configure
-./configure --prefix=/home/username --with-gpg-error-prefix=/home/username
+./configure --prefix=$HOME --with-gpg-error-prefix=$HOME
 make
 make install
 </pre>
@@ -537,8 +536,8 @@ make install
 <p>
 gnutls:
 <pre>
-LD_LIBRARY_PATH=/home/username/lib ./configure \
-                  --prefix=/home/username --with-libgcrypt=/home/username
+LD_LIBRARY_PATH=$HOME/lib ./configure \
+                  --prefix=$HOME --with-libgcrypt=$HOME
 make
 make install
 </pre>
@@ -546,17 +545,17 @@ make install
 <p>
 Gaim:
 <pre>
-./configure --prefix=/home/username --enable-gnutls=yes \
-            --with-gnutls-libs=/home/username/lib \
-            --with-gnutls-includes=/home/username/include
+./configure --prefix=$HOME --enable-gnutls=yes \
+            --with-gnutls-libs=$HOME/lib \
+            --with-gnutls-includes=$HOME/include
 make
 make install
 </pre>
 </p>
 <p>
-You should now be able to use Gaim by running <code>/home/username/bin/gaim</code><br>
+You should now be able to use Gaim by running <code>$HOME/bin/gaim</code><br>
 In some cases, it might be necessary to set
-<code>LD_LIBRARY_PATH=/home/username/lib</code>
+<code>LD_LIBRARY_PATH=$HOME/lib</code>
 before running Gaim (this was not necessary on the tested system)
 </p>
 !SECTION	Troubleshooting
@@ -643,7 +642,7 @@ are similar to above, except the file to
 The output should look like this if all is good:
 </p>
 <pre>
-$ ldd /usr/local/lib/ssl-gnutls.so
+$ ldd /usr/local/lib/gaim/ssl-gnutls.so
         libgnutls.so.8 => /usr/lib/libgnutls.so.8 (0x40003000)
         libgcrypt.so.7 => /usr/lib/libgcrypt.so.7 (0x4005e000)
         libnsl.so.1 => /lib/libnsl.so.1 (0x400c6000)

Index: faq.txt
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/faq.txt,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -p -r1.159 -r1.160
--- faq.txt	16 Sep 2004 23:53:51 -0000	1.159
+++ faq.txt	25 Sep 2004 17:38:56 -0000	1.160
@@ -670,7 +670,8 @@ Q:	Is there a way to make Gaim automatic
 chats on login?
 
 A:	Yes. Add NickServ to your buddy list and place buddy pounces on
-him/her/it.
+him/her/it. Do not include &quot;/msg nickserv&quot; as part of the
+message to send.
 <p>
  In version 0.64 or higher, you can add a chat to your buddy list, right click
  it, and tell gaim to auto-join it.

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17732

Modified Files:
      Tag: oldstatus
	COPYRIGHT 
Log Message:
[22:08] <marv> i can commit it, if you tell me which tree
[22:08] <seanegan> both?
[22:09] <seanegan> It removes the Web Browser dropdown if you're running GNOME and uses the GNOME browser instead of what's set in prefs.


Index: COPYRIGHT
===================================================================
RCS file: /cvsroot/gaim/gaim/COPYRIGHT,v
retrieving revision 1.86
retrieving revision 1.86.2.1
diff -u -d -p -r1.86 -r1.86.2.1
--- COPYRIGHT	31 Aug 2004 20:10:20 -0000	1.86
+++ COPYRIGHT	23 Sep 2004 04:00:13 -0000	1.86.2.1
@@ -38,6 +38,7 @@ Finlay Dobbie
 Mark Doliner
 Nuno Donato
 Jim Duchek
+Alex Duggan
 Tom Dyas
 Marc E.
 Andrew Echols

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17732/src

Modified Files:
      Tag: oldstatus
	gtknotify.c gtkprefs.c 
Log Message:
[22:08] <marv> i can commit it, if you tell me which tree
[22:08] <seanegan> both?
[22:09] <seanegan> It removes the Web Browser dropdown if you're running GNOME and uses the GNOME browser instead of what's set in prefs.


Index: gtknotify.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtknotify.c,v
retrieving revision 1.66
retrieving revision 1.66.2.1
diff -u -d -p -r1.66 -r1.66.2.1
--- gtknotify.c	21 Aug 2004 05:12:23 -0000	1.66
+++ gtknotify.c	23 Sep 2004 04:00:14 -0000	1.66.2.1
@@ -466,6 +466,17 @@ uri_command(const char *command, gboolea
 }
 #endif /* _WIN32 */
 
+gboolean 
+running_gnome(void)
+{
+	if (g_getenv("GNOME_DESKTOP_SESSION_ID") && g_find_program_in_path("gnome-open") != NULL)
+	{
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
 static void *
 gaim_gtk_notify_uri(const char *uri)
 {
@@ -478,7 +489,12 @@ gaim_gtk_notify_uri(const char *uri)
 	web_browser = gaim_prefs_get_string("/gaim/gtk/browsers/browser");
 	place = gaim_prefs_get_int("/gaim/gtk/browsers/place");
 
-	if (!strcmp(web_browser, "epiphany") ||
+	/* if they are running gnome, use the gnome web browser */
+	if (running_gnome() == TRUE)
+	{
+		command = g_strdup_printf("gnome-open \"%s\"", uri);
+	} 
+	else if (!strcmp(web_browser, "epiphany") ||
 		!strcmp(web_browser, "galeon"))
 	{
 		if (place == GAIM_BROWSER_NEW_WINDOW)

Index: gtkprefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
retrieving revision 1.204
retrieving revision 1.204.2.1
diff -u -d -p -r1.204 -r1.204.2.1
--- gtkprefs.c	27 Aug 2004 22:23:31 -0000	1.204
+++ gtkprefs.c	23 Sep 2004 04:00:14 -0000	1.204.2.1
@@ -2422,7 +2422,10 @@ void prefs_notebook_init() {
 	prefs_notebook_add_page(_("Network"), NULL, network_page(), &p, NULL, notebook_page++);
 #ifndef _WIN32
 	/* We use the registered default browser in windows */
-	prefs_notebook_add_page(_("Browser"), NULL, browser_page(), &p, NULL, notebook_page++);
+	/* if the user is running gnome 2.x, hide the browsers tab */
+	if (running_gnome() == FALSE) {
+		prefs_notebook_add_page(_("Browser"), NULL, browser_page(), &p, NULL, notebook_page++);
+	}
 #endif
 	prefs_notebook_add_page(_("Logging"), NULL, logging_page(), &p, NULL, notebook_page++);
 	prefs_notebook_add_page(_("Away / Idle"), NULL, away_page(), &p, NULL, notebook_page++);

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9194

Modified Files:
	COPYRIGHT 
Log Message:
 <seanegan> It removes the Web Browser dropdown if you're running GNOME and uses the GNOME browser instead of what's set in prefs.


Index: COPYRIGHT
===================================================================
RCS file: /cvsroot/gaim/gaim/COPYRIGHT,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -p -r1.91 -r1.92
--- COPYRIGHT	19 Sep 2004 19:01:01 -0000	1.91
+++ COPYRIGHT	23 Sep 2004 03:09:44 -0000	1.92
@@ -39,6 +39,7 @@ Finlay Dobbie
 Mark Doliner
 Nuno Donato
 Jim Duchek
+Alex Duggan
 Tom Dyas
 Marc E.
 Marc Etcheverry

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9194/src

Modified Files:
	gtknotify.c gtkprefs.c 
Log Message:
 <seanegan> It removes the Web Browser dropdown if you're running GNOME and uses the GNOME browser instead of what's set in prefs.


Index: gtknotify.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtknotify.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -p -r1.66 -r1.67
--- gtknotify.c	21 Aug 2004 05:12:23 -0000	1.66
+++ gtknotify.c	23 Sep 2004 03:09:46 -0000	1.67
@@ -466,6 +466,17 @@ uri_command(const char *command, gboolea
 }
 #endif /* _WIN32 */
 
+gboolean 
+running_gnome(void)
+{
+	if (g_getenv("GNOME_DESKTOP_SESSION_ID") && g_find_program_in_path("gnome-open") != NULL)
+	{
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
 static void *
 gaim_gtk_notify_uri(const char *uri)
 {
@@ -478,7 +489,12 @@ gaim_gtk_notify_uri(const char *uri)
 	web_browser = gaim_prefs_get_string("/gaim/gtk/browsers/browser");
 	place = gaim_prefs_get_int("/gaim/gtk/browsers/place");
 
-	if (!strcmp(web_browser, "epiphany") ||
+	/* if they are running gnome, use the gnome web browser */
+	if (running_gnome() == TRUE)
+	{
+		command = g_strdup_printf("gnome-open \"%s\"", uri);
+	} 
+	else if (!strcmp(web_browser, "epiphany") ||
 		!strcmp(web_browser, "galeon"))
 	{
 		if (place == GAIM_BROWSER_NEW_WINDOW)

Index: gtkprefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -p -r1.207 -r1.208
--- gtkprefs.c	9 Sep 2004 03:36:34 -0000	1.207
+++ gtkprefs.c	23 Sep 2004 03:09:46 -0000	1.208
@@ -2455,7 +2455,10 @@ void prefs_notebook_init() {
 	prefs_notebook_add_page(_("Network"), NULL, network_page(), &p, NULL, notebook_page++);
 #ifndef _WIN32
 	/* We use the registered default browser in windows */
-	prefs_notebook_add_page(_("Browser"), NULL, browser_page(), &p, NULL, notebook_page++);
+	/* if the user is running gnome 2.x, hide the browsers tab */
+	if (running_gnome() == FALSE) {
+		prefs_notebook_add_page(_("Browser"), NULL, browser_page(), &p, NULL, notebook_page++);
+	}
 #endif
 	prefs_notebook_add_page(_("Logging"), NULL, logging_page(), &p, NULL, notebook_page++);
 	prefs_notebook_add_page(_("Away / Idle"), NULL, away_page(), &p, NULL, notebook_page++);

Update of /cvsroot/gaim/web/htdocs/sean
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31076/htdocs/sean

Modified Files:
	status.php 
Log Message:
Those aligns didn't work well.


Index: status.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/sean/status.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- status.php	22 Sep 2004 23:06:34 -0000	1.1
+++ status.php	22 Sep 2004 23:10:21 -0000	1.2
@@ -15,14 +15,14 @@
 <li>Create complex statuses where MSN accounts are Out To Lunch, and AIM accounts have an available messages except for SeanEgn1 who is Away with a specific message</li></ul>
 <p>I've focused on the first, more important, list which should handle 95% of users' needs.</p>
 
-<img src="online.png" align="left">
+<img src="online.png">
 
 <p>At the bottom of the buddy list, is a dropdown menu.  In this menu is the current global status (in this case "Online").  The user intuitively knows to click the menu to change his status.  He chooses "Away" from the dropdown menu.</p>
-<img src="away.png" align="right">
+<img src="away.png">
 <p>The menu changes to the Away status, and an editable GtkIMHtml appears.  The user enters his away message there.  We add a timeout and check the "changed" signal to determine when the away message is finished, and we set it then.  This is not unlike how we send typing notifications</p>
-<img src="menu.png" align="left">
+<img src="menu.png">
 		<p>While away, the user can edit the away message just by changing the text in the GtkIMHtml.  To come back, he uses the menu again to set him as "Online".  Next time he uses the menu, he'll find that the away message he just set has been automaically saved.  The menu will ordinarily contain many more status included by default, but I didn't want to mock too much up.  I'm a busy guy.</p>
-<img src="savedmessage.png" align="right">
+<img src="savedmessage.png">
 <p>Messages will be saved automatically, and then deleted after a given amount of disuse.  Users can still create their own messages that will stay persistant in "Create new status..." This is where most of the more advanced things from the second list will occur.  Although I do have a few ideas about that dialog, I'll wait for feedback on this idea before making mockups of that.</p>
 <?php end_section();
 ?>

Update of /cvsroot/gaim/web/htdocs/sean
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30457

Added Files:
	away.png menu.png online.png savedmessage.png status.php 
	status.php~ 
Log Message:
mockups


--- NEW FILE: away.png ---
‰PNG



©ÌÌZ0h
©\!Wš>ÀÑ'՝³ë«ùüÖ65òŸVÃô#cA
%ÜyìŠGe;þó>›T&7·´6-ØyìŠã?Oáue¬Oá?­V
>¹5³Ê¬e	D_ѯMk‰EIùÒ¾ ÄOÓYTúӞ”ÜT*&ÌTfoÈ*A
„ LMÿp0½¯-
@§ÑËNl˜

wS)åju"þւß"Dþ¸'nbLÈÊÅÿñéOjRõÿ2ÊL‚©c¥Q&“?˜›ýk¥±í¹Õ*Û™{vû—5€ˆQ?f(dÜ¡¿ólî÷ԚɌº5±é¶ï;ßE®b¹ŠÄ¬gÕÕt҉³t3³q‘(-^ûeÆûËè·p´Ît„F(¬¥v>"©9]™mÈOR,³0ä_åƒY³ž„X®ÍŽg*s	R&uð7ä%֝.–*¿þ ³—“yTÌp©ck±Ê¡æÒjm
€¶<ïÊî9õÚ¡og免´ª5¦|6eGW6±³bh¹E#¹E£ru€²²IÍd*3™Êò
y)†kћ5¨>s¦“!R,Qª¬kµ+Ђ‰›÷âh`ÎÂÚF,í`ÐV!ŽF„HâÍ2ú:Ò;‡·èì¾ôÇ_Tˆv
+IõÛZÚ
ԍN§S(¡®íë“ù_ƒJ‘ˆ0­E¸”âàÁƒFÉ°,÷D2	—O@...; ðŸË€~™‘"Áõ¢€ÀPOÉÖL@... ª•ù/”öÑG©ÕêºS•••½zõz½Ï(ð|eVÉ<±ÌJJJ
…···§§§§§ç·ß~ûØs¬_¿Þ`0ÔLá«ú/¾ü!Cš7oîåå¥P(š7oÞ¼yóI“&Õ§ MÓ'NœxöTûju|ÓçuF†,³§œ›¥¤¤
…¢¤¤„¦é)S¦ôë×/**Êø³]-¥¬¬ÌÍÍ

Ÿóy5@...¦Úܬ¾Ö!dgg·`Á{{{Ó5C†aøƒÁÀÝh
j¦ðˆÅbŸÿýﾓ„ÐÁƒ9²víÚ½{÷¾øßõÿ®>5¿,˲¯?Iò×G&âì¼*s³ÿ~AÿΝ;r¹\"‘ˆÅb~®eœÉœ>}
¼HBfffÂuxe&ìÐh€ÖŒd& ðÂæf:Žwu   ð_Í͍	¼Q·³ËåõuAË?ñzÖ¹YLLŒpõÞLŸ×ó‰ñÏV¯æ܌㸲²2š¦B
¡S¾¢˜nï®)³§ðò46oÞ¼­[·,^<7:ºIŠD$$0f>8Œ1
Bhʔ)}úôINN^µj•Ð³_E^ŽÌ4͙3gFz€ã­ÇÑÇr±÷Èþ‘£Fnúm[v^AU•ž TWR’ÆŽ» vqzNFa¡cŽã
’µµõk|ÿ¦M›»hÑ¢ÿ¨þøøx[[Ûƍ0`ƌµæÙ»wo```›6mþùçŸßÿ}ʔ)!­VûÉ'ŸtïÞýQÃ[[Ûøøø°°0Afÿ!m۶ߺõ??w•J,¤„lÑÎ×ÑË1ýJZAz~njoÎÄRÒԚU«gêŒI
@ F¨T,.
¢×®íš˜x¬!Ç7h(2KKK›6íã¹sßëÝ;@ >`>ª
ƒÆºXºtix¸÷Àíâwx
>øàƒzæ|"_×/Mf—/_Žÿgõê©b1]Ú
!V¡ GrëÞýØ£â›	<õÔOý]íÃˍoæädî>`
¼´øfgϞ3¦+Aè>(
íììúöí
Ý­É ¹<«UP‚™Y©Dòw³ò–1¤ƅ>>gmmÓ8Ž>àÿa©TOÌSÇ7ËÌÌ\²dÉùóç>àäɓ›6mºråŠX,

ý믿¢¢î;—Éd[¶léß¿¿··wŸ>}
Ä;±9rdLLÌÇ
TÙ³£Ç¸À€oÓ´
…¾u뜠 !Š h
%%%e
s³§ÇÜܼS§.çÎeqœ>c
€c½nUºöÇl`(ãì€Æ˜?f0fèDJ«§óšf(Š3Н;\}dÆ;f*--]²d‰iúÒ¥K/\¸°iÓ&
ׄ‡‡[XXôêÕËËË«š·z¹\þË/¿LŸ>=))©e˖+W®ìÓ§OPPïd׸j²wïÞÖ­[7iÒÄÍÍíÛo¿Ý¹s'
<#ÆU4¹\^ÿ] hè^‡Û´é²iӅÀÀÖVVœXÌ +`¦
&©£UÌ5uIHÁ> iÅâVÇ°Z
£Õ‚N'OH@...šÔ»÷¡]»²Þ}×ÚÌ“$ƒ. -\9
‹1bÛsÉR£Ñ0Z-§ÓIÊÊT;wæGGmÑ¢…p™=??¿o¾™ÿÅ;8Dtì(–ÉtQüö|¬b°‹1Ëǀg†Ö±Ã}iµ6Û¶©óóUóæÍVä™=>¾Ù7ß|ϲ¾!!¹Ü
>AfτV«=þŸßvmˆÒ|½é o$“!ŠÂ%epüï={÷4éòրž=£-,,wQ‚Ìž†üüüµ?,/ÊÛ7n„£OóÆ"â¾·þSŒávZɆmsÏýs|ÂÄ>>>æfOFEEŊï¨$ÇçÌöõók!»

1Wˆ¹RÀ:
c€0SSc¥¥ôåk V
…¢Ö
yÃ:î‰úVUU%$$ÄÄÄhµZ
}ûçM&OT*U$€¸B`‹
€>0ÆcÀßÍàZø„xyyÕ &  ȬÞÓD’lß¾c|¢ìÖmMnž¾°È_h(*¦KËèÜ|CâuÖ×׏_E–@ž;;;µÎeÂôSz½Î` †E$D’„BéöîûçøBç'Ÿ|²hÑ¢ú§¼	ètºƒ¾æ2#I²_ÿw[ø]»víæ͛™™™ÅÅÅ4M[¬n\è¶`>ÔºÃÒ>ÿ,-	Ó¦M‹­û\5µÄ—4ö&³yóæN:Õ'çmOopóœÓ§O_¸p$I±Xlmm­Ñhiz \þv—.ªG­|hµ°côêM›Àùóçõzýƍ½½½“’’ÊË˝œœ†zàÀ>„P=V­Z5nܸiÓ¦­Y³ÆX‡±T||<Ÿ>qâĎ;æåå¹¹¹]¹r¥gϞ¡¡¡:nëÖ­"‘È`0Œ=Z&“	]SàՓY`` Ã0ÉÉÉÙÙÙEEE®M[3³EäæÍuëÔ	ÌÌ`øp
±$ÜÇ#ÜÇÍÊ\ˆò.
ö@|¡„kŚ*‰\$W29¡eé¿.ß\³÷tZvá£\ç¼9ètºÍ?ýðéäxwÑóçÏwrròr°hbyêøQ–e³²²º…úž<vdŸž?wUL˜0aéKt48köDžKY%%RA’"
Ó4æ8 HÉÇ-&&†wñý믿4Ș^-ˆŸhkkkôž™™¹dɒ+VÔQyHHHII	¿ƒyôèÑ3gμvíÚàÁƒ'MšT3s~~~JJÊüQYYyòäÉZC®™6@...ãáèØ:6
cr‰Ø×Ýñ±µõêÕëƒ>¨¨¨8xðà¬Y³ŒéՂ˜ñ‰S§N5FK;vì¼yóê^óeY
(̲
ªÐ^íìíú%G­±‘Á÷‘Õó\(€°FЕ;
)Gç^†ÔŠ7Of
Øzz:÷W! YGeÐ0

>`ÿþý………
*KâïÜFb‘TŠ
$—!‘(,¦ïÿþ¨ËªonÊNÍ
{Þ¯Ë'{xx6íõÆ××W­V@HHȼy&MXˆ©Ð¨V]+
€Åã£wÃr…l÷’>údNO1
ÎÏÏ¿~ýz«V­,X0sæ̔””Ý»wõÕWǎ³³³Óh4¦ÑÏbcc‡nggwàÀ>ww÷-ZÔmß"##ÍÌÌîÞ½+•J
CLLŒ³³s­!ÑLÆÇÇó
Keˆ>B
Œ¹sûNÔ¬'¬gÓY™F£¹víڕ+W
Ê
4[¿M"ˆûq^ß ™‘„ÈÞÌ.Q]PUÅr´H!!YÉ>#ƒž£i³,Ð4¢(‚¦8ÞSÛù?Ðû¯õiådT	=¨¨(óNQSxëþ„
úoÞµ÷Ë©Þ.|úÉNG
Qڃ æoÌ„Z{zšIÌ4J!“Yš)ÌÍ$÷Š‹Sss5zËqyÅ,Ãv{ïó¶ýçÕ]ç¹sç„Î÷†püøñ)S¦”BU9\3&2yêI‹oW>²
*Ä°üþt¨-[S¯0¯¿Ì
ˆ
 îG›$^9¼„$	ÆøìÙ³mÚ´éСÝ;w6lØðrLq¼ R©4<<’Ÿ÷ä–Wq
R”¢<Š"¨AªÒAšB-HHBz¯›-çœy?œÇ}ód7Ë&„Àü?ä·9uvf®9s暈ƈ.*çvÎ¥(êáÎ%´<=žèñýڕ#'Sy·ëØÑÝ‹|9¶³Lê¬d¡†Bÿ3"Ü‚€ºuëÖÞ½{Ǎ§×ëõzýCI|+ÐñÅW¯^”|éÏo¾=ÖÇÇÃJ
@è¿Cù@Q4í`+ñr“û´“»©äVJÖE%{:Ò¾ªªrïÞ½õ."“É6oÞ<xðà˜˜˜/¿ü2;;
@Fم:š¢r¦¼ŠÏ*Ð^H©úåXÑÙ«•C½µ
EâãããââŽ9">¤}üñÇ%%%f„	

«Õꪪª.ÄÇÇWTT
 °ƒyŒ1èôz…BÊcãô4M!`JK>GÊZ
ÕÕ¶:–áXAŠÔLícך\¿~ÝÁ–qw‘>P€Øit´—þøYçEßßÙ~0_„˜˜˜wÞyÇÚÚº¡ë „öîÝ;gΝNDz¬‡‡ÇöíÛÃÂÂV¬Xñâ‹/ŠSÝæ̙?nܸ   ÆÇÇ2äÀ&/!ö>ÀÆÆæòå˧OŸ>pàÀ¢E‹&Ožl&%„fdÓ歈‘ê0M1´Àñæ(,
#
#d¥”¼?Þï»9­åÜìÙ³—,Y"†ny®\¹òÔSOI$’©S§®[·ÎÑёh øpîGˆÂ4¼N#—JhŠÂÑxý“ݺZ)­Dó‹ ð,Ëüï£2b$L3³gÏNJ<£T*y„â‡]þÍ21Á£/3ŒqYYُ?þ8a„¼Ü»#cû÷pôßaƒJ>éZUa©ˆ¢hzø
0Ð%`(´wïÞýûãu
vô‹¾?Îþ|ÍuŽ§‚ýü|||H-|äa€Öñz„)•«³“ó€~ŠJ
wïÜåÛޛ¡Y½^Z¶lÙ²eË"""¬­­7mÚ$ÎkÍÍÍýì³Ï¢¢¢xž?wîܖ-[Äё{°h­EQC‡efÿ‰âÒJþ䅊i‹S½y>éjU1{öì4haL–¦é‘#G~õÕWzžûõåaoý=m~RVžöµ×^Û»w¯8ÊDx´Ñk9	-¡
éRRV2wÎÜä—öíùeäðž‚ Œ5J¥RõéÓ'&&¦cǎ6l¸víÚ¨Q£»wï>cƌ'Ÿ|ÒÏÏO"‘ˆÝËG¼5€ˆˆÿӗn÷›|.»@SY-´s÷ø`Ò¤W^yÅxqs†a†~ëÖ­Ï?ÿüÄÙâààï¼óÎðáÃ-œ!EhëP%
òÿþëT{ßöR¹ÜÊڊaXgggA>ú裥K—²,› Ó骫«1Æ˖-;}útTTÇqfêÔ©âÏó-¶€Üԙ‡‡ÇSO=µ~}êå›Õîîîã'Ž9rdXXXC³†™>}:Çqåå寿þzHH©|ÿ}Ü¢©‹—/¾ÿáŒmÛ¶½’À*¤^í}f|0S¬3ß}÷]nnnzzºÏdÔ¨Q>>>âʧ‰‰‰Ÿ~ú)ÆX\&ÕpÍG_fR©tݺuëÖ­³ü{{ûE‹‘:÷Rï9jó–Íõضm[+~°l€Vî&EKxX85þQnÍLRSUQ”›UšŸÁëʐ ŠÚÆVåíâîmmç€(÷ÐöhE2Óë´¹©Y׎û¸–Æu¥Üœi™œÒi…‚â»g/^ºtÌZåÓÍ7$R&×/ ˆÌIueùÕ~󵿺l®gH°?Mq
ëÔ©ÍzR>H >~ŠÞ÷}ù¹ÂÔÄ=%…¤äDf

!
÷'º™ŸßøÍÎ#j¶®¨LöÅæß> ÊnòàÞDf„GVf4Æ÷8z$S¹ñüøÑZk›"@•€‹>þ§5«QóÛvîø]ÒõY+»æJ€„eÚ»;ßÉ-&µðÈÊ
¹ôÙ®!CŸÞôY!‹ð@hEcâ
+kÖ.ìôÙJ^à,
ŒÐiucwÎ>>#BbÔ`
9ÓØøfšÚjƒã“@ 2»™R«AoÆ°2Š"KƒˆÌ,ÃÃÃ?ã.ªß™ovýF­£“§R©l%™XQQñì³Ï’ÊDh½2‹ˆˆ¼~[Y\Tˆ…B,”®Ða3ñÍJõç/³¡¡]
ÓË6#„¼½½Ûµkççç÷É'Ÿˆ‹ö4–={ö„††úøø¸»»ûûûoØ°¡¡{éõú#GŽÊDhˆ‡?$   ªëk7®ó5¥ÒšÁ÷Šo¶s_‘̪ë“O>i~~cff&
œ9sAF^PVV
.Ð „
Y¥ø±âьo†Z¶lYÝM&­[·
ÒÒHÇikk«„›wNü|.22ª›«««µµµR©¤(J˜D"¹Æ899YWuüÙèˆuD”ó–-¦¡ Ô+“V—?­îaooïèèèàà •JEw#iӏ9x=­V«oß¾Õµc:’·§äH¤!Hê†dVÀ0AÎÅn|rjjjaaaQQQee%Çq4M‚ ‚…2W(;vì Ch1Z`œ¼2«®®ös½&WÈ)Ö1>ˆqG´¢­
EBB
Œ5
Ö—ŒçyCfÉHãúõë=<<zõêÕ·oßvíÚýôÓOÕÕÕ
˜pO8дYù
…ÂB÷t#ægÔÖÖZ[[=ÙÛ7ýö¹Ÿ÷Þñî×µ¥²°î&
ˆêõTûþŽ1H$„ÆX©TJ$š¦1ÆtX!Dê
¡y•v?ƒÆ.¹óT÷'wì9Ž)
¯¤¶wW>ßÍÆÝY–S‚õ<}厮c{•Le'¯ÒP2¹U„þeJ7‰L†1æ8N¯×¢~m®Mk9™!D)eÒჼÎ]ü›’y Ä^ÏäN^Öä–à /k7¥€™¿.WÕꢙ¨ð€ŠòGGG{{û–!Z¨÷Ãäææ#(‘1ÕÎ6%{ö@Œµ›räs.ÝBìd‰Ž§Êqh€ƒ‹ƒ’¢Ø*5߯wç7nˆJ“ËåÄßI 2»‰„a˜šê<…”z¢£ä—}¿–P휱·²õÿ\¯–I¤nN
…$7¿êýy[FLüKû÷ïomm­P(d2Y*˜ðxÒ¸æÅÅÅ¥ªâš\Q«äuczÊÿ9snÐÀ^5jµZ‡ºvT•WÔüqøÂùë…9ÚÀÀãÇÇ©T*™LÖP¼"´f&dVY‰ùêjm×сM;÷7%qRÊ¥AžÊÔ«·G¼<çÆ®½9¹š°°.žžž*•ÊÖÖV¡PUw¤5k®®®g¯é½Ük¹JP‚\G§¦\,-«Ü÷û¥Ô¥owu±®­Ñ‚ØK»ˆ$â	Ð8™Y[[#©'_Ã骡 D’ÆFî8zóvæÀ!ït¬ý3%åYÝig¬)//W©TÇi4ŽãˆÒDfCfÛA]&©ÒR'˜î!a¹Ù©/hmcãééÙ¾}û¤3^Ùÿd2Ã0‚ èt:N'.U@...
ÃYηS[[[q¤ÞÑÑÑÉÉÉÖÖÖ××÷ß¬mKóÄá{žç9ŽãyžåˆÌ““S¥×0•c­ƒÊ½¸¸˜eY+++•J%ZËlll^x)¾¤¤„¢(N'NŸÐHkFhÄÇÇ?舍–™MhøZ­V\€ã8¥R)ZËÄQ{{{{µZ­Ñh0Æ¢­“hŒÐji¨,MéËQ%6bEéõz–eÅՅ
{%‰ø!Ä0y+M Æ&Æ0VVV
›5&‘HHþædÖ,‹#„är¹­­­\.›¾êêêÊÊJ½^O²žð˜ÊìNf¶øÁòˆ¸æÁ‹k‘Œ&´fKîÈåòF=Ñ$Ó™Õ}ˆ"qn	uGA,»{Ž;üÌ2VA 4ª7Ø™Ñ4±]ÀBÉ4Øi$ÈÌ"ÉPõÎ!J#êaˆÓ`Rf–H†ª×Ñ$g‚±ÆRš…’©×šQäñÌ@VV–£YøöÛo•Jå›o¾I2ª¶c&•f¡dîÝiDݸqãÁ}ŽãnÞ¼Ù\WÃoܸ1::ÚÓÓÓÝÝÝËËë7ÞwmÚ´©C‡ÞÞÞîî?ýô“ùK©Õê#GŽ4WÂæϟ¿k×®4ËÕNž<°iÓ&÷fgg÷èÑ#888>>¾¦¦æ>ËëƍâTU“%.ê.’ššÚbÉ{ }Eã-–>g‰Á5>àp*^s({Í¡l
@dö
--- NEW FILE: menu.png ---
‰PNG



äfÄnZ}NKk»êÝX¶øF7ןºù¤bCé‘M~Ëì§pPZØKåjŠ"
	7'Źc‡êž¿s¯(V>KÁ‚ÜŒ:¡kã­Ùu¾z:¯/ŽnõÓðWTRYw^{y$wE›–ûcBsGoµ­‹DªŸ·HÃAoe¯­(ýùµÅùÏRÐÆÖ!pȧ×ö-øçÚ³wp²´)©ž.ÓçvðÕÊÔá@Y Ã]
‘0ëìßòŠ(¬W©ä
3Ñô‰4äJ•Rm
€ÎÚö™ì^A^NIANõt›L>Ö'‚Ø’{†[BéËKyI6’[),ñýD]Xÿvˆ¹üõ¥çë˜þ·p±WógéÅûl°qÔU”Õ%§Í ­()È­^ðÄ×Ó:ŒXR9ÿ…]ÔX
;µÚÜÜÒZeõ²Ø½Sül̤¦?Y§æ鷜ÊLÉÕÕ¥¸µ¹ÂÚLšóûFï¨ê’^Ë5ûüZ•ôof•߈9/S×üìí¬6WÒWî—5úÇ$W(*µpÜ}âš'e;õí!›\¡´°²©\°ûÄ5§¾!ˆÍTƒ"|Z¥ 
,yIìæ[H§Îù>’JéàvmF0&\1uÕ©¹C‹sƊôÛXØ{<5½–Jnýø¾sçé•Ó{ÍËÉ:÷¥D¦j4†¢eÕ~67²°T{èÐQ…­{#·{ö“ùªÝ

fÒºk

­¡[§°Ï¾ü¾÷«ÝhŠÚûÃnÚÊÕX‘פyk¨²Ý€êËt>2©$, å/±Ê³÷J	« ™|
œÙ6ßt»÷³®c–W9‘éðšg¶{Ņ5Œ÷(^˵À—"ÞHŒÑcm)Ê7ª5*¹Ê’–¨ËK
¡åêÆn÷0
ôîú36k¶ŽÔ}ÄÐþŒœ±ö<À£ÙhŠ’XÛ84âÇ$—+•ÊÇã=e­ã=¥ZÈ/ÜÉÊÏíüŸpÐyäb¥RÝyäb!åòþ%G.6èÏG`xv»WTó<ç½Ô¼ª¼ò{LIèJ)¤á͍ù™e…DnÎQ²'Ö£Ýã> ò•.Š¦ÞJµyP+'
!CûóL™Ûœ'¤ŸÛù?!ÝT
M)dR33©Bý2hOk}þÙûŸF†»|=yá²5H*ß|ðò¤AÁ}ºE¬üvß¼·†4±³>€­/;[K»‡ûYYZ~¹å—Ù"kO
…Jõ·òÍþ
€±¢è™íž…UmEkšX©GN]Ë®ÈMb.´¹“R©–)”â=ù»””V””Vü­"B³ÿÇ>@^·ÉZ×så‹ï¿)›HM
²,{úôég¿€*_­–oZ_giøÚ«Ÿñ^RR
‘ç:Þ…'òRaZ߯TÖÕ±ðî_ïEGG‹Dä%¡òÛì:¾Ù~짬÷0Æ%%%,Ë"„
iHã½üÆøþýû‹/¾s疗—çwß­±³³D0æ	!ã;w’wï>ðË/?5oî>sæ̈ˆñuˆHÃÐ^Ãö•ôTöíÛ×»wož7nÚ´fóæuáá¡^^-[´háåÕÂËË£eK·þý{îÞ½nãƥ͛۽öÚð5kÖ¼XËMõzýš5kĖú‚Ry½û³H¦Á÷-Z´cÇöåËFEõ¢iéã0š!<
…"..®°°*ù¤éÕ«—Ù”bbýúõæСC[¶l1ý
0“––æçç
(7kÇ¡MÌ́a½Þh00~ÿý~¸¸F¯»
Ÿ¼¼<š¦­­­ïÞ½»iӦŋk4š*)uùYyF*/Õ¨û&ž!C†üß©

E@...ccŽ,7S$ÇÞ9¿ûtÎýl£Î@	þÓâývøˆé
ËËËM9+_C•Ú0Æ­[·...^¸p¡I{•'‹ŠŠlmmk<¦¸ŒF#˲‚ÌL<éš>ÀÉÉ©¤¤ÄTÓ~CoܸѡC‡›7oúúú
ßî©ËeKKK›6m*jï?C*•NŸ>]"‘|ðÁÒ>ºÖK.G³Dz,ƒ1O6µ-žçϞ<SCç§KDÝAÛ·oñâEGGG
1â> M›6?üðƒ©ìêÕ«-ZTã>
ž7””]MIL>sóRõulߚՖ–ÝÊK¹}êªEQÓԎݽeå

n˜MÓ3hß¾}³fÍÜÝÝ?ÿüó={ö
¹b
…!FØÄ@Ì9bÆÂÂaÌñÇêy£ñ‘ðt:۝;5¹¹æ‹-çEDíý„ø{Ÿ}ö%Ïû˔J#
Ä0¤¨Ný¶ÿÀþf=^Ò·o”¥¥¥èüKDÔ^½‘››»ñ«Õ9'qòiÕTB=òÈ"|JÜK)Ú¼sá…?NM™:ÇÇÇG|"âx¯(++[óÅsÙ©ó}ýüZK¤®€ì>þÜÁxyª>˜íêëymúÅ>¤ˆ¨½g…çù_~ُ¸cF»ÙÙ·B´ÐÞ iȼòÕ"„ÌÍèQÃíܚ^ß²ù›ŠŠ
ñYŠˆÚ{&RSSOß9õ
wsKO }€n>T3 ¬>É«gVÈ©QÚ<Lýíʕ+OÚ&Œ1¾wïžø¤EDí=…kñW½Ü‹ì‘ÄI\²AÈ€ÂWό²µ‘ú2qq†+,..nÙ²¥ø¤EDí=…´´$Ow
I¬AҐÐç„?yvVŠV«­1Ãüùó>    ==½F—Ï_|ñ…ÍĉwïÞíàààïï/¸µýî»ïBBBš5köæ›o
U½ûî»-[¶ô÷÷¯âàLD¤1hO¯+W)i@*
@Z£ú,-¤½Æä|¶
˗/€„„„ÔÔÔ­[·^ºt)!!!66ÖäÌÜÜüΝ;ß}÷ݽ{÷²³³1Æçϟ€ÈÈÈØØØëׯûí·ååå_|ñEllì7æ̙#6‘g¤Á½c)ÔF
Ùâ6;טp“÷õõæ0ED^D´Ñ°··×è]§Ì>k0èF†ãx„@&C4M©Ôq¨Ç]³ï½÷Þ²eËêž.ò2 ×ë9ò2j¦éAƒ_oíxãƍ;w§²,k°¾i¾û’%Pãâ++øðC°²2%̚5+&&¦ösU˜PJÞË̶mÛºuëV—œÿ`½~C,;wîÒ¥K4MK¥R­VëIJC•ÊW{ô0Ò‹N»wC¿~м9
…Ø^E‰ö8Ž»uëVfffAA›VÛÑÌlY@
9,02|rFAíU!„"##M.Z´!TXXøÔáûɓ'küH`äêêÚ´iSOOÏO?ý”ã¸Z*ò‹"©GvíÚµk×®#GŽìÚµ+++«À!hk2ŒóûØ
;¿\Ғd_/†ÅÁÐD	
ݚB9
g5Lµ¿Ÿ¾iªGâæ–VðKl¿^†Û%Pä7ì텫ׯ_/j

·Ïim¦r²µN+("˜âx,¡
C‘—9
>Œ	Ç–!F†ð<
«àq½·ÞzkòäÉ.ü³3P©Ý{yy;vlèСµT~åʕV­Z©Tª'ŝþ˯äHÛPøÓÖÖV±(¼§Â0ÌÞÍ_}ùzXо†›®ƒyH¿NŽËö~Ÿ¥ÑÚ*àˈªy.åAhè‰O@...Ê
Ê^kž —Ëml,YÞ8p̛ÑãÆe¤¥¥¥¥	·¼³uk7­6
)H"AF†HÙG¿Tš’ªk¸2“3Â^]ôÃê鞞ž¢õkÜøúúj4
]q™¶¸\·¥+|sú½äÚ+5”'dßÌ-.G%“R
’É(	Mc–À_c$tôçîB¸ ~wï”ÜJ)¿õ@W¹B†aòòòJKK†©—àì3f̨—ozðàA£Ñ8gÎ!†DeÇÛÏH]B¾Ð˜™™	ûoܸq`ç×Ǿ{ø÷Äíû¾Þ8•>,Ÿµ÷$QªûV¼õÎ{›ô†ÐH>z¶oùƨ^
E|||rr²………P600pýúõžžžžžžÕWWV_õçêꚓ“ãââ
9m-¹·;}%ÉÁÝÇÇçÑR²!'¾Œ}N$³,ûaIVy[ZÊéu¼DJS 
˜âb†–Iš8*Õ*‰ZMh)Å0D¯Çz=Öéx½/›0Œç‹‹³?5
öLßB0}IWnwzæ]wž:uŠ¦é'…¤ýϦU@...å
©)Š¢ìíHIå”Q2!‘Hhš–J¥R©t„	)))cþ1ã‡Nž<yÒ¤IÏyÓý¢ÜëØØØY³fÅÅÅ*åàê$ç1Th‹Ö¯_»yóæV­Z‰Íñ¥B€	<¢’
‘JQ‚œ]Éd2òÿíw`UEú÷Ÿ9í¶Ü›zIo¤’@BÝ>‘%HY»î¢þØXT^»¬kEt> 	ÒB B!…$¤÷Ü~O›÷£Y!€	È|þ€›sçÌ)s¾÷yfÎÌó`¼oß¾#F¤¥¥¯ZµêÏ4ݽÿ.«TªaÆ!ŠûäÛêV³@>¢
G[c©§3a¤ÎMïúٖÚ/¿ürʔ)ç‡ý
…>> £Êzž¦(­†i5KuΜó–ŸŸ4abT*dddLœ8q×®]JÇï•W^ijjr8óçÏ€æææ¼¼¼ôôt½^¿fÍ%š€ó·°0.¤i
Ë@ÑN™bh@...	NåX,+AYlDc>aYB*Q4æi›“aõ2€ÀòsﾗhvïÞ}êÔ©qÚÐ
]\\ž|òɟ~ú)???>>^ñ`/VžÐ#<¿øåêš:
‚ðÍ7ß0#Ë2MÓ©©©ååå›7oî‹ÚÃüóŸÿ?~üüùó««ÊºËïÍ'#4jV1w
­âüóGݓ5þá#;4	D±,===轗«Y~ɒ%_|ñ…Ôž“pC“süȆoÖ»»¹2AF¦( hôÅW_`À,Ë@YY™ÃáðòòRf\´+



jmmŒŒV–Ò*É”Ó§OgYvæ̙¡/¿ü2..NÉòÛçÆZš››«ªªÜtòŠç¢R“Ü<ÝT¿½ÐC¿±òì‡ëÏé\\W®\yìر7Þxãŧ[Lâ³DÓÅ0èîÉ¡gÎZÞÿ²xɒ%[·nUò0n`¢Ã£
I[ˆöº…Ý\©B´;Ðý
¯¹‰ßsPòô
í¢Î¿ÎÎ0Yìòo«³J«êsŽýë쌓Tÿ:;£Õb£€¬“%åÅdü†Ð—´—XUÿñª£L§Ó32Ø>hëAj
a
»Óɋ¢„pbÊâôLû‹ÛåW5íÎôöwN^PºsS'W¶XlŽí?ý
öóó{õÕW•hKWÊƍãââBBBüýýÃÃÃ?û쳋K„]»v‘g‹Ð5½n^KDDDò;>ù|ÕßÑéô¾Tþ½õ›Ô.C†ÞõÜÎòòr
ë`~»–J6s
5@´wå§È0C‡:t(i-éï„Ýî‘ü{¢½k
É¿G Úû ù÷½|ð2KÚíö¡¿GòïzöËcÛ¶m×½özCþ=‹ÅòÐC]ËßǺÒ'òï!„–/_~þŸ“e¹¨¨
?øàww÷ˆˆˆcǎ‘§“hïÚvm¯Nþ½×^{-;;{ãƍçoLOOÏÊÊÊÍÍýä“OÌfó²eË
Šêcôz½J¥2:Žeً­µ;{öìM7ݤÕjß{ï½Aƒååå-X°à¦›n:pà@HHH×grɵÂ
åsŠÎ5Ç#¤¤À€eŒy,ÚeY”EYvâD}Ýnw8f³Ùl6;Îöl^òÖ[oµµµýûßÿž4iRhhè¤I“V¬XÑÚÚúÖ[o)–->>þ½÷Þ

òöö^»víùû¶Û½‹aŒ_ýõÐÐPƒÁššZ\\LžpÝk°’M±P!å²P‚E’³Y²Ø„6‘oÅ´ bŒ%IâyÞétvís9r
’'ˆ63

-Z
ñl™´ñ$¬BõV«U–åö`³{Û·ooii©®®V£WTT¨Tª>úH‘njjjVV–ÍfKII‰]·nÝرc>àȑ#ŠSªTb2™ÚÚÚ
'OØv°8yòßß]0srè‚y‘õµgyžGu½dö£>š3gN{Ðx//¯™3gž8q";;[ÑÆxôèÑ¡aÆɲ<nÜ8
5zDÿõÏý€1(ñZ0ÆWU{¡¨¨(ò@nر
҇øêdÌì=a¶óÑLòàˆ¶Ö*OOϋEò$ˆö.†aª«k4©K?CÓÆ͙ˆÑ‡øêfÝâ=4ÆMÍq¼D×µâ¸oE±f›tۘA§OŸ&;	D{݂ã8†a¬–­ŠËmÙü]}åç¥Eˆ-ªž²¨9•¯—Ö åªkÍO¿´fæýÿƪÈñãÇëõzr÷	}™ÜàíímnË×hí:‰Ÿ“ª9xèÈäI£­6›GCb­mÖwæ=U_U猌pß}##£ŒF£Z­&wŸ@ì^wµg2aÉbq¶ˆ±lɑ}ç¥Ó¨¢u…'‹gN[|zæªjG||b`` ÑhtuuUr¤»O v¯[øøø΂üí¢	lõ áé‚cÍ-¦Í?/<ÝüÄo½Ý*Ȳ^¯o—ä$z@...ꓱöŸ

ÆñúaGkk«ÑhEÑápˆ¢HäG Úë>Ô®l-œÙIe2#câ#«+ïœ:Io0öïß?ûGPåÁr†aF–ežçyž—e™¸¢½î»>gë׳bèÀDWWWwwwFãéééåååêêúã÷z×æFÃ0Œ$I¢(J’IJ,i
`õ"hðìÇ©44MÓCÑ4…( ±ú„Ô^UéCɬ[*<]e–D‡ÝÜ*Í?ùõá0ŸàHƒ;§Öp*5Ë©(ŠÈ@èía\[y6Ô³pބŠóUòï!¶ÑՍب,ÿ=ꐂbÕZÖÅ
I¢[béDqYN­«»—Ƙ¢(Š¦Åuª¼<œÑØj>˜W’¼ïø™î_›Šcuj®ÙdíÁûåå撖æßO¯Sc»ãÈ©³»¸ëµ·ñóÒª9IÆf›ã‡'N•V]²Â„¨àÆVsjúæä>­æ?¦½;R´jîÏ¿—.žÎíàãézgZ¢§+
ÎVwzÜËoÍvFÆG
VslrLè¾Ü3]r'ÞrYuã»k\½íÀéòšØ0ÿûÿ2úÖaÏ/ì

àö/
!
‰IDATp¢øÐoGõ36¶š;ýð§sYkˆ^øφ.\‚œƒjVäyэk‰Õð­׈á3gÝ~~þ½§—d–Yƒ½C=Œ¾=Ãr½6¬ŠcŸ>îðÉÒ½Ç
¡oCnűô‘©×t
‘ ð~>^ÍL,)ÊÞºµ<0iZB×ÏwÈ¿÷ÄýÃf>¹[gpWkuÇQEÑLï”ßíÃiU\ö©³äa"·¢Wûœ
áˆÝë¶öÜK-É^v±
lõ µJJþ½/¾Í:˜]ùX¤ÎStœkÁ¼JéTE<L¡‡´Ç©5&ÞK´ˆ¼ªØÝMAâºÝ§
Ï2~·LJ¬ª©¼WUàÇò§íVÞU’DQ$Id–Ø=ñ9»‹I0™èf÷yà €þ'+MÐXN­ñôñˆKþ†â­AÊâ=,cQ$%÷%II v¯›¨]<Öö¯7‰jŸ0•F+ò.Ëiu­Þ Òhݽ¼sòÔގ`9š¦±,˲$Ë2ñ?	D{ÝE«w-nåÐ8|¼<mÍ0œJ­Õ4.z–åTjmX»Ō’$‘¦•¹Ô€{|-Ð×´§Rk8ßHIv
GGGßqÇ6lX²dɂªªªžþy

--- NEW FILE: online.png ---
‰PNG



æeÖ`™àu§U;ÏU/ÉêJbZþ:ô
…XҕÕ\Î\Ѥçý’ØWåà­´q‰eB/
h8ÐYÚi*˞!¿¦²¤ ðß´¶±ôåµ½óª2ÊÎÞѺ´zI‰.¯¯F¢Œ
 ór[J
…ì…d›Š(%4¶¥E¿&2Šc[>ˆ'Ïú>‹É6þÃ÷!›¼â‚Xe_Ï⌡2ãö_ævîOM¯£’[¿|ìÔqªiz9¹Ùg¿IM‚G¤¤zÁ¯fG•i<"³qkä2ÊNd5u«G¢F«æ‡½iÁð¡_^Ú='’ñ˜Or¡Çë”QV5X&ôåÚµµ‘X—]"íóCü4]E%?ìKNÀÍ¥bÂLeöš'‚
ÓƂ
¹Üì‘z|P³Œ’›ñùù'iZÇé­sÇq{¾ê<ji•»€U×"£JŠjУVC4À–!ր
Öqš2T`PªîR…)RV”LJ•]Fq
}>•È\Äa•¥¹½‡ÒÊ"‚Ù¸e\u¥ôꥼú÷»ƒûGEwôÛ¾ÿ
¥ì‘=P­3

‘ÂNaa%©fA­¡

³gÏîرãâŋb±¸C‡ǎ‹ˆˆX³fMNNŽ¥¥¥©g…	&̘1cÀ€>6l˜>}ú¯¿þZ%åÇäu›çҀê3½ê7l<{ãƍ¬^½zæ̙ǏÆk#°L¢úMü4MzzzxxøرckÌpüøñ.]ºÔÂãܹsz½~Ò¤IãǏ/--½yó¦J¥ŠŒŒ|ã7Ö¬Y£ÕjŸ×Ík4š«W¯öêÕ

xÑ8|øð Aƒ&,û
—aÖWëŽC>ÿ%BfffÂsx%¬= à?“Q¤À(>^„¥Óéømôxz”@'>¯Œ«·åòúzå?/=ƒ#<h>¯	L¿¾ÖóKìc_H
^â8®´´”¦i>=Ƙ …B¡T*_“ ô“õ2­ç,ËÆÅÅ8p`Ϟ=EE…‰ä1£D‘‘‘]ºtiß¾½À+>
IjÖsŽãîß¿¿páÂ;wnyyylܸÊÖÖ!à8cÌqܝ;)»víÿý÷_›7w›>}zdd¤`èÐ0-ÿ…ç–§bïÞ½={ödYÆ
«6mZæåÕÂÓÓÓËËÓË˽E×¾}»ïÚµfýúÅ͛۾õÖÐU«V½ZËu:ݪU«„ñ÷ŠÂt5suFÕígâ%ÐiÁ‚Û·o[ºt~tt’?îF`Ìpc
€Á˜Á˜`1¦	‚ö÷wýöÛOâ¾ÿþûç»gþù¾&-Z4iÒ¤C‡	ƒ²qH§%ÕSöðþÇS¾ÔÔÔ3f̛77:ºƏ¸Äq´	—Xþ€Å˜Á˜>àD"ÆËËñã'Lº088¸k×®õ¿âÑ£G¯\¹Âqœ§§çСC5͜9szö왟Ÿ?lØ°9sæ4èðáÁ-[¶Ü³gJ¥š9s¦\.¿pá¹sçÊËË}}}‡Î¢#Fìß¿ßÝÝ}âĉկe0’““½¼¼Lsss·mÛFQ”B¡=z´ÍÑ£GSRR¤RéÝ»wGÕºuëê){÷î½yó&I’aaao¼ñ†0Ð_Öd¯º¤ýûµçÏ˗/
m3hЛ
!
щ§yOµLü]"ÿ;F]½z5>þÒªUKIRÄÓ€Á˜ Ik„HŽÓr\>Bå

hŠÂ‰ez^öƒì¬‚BÎ``
x£uĐvFwê4ªc§QÚ‹äó³,Ó½Wî½ztëù†ñO¯qþÀ›At€¶mÛ&$$`Œ“““½½½·mÛ6`À€I“&
0`Û¶mu·622’ÆGF¼pá_çÕ«Wuž9sÆÝÝ}äȑÎÎÎ			ÆâUJ±{÷îaÆ}ðÁ5^´JmýõWÿþý'NœØ¹sg
	k[»hl6O$333­V«T*]]]njSPP°bŊ¥K—òyxZ:;;§§§zÔóǐ!Crrr–,ùa֬сž21˲4ðÇaÌrËqب8uîÞÅØÓð8\"Çq\5ÛzmÓw¹\~àÀ>^p988dee5oÞ<##ÃÑёïæ§zôߺuë’%KD"ÑÁƒ1ÆæææR©ôСCüÌÇÉÉI©TòÇu”2Sssó¢¢¢ŠŠ
cNÓ6T©ã¸V­Z•””ÌŸ?ßÈ(S£Yqq±M¼AÈ`0Ð4͓LjÚÚ
õϱpáÂíÛ7¯X1©oßv$IH>D
zÌ·ž=OÔ?J€€†z:ý®Í=úˌåädî>`
ô¨Fsþü¹q㺄€Ð>T`Ì0Œù~5nôÒcRóÊËʤçs2óò˜‰ïÌùnþµ’û99v
kkëÜÜ\a	2꿘õ>p¡Ðñ–q€J„òtº¤®-Âû­ŸØ;¤«9.¶´,d˜“­D1k'GiRïЏ'~†-ÀƆ‰¯ûr¦²!ćÓå±qãƑ#GòÇK—.



˜2eŠ©]žßHBÓ4ÿ³I“&-[¶€û÷ïwêÔÉÝÝÝËËëòåËÆ
íììú÷ï
Õüùóßyç.üù矼ô3º§›;w.¿æÐÏ¢zÍ<g¦OŸNDÝg…>*0ª~sM‚
ø—0·äryý×L4 Xñ
Ž
Ó³
òòòÖ·²0÷À„QŽ>-›ŠˆGž$ø³ýÔâM;æ_øëä¤É³|||„ž èQµ¢¼¼|Õ7‹T’“óæúúùµ‰]
'@`T
HKK;ylÇäwÜT@ú
xMu-᪗[‰ƒ½¹!‘3BÖ©
¨V“	Bàç#ÍÉNÕh45f˜;w.
…œ¤


j{û¾²¨°
cEÀ+¢GI$ƒ¿½àËÄÍ;G½eP™"«

y†Â"º¤”ÎÉ3$Þd}}ýx;ž
©©|:¿ú›7:Ô(£
		¡(êÞ½{iii999
¼ý¶éš	>F™´‰$ÃÂÂÂÂÂþ–º|¹Ð[=J€
B*#$DŠˆD" ÝÏ-½—‘ÿB&œååÝ»wo•¨ƒ>[ÿC¥°8]Y¿uåW999
ÇÃoéй)tn

cr‰Ø×Ýñ©µõéÓç½÷Þ+//?|øðœ9sŒéU‚Dñ‰Ó§O7F£?~ü‚ê6°²,

ÖÝ
a÷»>í=]mÌKõÔàYkS+
…Î
w<çv6,Óõ´´ÔÜ|$©ä2P*‘\Ž$XõáŽc«ü±lIúí1ç~éêä䔖–&Œ¹ÆÌÂò7ã›'&&J¥Rkkš5ôõn̘1™ééééé¼ÑõÐá¶lé¢Ñ


D1!“!‰„‘$Gcø»/òž¬(ǘ	îæw÷Né­ÔŠ[´¦R•ŸŸ_VVFQÔs	Ú;mÚ´çr§0³fÍâ}µ›:Íý—¨OȬWfff¼í7nìßñýÑg:Ÿ´mï·ü·”r€¥£÷œÀr…lï²÷>øhƒNO1
ÎËË»yóf›6m-Z4{öìäää½{÷~ñÅ'Nœ°³³Óh4¦Ñ¥bccGŽiggwèÐ!ww÷V­ZÕ-µ"##ÍÌÌ<x •J
CLLŒ³³s!§LÆÇÇót
†¢°T†H €e¦'Ž5Döí
ëtœNÇiµ¬NÇ-7„eKJr¾4*QF
ñb*ùÊíNƒOÿKW~'Ož$I²¶ð‡/¼B0£ñðÞ½«W®\¿zþþÍËS†t‰líaz¶°´rÚòÝ
ƒìµ‚€Ã°ˆÀH˜Å
!D’¤Á`xøð!Ã0nnn111ÅÅÅcãô$É?¥!2Š¢¨.pŒáþM¬¥€
‚rRÈ	‹H±9Â2^2=Ӂ1æ%Æx÷îÝÆ
‹Å<ÀÁOüxv½Œ‰D666:—]Ha@...€/¦²
Œ‚ ¬b±„Ñ÷z£{Kÿ–ÁÉ	Vj¨T
ÿ¿½3ëªÊÿÿûÜå³òaGVáâ"(‹ˆæJ™“_ÑÊËu\¿Y¦5ŽNYšædZ~5s"DZ2-5ËeD33×ÒT\@DC@...,ú¯Ù	e–cŒÊÎÎNII™2eŠ(Š¢(Þëçl§³çO?ýô†
RÓÓæ­ºþ—ÉFc€RqÛ¾úӜ³é5ýúõ{ôÑGi%{¨¸tè‡×._ýdǶq¯½îçyôýw–ôò6vuó>úlµNÀúz§>–e_yå»Ý®ÌC`ŒËÊÊôzýýyÎö¨(BHnn®(Š˜À¶oŠO]¬êæ,c”[`ɽeñööY¶lYë÷R:=º>žôdßGúÛAä@	ôíÜ;Òµ[ˆ>2zZÄ@
„N§{ì±!S§N­ªªzî¹çDQ|ÿý÷[¶N£tBc"ǎwëjvD÷.7²*x]Ä󯹳W,ò„Å€L0À"HÐw@...ª«­š=ÆóËåÁ›ß~{V€Z…
쵕7<\¹ô®—ÍûJ·oß>zôè;S>€ 'N<qâD||<
ÊýG–`V¥útëŽ7^ËðZP9aVð*‚
oæÝÄ<™7ÿ¥®¨³gÏÖÕÕÅtÓu
Ò>Bÿ™7†aYwU ¯Öè§õõÒ:éyo/Í 87“©.%%¥ÁM4͖-[F°f͚ÂÂB
wbC
"¯â	VBAÙöÁ,#µ1,q°Vã
@äS&Mí°Š:zôèÕ«WûGé‚´ÿD!€`‚ütï½ {CÎêÕ«õzýœ9s4M“÷Ñëõ;wîl|~üøñ
rš7^§º#`Ãz²²²œœœæ͛÷ïÿ;333::ZéC6WžrWX¸xiqI
¬©©éÚµkPP²>QI~¤Œ;–çùñãÇ#„¶oߥ8Jv™‰êêꢢ"W=N~½Ûà8WWõÏPÈî ïn¼¹aç-½“Ëƍ/]ºôî»ï.IþévôÚÌp–c8M|ý¦yýöœe˖íß¿_qò¤t`Âú>Bv‹>°ƒ‰JIIÙ¿ÿف>àÍ7ßTÄc±X!’$ñ<¯ôb0Æ˗/_¾|¹ÃáEñ‡~8p ,Ëcǎí mT||¼——WEŽ‹pþYN>¦ ÌñçwZµé†»‡ï'Ÿ|òÔSO-Z´hÆ
g¯²Þÿ,×jǀšõDgÎž=K›©‡>Aì`xbè‡Z—¼nÕÊUKò;ËW"„¬V«Ùl¶Z­ãúbJª
òö2¸º#†ZÈQÚ5íHQ¢C(ÎË*È<nô©هñíÄj´ŒCÀe•·Î]JK;fð2ö
ŽˆÓh”
ó
UTó˜ëj®üøM°Û•µK:G„‡±Œ >ügrsÚDÈεlܲÿìÁÌÈGžôô
 oŽÒ>i(ÁfÍøaϐèËވîÑ£;Ë>òPÕ@º„êÞx%øÙ?”gÝS[UNß…*ªiƹWÎƅ]aFO¯pÄE
UTÜ®,«-:õÒÌPƒK(pÀ…>
@É-ÁrÆ€oRS.Î<‘Y¦m…*ª±¢µÝ
UTãÉ'ïë¹2!>@BÄh>±Mè‰À•«Fí®RÑ}»”vÇï¿ÂÛ) äû§gT”{ú”cäÆ0î

^>ë]gî.®Q’eÓ
Aé8Š
m£ÚLAAX[¦ÑhüýýY–µÛíJºwD¤)TQ¿»]¸™“S^^n6›Ap8ÊyÄ04…*ªÍôŠ‹ЫûÍ7²²²rssoݺ¥$UJè£PEµ„~<wþÚ¹cBc»Ýþ!¤Ñ9љ	
UT›ñð
ª¼]W[U®h‰9»¸»õT©4ô…QÚ9ínö¬S€±KÏ8„â 

m£ÚŒJ¥Žî7¤´àFei!!>òôëܳï£wqû…ò)
êä8tÌÔ҂²,!„<½ý}Cîn€,…òÐ(
€aXccúz(GQw×T‡B¡mÔïCyyyFFFffzUe¡C°ð*³³wx÷¨¨¨(%Š‚¾3
UT«°Z­?þxj÷ÎM*67²›Û
i4Èá U·áèwÿJùWÀã3|øHºÔK¡ŠúJKKÿ¹þýŠ’¯gNö÷kàEdçVmÚö·Ó§ŽÎzñ¯ÔӚÒniëQµµµ_»Â :ºdAdþQçE†^úLJËóòò蛣PE5,ËûöýI‡¦ÿÉø‹þQ“ÆzýÒ7oúØd2їG¡Šj‚7n=¼íÅÁ­ôšôl§¼ߝ?žPÿ(
UTc.]¼Ð%¸ZñBlg„ÜQËþQî|l¤ãܹSv»¾?
UTCòó³Bƒ™6ùGõˆPåZ,úþ(TQ
±YëtZ®­þQv›¹~3"…BõÿQiô‚µÕ?Šã5CÓNP¨¢–w5ðB-úG]ýÉæáÙY¯×·“?bmmíСCie¢´EÅÆÆ]ÍÑWV”\Np5€ƒ´àU-^¸ÌGEõÒéšNßWYY‰


òóó

}ë­·”Ü/meϞ=QQQF£Ñßß?,,lóæÍÍ}—(ŠGŽ¡•‰í!f¢K—.½û<ùÉg›^~Q¯7pä—ü£vî­Ð8õéׯ_Ë1~ùùù
€•+WÆÆÆFEE͞=c\]]íëë[UƒO•û/\¸pôèÑ´ªQEÝ?<==g¿ôÚÍ¢È/wf`)Éy@...µ>=>>¾ªªª¶¶
”––feeíÝ»·®®®þ*F³e˖ѣG'$$¬Y³¦°°

UÔ¯!>>^«Õæææ6ðâyž*ŠBÕ6Bëׯ'„Üé…rww§3”öO»ëÇÇÇ;Žììì7n‚€ò÷÷2dHûÙE¡<0ŠŠŽŽ9r$Ã0õþQ*•jĈ?þ8m£(´××fôzýôéÓ/^¼xíÚ5Œ1B(22ròäɭܾA¡PE5JõìÙs͚5/^t8ć‡ÇÅŵ5@...
m£ÚÔ?ŠBuw þQª¨»õ¢´žþùV–´ÙlíwEý£(í[ë8pà@;UT{ð2›Í/¼ðÂýü„æ í¨tLÿ(„ÐÚµkïü±Ébãììl

¸¸Eÿ¨Ø_ôR0K–,QŽ§L™Ò­[··ß~;))i̘1...III½{÷n|aãÂ-Q\\œF£9rdý€M’$EQ-ß*(((::úܹsJŸò@tÿZú\™
CÎ"·ŠJ>`úß]»v%%%Ý·'®¨¨xû­¡A?M×Ýàìˆ\¸H͝†7«¼3¥òÄ¿ç,ŽУf+++½¼¼hÒÙö@}?E«Õ6^ԀŒ3æÓ£%
UÔáããóîÿmiò£07èx#„““­‚í­û×\ìoRTbbâîÝ»[y‹ÄÄÄßøÊ=¢M•311±þß»¬(­VÛ¦™‰û9A¡´‰û\9¹š?ú2(”û4Žª®®¾råJYaªh+$²(Êj•!,$,ÖÏÏO«ÕªT*•JÅó<M	F¡Šúe²³³OÿðMß.Gcâª5œ
«½BjHf…BcŒ1–e¹å.ßùóç> !!¡þŒr¬œWú„o½õ–Édja¿Cƒb»víZ¶lÙܹs‹ŠŠ***ê7R(íNQ®žQÕ¼£ªÈQ•%TfÚ˲ìe…Ö"³%_4ÚjtÀÜE¯×+Öîô¼w]	€oaGƒÑh\¿~ý”)S
^ÝzEFªT*µ:.77÷ƒ¼ð	ì!¶®Âjµ:;;Ûív›Í¦,ïҎ…*ª	ÂÂÂ.
óÖ¥]º;‡÷Bét:—°°°²²²‹ßk†å(”ežç%I²Ùl‡ã-	)”‡TQF£ñ\jëœ0â‘èØÚÚZBˆ›››——W=ÜÝÝOñp%‚»»;
--- NEW FILE: savedmessage.png ---
‰PNG



JN§PHefւÈÐp •+äJ3
¹QìXÙT+
š4o…
>€fØûsåÍÂtUe6N"qã”Z2™B.7{$‘_Ô.¯äf|~¾'Mò8³m®ñ:nG-«ö ã°ê:åUiq-úÁj(ƒØrÄ°Á:NSŽ

JµÂ]ª° EÊʲbƒI©²±Ë+
{$’–盶G­ƒÅqÜ̵§Çt²>¤ïˆ¡èFjîª=Wïå”>ú‰DˆYHͬÊ+JP#]_èšÊ5êGj’ñ¢VðwuÚ*¾'MÀ•ýŒ!?á¯Ïl›2ðSye‚§É+뚏§õâʪTV“G—j¨BF_ÀA2qXeinï¡´rD„ˆ ÅA6n^÷m)½zi>¯ùíîàþQÑýv8
}¸îŒõê­£t6¸ï'æ­9ðÈjK"+kûF<LR©\.¬_ÉëÔ¯äJ>?ߓ¦ÏíüÑqø"¹\Ùqø">åÊþŇ/2>è¯!Ð×-¯Jj·ÞK/h§(¨¼G•e¶œ@jVe(Ì®(ÆRCHj5@...
‘ÂNaa%©ae­¥

}ò¬hÞÜÙ©É3¼Ë)¬ÈÌÌú7>ÀPUR§¼2·¬«¦ÚPž#N]Ï­ÊO¡dΤÊQ.WJdr¡OžeåUeåUÏT„Ÿöÿ¸ 
P7t:B¡uíXóVuµX$"L‹	}'@À“päÈ#eX–«›W"¡¿¨?xʼ àùó
€®‹W¤Hp	(@À3 VÊòJ€€ç"¯þ¢f¦A­>ø@­VםÒ@PYYÙ§OŸÆýD>ϗW5)óOxURR¢P(¼½½======¿úꫧ>{Ó¦Mƒ¡f
_Ջø¶Ã†
kÙ²¥———B¡hÙ²e˖-§L™RŸ‚4MŸ>}úß7 ÚW«ã›>¯'
h8¼úçúUJJ


¼ àÅéW:Ž?¾/@€€ç¦_	¤ðZÁ¸\.¯¯/TþEÔ3ëW111BwxM`ú¶¶žonûczEô+ŽãÊÊÊhšF>
ŒŒŒìÒ¥Kûöív	hHúU¶³swÿþýE‹ݹ“ìåå±iÓj[[„€ãXŒ1Çqwî¤îÞ}à·ß~iÞÜmúô鑑‘Â+>>
Önñùy*öíÛ׳gO–5lܸzóæµa^^-<==½¼<½¼Ü[´píÛ·ûîÝk7lXÒ¼¹í[o
]½zõ«µ}Q§Ó­^½Z˜…¯(L÷Fׇ2
B¿Z¸páŽۗ-[݃$ŏCÔ³
’¤=èùæðµ+çxxxäææÖ|СC‡¦M›V^^þ/œŸŸßÈƞÿF·o߮Dz‚«iý—BQTƒÝƒö
óJ&“îÛwD¯§8Žå8cNj&K»s~÷é¼û¹­?‡¹¿$Õ‡ÿ

Z·n‡‡‡‡‡AyyyÎÎÎ
 à>@@>@@Ùc‚©	¢R,.õñÑϟß&6vñ™3g„Q ¬ÿ†+V„‡{Ü!~/…>@  1f
¼z–(A
Ž

E­òÞmu:Ý3¹’­ªªJHHˆ‰‰Ñjµ
-¨nñ£hnï¯E2³Ðˆˆˆ'í´°°ˆ‰‰	NNNæ]É!‘H>ûì³N:=©æææ£GöööîÛ·oLLÌ AƒNœ8Ñ£G–e)ŠZµj•0]¼Rú•D2xðÛ¿Hܲ3qÔ[•y ¸JÀÅ
þlþŠž={
A7¼z©ئ÷•
ï‹
nâ¼2òŠ¦éû÷ï¨ÕjƒÁ`
9¡PR!‘ R„D$‰
ù:hÕã­Å‹»¸¸¼ ¦6¬u •™ÂÑÆ*£¨sÃr"

íÓÁÞaéÞsÔ|Y=ÏåkݹrbÁ5H­x
x
§÷oÿbÓ//¢©È¸×!t<gåäÀ¸®Žûö틉‰yY=¨ÖéÎÞ¸}æZJ•AǙËÈþ‚Úx»È$‚ö×ñ—/}6¸ÝWañ+Øɀ³Štr
MIùíъÀ³õ¨Ä¤]%)½£Ö^¹ò-ÃèۄZZY¹Ý¿±v^˜æ
­æäõiy…vŽ
{!Œiôlj^®Ws{W¯-¼[ùœÌéZmûñË©S—¸uñoQ¶gÏ©G–§©Sõ‹&¤¬ÀÒÒµ¢"ãÞ½dþ֙3/þÉÝÒ¼«ßŠ	˜ìÍÍ
¡hçóojƒ³AÝHOOË+@"JA.¥ÉåH"ÕNá8¶Ú˖fÜsþç®NNNéééÂÌkÜÈ*ªx3¾ybb¢T*µ¶¶ YCÿQïƌ“•‘‘‘‘Áfù`ëÖ.M!
‘TB°`ÌÄ_Ïÿò—ù®Ã€¨ÂœªÏÞ};¯H×µ­…“““é‘Ç­[·bŒŸ‹Íɓ'{{{ó×ü›Ü†a8ðàÁ±X¬Õj{÷î$p¦>¸|ùò¸qã
)Š*(((//§(ê¹#ž6mÚsù¦4³fÍâ}ʛ:ôý—¨OȯWfff¼—ï›7oØùݱf¾´}ß7ü[—
€e£÷žÄr…lßò÷>øh£NO1
ÎÏÏ¿uëV›6m/^<{ö씔”}ûö}þùç'Ož´³³Óh4¦Ñ±bccGŽiggwøðaww÷V­ZÕ-Á"##ÍÌÌ<x •J
CLLŒ³³s­!³LÆÇÇó¤
ùø
Œ¼ÂÛ¶[Ð_’Š\ÆÜóñË{¼h°0Ú$
	ÙÄJôM#@˜e¦E4ÅñÅ.ý:ˆ¦Ø¿-L¸”“Q%Lµ×
EEE™÷‹šÃ”.¸mïùÓ½]ø2ü£=Ž0
*Ä°ê‘>Ôö턋‹‹©§“FÈ+
ˆ
 …$ž*<g$	Æø…íÚµëÔ©Óýû÷7oÞü_ˆÖ†ÙƒR©4<<’öç–WqÿßޙÇEUõü{î230û°È¾#(‹€{¢f¸ä#n©hn¥eú”¥¹¤É£©eY™©i©Yážù˜ši)‰ ‹€ˆ€"ʾ0Ìrï=¿?n͏‡M45Âóþƒ×pçÜsϽç|æ,÷{¾_
ˆÆˆ.¯áž.¢(êqšQ:ûܾcë¤9Ӕ.Ýüý=wn\ëƱ=eF>6r(ô?kâzº ¡œœœ#GŽL›6M¯×ëõúÇPÔλÎþÜsÏmÛ¶-1-uц¯Ouuu4
õ7÷q—ûÆø
0Ç	‹A¨}¼\§N˜\[Y‰10ÿ݆5¥uöœþf҅¸=RŒ 
c|ôèÑY³f©j«›X›3ÒêOüZŽ2662dèôéÓ+++g͚¥×ë?üðÃöÀºAþÑÑî\ËñëîUp3»œ5ö›ó–¹£-3ô,¦@ˆÇ@#Ðg@...ÆÀêiá3Ð(ùµºì]'VÑώ|a̸á9OÊü*--mÙ²eªÚÊWÆ[»Öm÷J·÷æ9J%
o×hÓ=ßlK‹¿Ð355åInÙ²%;;ë¥1VïÎvӀДH%BÔ÷§+³4µ7­Ì™‘äæ
³ÝÇJöïß?nܸ¦î
(Š–H¾Üûý;o.¤X#˜´Œ¢%>聥mc£T&à ,zsÉ®o¾ÇZ½1‹0/̺—Ÿ›åꃩ׊ª–¼÷æÛ¿qñ°g•x9í‰è¯***Ž;feJ¿:ÁVnÌ
:ñIÀ+|—¾äì«HIIILLl9’
UµÕùy7ŸðÔÞ½û\]Ýdé©S§>
@FwËt4E15u|A©69«îØ/å—3TC3z"QQQ£FúùçŸÅ‰Ö»ï¾[YYÙ,}dd¤B¡Ø»w¯¸C[û§¦áëÅ#åååMǁ±±±ÁÁÁM£q·u"á!"¥Ñ:Jˆ™þâ̗¦-]òÖå+i?ÿz¥‘0Ë°‰‰‰œž×ë‰D¦ÓkyãCñ Æ\xD-\øïµkÖûñ’²ë?^ÿD誤¤clg-Áˆ@b—U\¡{ákzˤtš/«ÒW«8™ÌÈÎÞ)::zêÔÖ=>K¥ÒÈÈÈÈÈȹs熇‡/]º´Y zŒqxxøœ9sæΝûî»ïþÿCaîñX
Eii)
÷ÿ#î©O»¸®´ZíÝ»w)„le ê
(@À²4MSW²Tƒ‰‰IX؀ÐÐЁ4ÈÜܼe>õõõGŒŒ=¡ÚÛÛ·D_WW—œœU[[
ǁVÒ}ëz®Ý~뻓%‚ „‡‡/Z´H¡P´•Bèȑ#˗/×ét,Ë:::~÷Ýw-ÑGEEM›6ÍÇÇg̘1QQQãǏ?qâD«‹<
@ÑZbh@...	õ<’êEc­Ö2¬B
(}óí70˲
fúdÛýË2~ÖiIýˆ®Ú¤º¢´¶ðâ‚Ù
3`ü€ñÊ(@­˜ÒʤԴ	¶
*³¸ ÈÎ\ÑU[”ݹÙ?Xog«D´E;QȒB

	DW­ÓXWìç-E´Ð6€ä€$€¤€Ú\SA{éÔ¥ºG³)@èó+¾Q.g>H
.Þ,,;ù{ÆҘQMeÒ¥1£jêÕB
 aw›[E¤AºŽ®
àgìœÜïiؾ4f”áó§q?×Ö7¶5b€ÒÊÚG%
‚Ð¥tYÚt
þé÷}#†¹¹S€>…0
h07e	h
Ñ4Òh…KÉZ¥“!^ÎÃÅÊ\¡çxžH› t5]>€ÜÄ,µL9oq¶FÓ¨Õê8ŽG$Ä0T½Ö*ü_æßÑ8ÿù§
ëìZ~ç±ß
!A4ÍZBHflBÖ-DWˆ•½KEµª¶²LTÆ25³tõé)‘ÈH:?qyÍÆÑÕ«gBHŒ
cÈɫܵïÝø‹gç½üo±›Ð™é,ï¯jkk?Ú«œ]±Ä¿øWK»ø{¤|öÉÚüü|Ry¢«öàyþرCˆ;5ãE×{Æ¿šmíÚ-m÷®íuuu¤þDWmróæͳ§÷½<Ó­ƒñ¯¦¼`“󧤤$Lâ_ˆ®Ú"%ùŠ—[•ÿ
ÑNY¢öã_Y²ÁþºË—/j4R…¢«Ö¹};Ûͺ¯øW=ü¤E…y


¤
	DW­Ó¨V1÷ÿJÓXoØòH ]5G"“k5è~ã_1¬Œ¢ˆ»ÑU8:zæßAÍâ_¡vã_]»Þheí$—Ë;És¬­­6liO„N¤«ààk¹òŠò2,”a¡
p#€·ÿªJå*ÐËظuw‚!—nݺyxx¬^½Zô<s¿>|8  ÀÕÕÕÁÁÁÓÓs÷îÝm]K¯×ÿüóϤ=D:…½…——WhïÑ;¾ÚõêËr¹‚Á÷Šw´\fÒ»_¿~íÛ
Þ¾}
læø¶Yâvœã2äìÙ³â


]Â0
1šEQ̟ÜWæ?üðÃ?ü°páÂ'dGðìÙ³íììV¯^ý°2<sæÌüù󋊊¶nÝ:yòdÒÄÿd=!!!3u_°óÁˆ>‰}“Ÿ
½îqXV±õÐÁï322Ä8 <Ï‚Àqœ®#ÙïÝ»÷¡Ü›J¥ºuëÖÃ}^999³fÍòòò211155õôô\»v-
cœ––¦«;7,ì:b­e„y
ËVÐPà|›VWŸ‹W…
´°°°²²²´´”J¥âö¾Ž÷Zâr¹““Ó_¿7;;;ooïÔÔԇ(ª§žzŠeÙµk×öïßcœ““#î>[°`Á™3göíÛ׫W/N———÷wyç½y󦗗—••ÕCþ>¦¨Å‹÷ë×/>>~„	‹-:tèÐ=œ:uêÍ7ß|ÿý÷===Ǎçèè8oÞ¼GZGÿÈþJ­Vçææôö¿‰ŒÜ)£`$
FR?$µG2`›
{>-;;»¬¬¬¼¼\¥RqGÓ´ -¨ÚÂÓÓóÙgŸU(bøÚk¯™››ÏŸ?ÿË/¿trr²±±Ù³gO³–®T*
EHHȹsç

­4[M ZfFEE
>\¡P5EšÖQ[Å{<<ôÕìûÓU}}½‡]¦‘±Å:#Æ1ˆ¶F´	 ð5.¿{÷n]]]mm­J¥wR „:þŒ|}}›þæææz{{Ëd²/¿üòüùó±±±õõõŸ~úiÓSŒŒŒÖ®][PPpùò嬬¬wÞy
4˜«Ç\	æŠ0wëob])ßXÏ×ë¹ZŒ5<A½^¯Óéôz½AW†h(VO[Ÿ^ýõ_|ÑÒÒr„	1O†a&Mš”ŸŸÿÒK/¹¸¸4ëšzõê
¯Nâ²õu¥úêm§«…²ZÖ·Šçù¦Æòî’’’
+d.}gÿ{8ÒÝ
“~CÜnæ&:rËeà¨Þ#(¥…€u7
+**êêê´Z­h+x¿o'¶oß.º>ß½{·¸û
óõõÚjÎߒÍKº@I¬åFR'yvFîÄ–_?p¤°HØËÉÉI©Tš™™·ßS5k©óçÏ_´hÑرcåryϞ=¥Ré78ŽëÞ½;
$uâ8]=”VJòØà²ïÏÞȽ=fü"/ÿÆ3YYÃtñ6XSSS£T*9ŽÓh4wuF <‰ë"2³îêjI–:Ïðô.º›ýÜø1
SS'''ww÷ÄK–Îw¿Í0 Óét:¸ÿ·g„@x|º²³s¼UTÆrn=z™™™‰èVVVÖÖÖfffnnn?ý¨0«*WÕyžç8Žçùûu|K <Yº²¶¶V9G+­-•,˚˜˜(•J+++™Lfjj:ú_Q•••Eét:ÃfaŒ1鯝“¨¨¨‡àAtejjÔW«ÕŠ¾M8Ž“ËåâV+q£­­­………Z­Öh4c™LF„ÎÌCññ€c3Š¢ÄnŠ¢(½^ϲ¬è×Öð­D"ÿ"„†!1K	dر3ÆÄĤ­pƒ¢¨$	yÄ¢«ÿá¡8­F™™™‰¯°ôz}}}½J¥Òëõäéž8]<x„`$<™S¬‡Ð£4õË	
--- NEW FILE: status.php ---
<?php
	require "base.inc.php";

	start_html("Status Mockup");

	start_section("Status Mockup");
?>
<p>What is needed for a status UI?  Most importantly:</p>
<ul><li>Be able to globally create a new "away message" for all accounts</li>
<li>Be able to see the current global status</li>
<li>Be able to used saved statuses</li></ul>
<p>Less important goals include:</p>
<ul><li>Change the status of just one account</li>
<li>View the statuses of each account individual when the above is done</li>
<li>Create complex statuses where MSN accounts are Out To Lunch, and AIM accounts have an available messages except for SeanEgn1 who is Away with a specific message</li></ul>
<p>I've focused on the first, more important, list which should handle 95% of users' needs.</p>

<img src="online.png" align="left">

<p>At the bottom of the buddy list, is a dropdown menu.  In this menu is the current global status (in this case "Online").  The user intuitively knows to click the menu to change his status.  He chooses "Away" from the dropdown menu.</p>
<img src="away.png" align="right">
<p>The menu changes to the Away status, and an editable GtkIMHtml appears.  The user enters his away message there.  We add a timeout and check the "changed" signal to determine when the away message is finished, and we set it then.  This is not unlike how we send typing notifications</p>
<img src="menu.png" align="left">
		<p>While away, the user can edit the away message just by changing the text in the GtkIMHtml.  To come back, he uses the menu again to set him as "Online".  Next time he uses the menu, he'll find that the away message he just set has been automaically saved.  The menu will ordinarily contain many more status included by default, but I didn't want to mock too much up.  I'm a busy guy.</p>
<img src="savedmessage.png" align="right">
<p>Messages will be saved automatically, and then deleted after a given amount of disuse.  Users can still create their own messages that will stay persistant in "Create new status..." This is where most of the more advanced things from the second list will occur.  Although I do have a few ideas about that dialog, I'll wait for feedback on this idea before making mockups of that.</p>
<?php end_section();
?>
<?php
	end_html();
?>

--- NEW FILE: status.php~ ---
<?php
	require "base.inc.php";

	start_html("Status Mockup");

	start_section("Status Mockup");
?>
What is needed for a status UI?  Most importantly:
<ul><li>Cgh
<?php end_section();
?>
<?php
	end_html();
?>