comparison src/notify.c @ 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 8bda65b88e49
comparison
equal deleted inserted replaced
14001:66d01a547603 14002:fccb5cfa33b9
68 info->cb(info->cb_user_data); 68 info->cb(info->cb_user_data);
69 69
70 g_free(info); 70 g_free(info);
71 71
72 return NULL; 72 return NULL;
73 } 73 }
74
75 } else {
76 if (cb != NULL)
77 cb(user_data);
74 } 78 }
75 79
76 return NULL; 80 return NULL;
77 } 81 }
78 82
106 110
107 g_free(info); 111 g_free(info);
108 112
109 return NULL; 113 return NULL;
110 } 114 }
111 115 } else {
112 return info->ui_handle; 116 if (cb != NULL)
117 cb(user_data);
113 } 118 }
114 119
115 return NULL; 120 return NULL;
116 } 121 }
117 122
158 163
159 g_free(info); 164 g_free(info);
160 165
161 return NULL; 166 return NULL;
162 } 167 }
168
169 } else {
170 if (cb != NULL)
171 cb(user_data);
163 } 172 }
164 173
165 return NULL; 174 return NULL;
166 } 175 }
167 176
197 206
198 g_free(info); 207 g_free(info);
199 208
200 return NULL; 209 return NULL;
201 } 210 }
211
212 } else {
213 if (cb != NULL)
214 cb(user_data);
202 } 215 }
203 216
204 return NULL; 217 return NULL;
205 } 218 }
206 219
237 g_free(info); 250 g_free(info);
238 251
239 return NULL; 252 return NULL;
240 } 253 }
241 254
242 return info->ui_handle; 255 } else {
256 if (cb != NULL)
257 cb(user_data);
243 } 258 }
244 259
245 return NULL; 260 return NULL;
246 } 261 }
247 262
442 457
443 g_free(info); 458 g_free(info);
444 459
445 return NULL; 460 return NULL;
446 } 461 }
462
463 } else {
464 if (cb != NULL)
465 cb(user_data);
447 } 466 }
448 467
449 return NULL; 468 return NULL;
450 } 469 }
451 470