empathy r2298 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Jan 30 17:08:17 2009
New Revision: 2298
URL: http://svn.gnome.org/viewvc/empathy?rev=2298&view=rev

Log:
Add an enum to define notification close reason.

Modified:
   trunk/src/empathy-chat-window.c
   trunk/src/empathy-misc.h

Modified: trunk/src/empathy-chat-window.c
==============================================================================
--- trunk/src/empathy-chat-window.c	(original)
+++ trunk/src/empathy-chat-window.c	Fri Jan 30 17:08:17 2009
@@ -845,13 +845,13 @@
 chat_window_notification_closed_cb (NotifyNotification *notify,
 				    NotificationData *cb_data)
 {
-	int reason = 1;
+	int reason = 0;
 	EmpathyChatWindowPriv *priv = GET_PRIV (cb_data->window);
 
 #ifdef notify_notification_get_closed_reason
 	reason = notify_notification_get_closed_reason (notify);
 #endif
-	if (reason == 2) {
+	if (reason == NOTIFICATION_CLOSED_DISMISSED) {
 		empathy_chat_window_present_chat (cb_data->chat);
 	}
 

Modified: trunk/src/empathy-misc.h
==============================================================================
--- trunk/src/empathy-misc.h	(original)
+++ trunk/src/empathy-misc.h	Fri Jan 30 17:08:17 2009
@@ -28,6 +28,15 @@
 
 G_BEGIN_DECLS
 
+/* FIXME: this should *really* belong to libnotify. */
+typedef enum {
+	NOTIFICATION_CLOSED_INVALID = 0,
+	NOTIFICATION_CLOSED_EXPIRED = 1,
+	NOTIFICATION_CLOSED_DISMISSED = 2,
+	NOTIFICATION_CLOSED_PROGRAMMATICALY = 3,
+	NOTIFICATION_CLOSED_RESERVED = 4
+} NotificationClosedReason;
+
 gboolean    empathy_notification_is_enabled  (void);
 
 G_END_DECLS