[Gaim-commits] SF.net SVN: gaim: [16217] trunk/src/gtkstatusbox.c

[<rl...@us...>]

Revision: 16217
Author:   rlaager
Date:     2006-06-04 01:19:51 -0700 (Sun, 04 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16217&view=rev

Log Message:
-----------
The last of SF Patch #1500267 from Sadrul

"if you press Escape when
 changing the status, it discards the changes and
 restores the statusbox to reflect current status."

Modified Paths:
--------------
    trunk/src/gtkstatusbox.c
Modified: trunk/src/gtkstatusbox.c
===================================================================
--- trunk/src/gtkstatusbox.c	2006-06-04 08:14:25 UTC (rev 16216)
+++ trunk/src/gtkstatusbox.c	2006-06-04 08:19:51 UTC (rev 16217)
@@ -738,6 +738,16 @@
 	}
 	if (!status_box->typing != 0)
 		return FALSE;
+
+	/* Reset the status if Escape was pressed */
+	if (event->keyval == GDK_Escape)
+	{
+		g_source_remove(status_box->typing);
+		status_box->typing = 0;
+		status_menu_refresh_iter(status_box);
+		return TRUE;
+	}
+	
 	gtk_gaim_status_box_pulse_typing(status_box);
 	g_source_remove(status_box->typing);
 	status_box->typing = g_timeout_add(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.