comparison plugins/notify.c @ 11338:17142948653e

[gaim-migrate @ 13551] Change the GAIM_CONV_IM and GAIM_CONV_CHAT enums to GAIM_CONV_TYPE_IM and GAIM_CONV_TYPE_CHAT. This touched A LOT of files. Also combined two oscar header files (one of them was small and dorky). committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 25 Aug 2005 02:33:44 +0000
parents caaacfede4ae
children ef6e94bdda08
comparison
equal deleted inserted replaced
11337:1462b64f8fc9 11338:17142948653e
167 unnotify(conv, FALSE); 167 unnotify(conv, FALSE);
168 168
169 gaimwin = gaim_conversation_get_window(conv); 169 gaimwin = gaim_conversation_get_window(conv);
170 170
171 /* If we aren't doing notifications for this type of conversation, return */ 171 /* If we aren't doing notifications for this type of conversation, return */
172 if (((gaim_conversation_get_type(conv) == GAIM_CONV_IM) && 172 if (((gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) &&
173 !gaim_prefs_get_bool("/plugins/gtk/X11/notify/type_im")) || 173 !gaim_prefs_get_bool("/plugins/gtk/X11/notify/type_im")) ||
174 ((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) && 174 ((gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) &&
175 !gaim_prefs_get_bool("/plugins/gtk/X11/notify/type_chat"))) 175 !gaim_prefs_get_bool("/plugins/gtk/X11/notify/type_chat")))
176 return 0; 176 return 0;
177 177
178 g_object_get(G_OBJECT(GAIM_GTK_WINDOW(gaimwin)->window), 178 g_object_get(G_OBJECT(GAIM_GTK_WINDOW(gaimwin)->window),
179 "has-toplevel-focus", &has_focus, NULL); 179 "has-toplevel-focus", &has_focus, NULL);
266 static void 266 static void
267 im_sent_im(GaimAccount *account, char *receiver, const char *message) { 267 im_sent_im(GaimAccount *account, char *receiver, const char *message) {
268 GaimConversation *conv = NULL; 268 GaimConversation *conv = NULL;
269 269
270 if (gaim_prefs_get_bool("/plugins/gtk/X11/notify/notify_send")) { 270 if (gaim_prefs_get_bool("/plugins/gtk/X11/notify/notify_send")) {
271 conv = gaim_find_conversation_with_account(GAIM_CONV_IM, receiver, account); 271 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, receiver, account);
272 unnotify(conv, TRUE); 272 unnotify(conv, TRUE);
273 } 273 }
274 } 274 }
275 275
276 static void 276 static void