changeset 14002:fccb5cfa33b9

[gaim-migrate @ 16587] Removed an unneeded return and made the notify functions call the close callback immediately if there is no appropriate ui_op. committer: Tailor Script <tailor@pidgin.im>
author Evan Schoenberg <evan.s@dreskin.net>
date Thu, 27 Jul 2006 20:10:57 +0000
parents 66d01a547603
children 44c5c6d80239
files src/notify.c
diffstat 1 files changed, 23 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/notify.c	Thu Jul 27 20:02:57 2006 +0000
+++ b/src/notify.c	Thu Jul 27 20:10:57 2006 +0000
@@ -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;