[Gaim-commits] SF.net SVN: gaim: [16587] trunk/src/notify.c

[<ev...@us...>]

Revision: 16587
Author:   evands
Date:     2006-07-27 13:10:57 -0700 (Thu, 27 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16587&view=rev

Log Message:
-----------
Removed an unneeded return and made the notify functions call the close callback immediately if there is no appropriate ui_op.

Modified Paths:
--------------
    trunk/src/notify.c
Modified: trunk/src/notify.c
===================================================================
--- trunk/src/notify.c	2006-07-27 20:02:57 UTC (rev 16586)
+++ trunk/src/notify.c	2006-07-27 20:10:57 UTC (rev 16587)
@@ -70,7 +70,11 @@
 			g_free(info);
 
 			return NULL;
-		}		
+		}
+
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;
@@ -108,8 +112,9 @@
 
 			return NULL;
 		}		
-
-		return info->ui_handle;
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;
@@ -160,6 +165,10 @@
 
 			return NULL;
 		}
+
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;
@@ -199,6 +208,10 @@
 			
 			return NULL;
 		}
+
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;
@@ -239,7 +252,9 @@
 			return NULL;
 		}
 
-		return info->ui_handle;
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;
@@ -444,6 +459,10 @@
 
 			return NULL;
 		}
+
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;


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