diff options
| author | Ankit Vani <a@nevitus.org> | 2013-06-23 17:32:51 +0530 |
|---|---|---|
| committer | Ankit Vani <a@nevitus.org> | 2013-06-23 17:32:51 +0530 |
| commit | 68142fc217c82ae6df55b8d810529506c62425d9 (patch) | |
| tree | 4ac485905fd32037e1c130fae655661fe897055a | |
| parent | 8db1e855a76f67ab931860b9d45b0c9b011b0867 (diff) | |
| download | pidgin-68142fc217c82ae6df55b8d810529506c62425d9.tar.gz | |
Refactored some libpurple plugins for GObject-based PurpleConversation
| -rw-r--r-- | libpurple/plugins/joinpart.c | 2 | ||||
| -rw-r--r-- | libpurple/plugins/newline.c | 4 | ||||
| -rw-r--r-- | libpurple/plugins/offlinemsg.c | 5 | ||||
| -rw-r--r-- | libpurple/plugins/psychic.c | 2 | ||||
| -rw-r--r-- | libpurple/plugins/statenotify.c | 5 |
5 files changed, 8 insertions, 10 deletions
diff --git a/libpurple/plugins/joinpart.c b/libpurple/plugins/joinpart.c index 06ffc17eec..7176aac488 100644 --- a/libpurple/plugins/joinpart.c +++ b/libpurple/plugins/joinpart.c @@ -85,7 +85,7 @@ static gboolean should_hide_notice(PurpleConversation *conv, const char *name, time_t *last_said; g_return_val_if_fail(conv != NULL, FALSE); - g_return_val_if_fail(purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT, FALSE); + g_return_val_if_fail(PURPLE_IS_CHAT_CONVERSATION(conv), FALSE); /* If the room is small, don't bother. */ chat = PURPLE_CONV_CHAT(conv); diff --git a/libpurple/plugins/newline.c b/libpurple/plugins/newline.c index 25ba535140..1dfdc77596 100644 --- a/libpurple/plugins/newline.c +++ b/libpurple/plugins/newline.c @@ -31,9 +31,9 @@ static gboolean addnewline_msg_cb(PurpleAccount *account, char *sender, char **message, PurpleConversation *conv, int *flags, void *data) { - if (((purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) && + if ((PURPLE_IS_IM_CONVERSATION(conv) && !purple_prefs_get_bool("/plugins/core/newline/im")) || - ((purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) && + (PURPLE_IS_CHAT_CONVERSATION(conv) && !purple_prefs_get_bool("/plugins/core/newline/chat"))) return FALSE; diff --git a/libpurple/plugins/offlinemsg.c b/libpurple/plugins/offlinemsg.c index fe45946840..61f166ca36 100644 --- a/libpurple/plugins/offlinemsg.c +++ b/libpurple/plugins/offlinemsg.c @@ -69,7 +69,7 @@ cancel_poune(OfflineMsg *offline) { purple_conversation_set_data(offline->conv, "plugin_pack:offlinemsg", GINT_TO_POINTER(OFFLINE_MSG_NO)); - purple_im_conversation_send_message(PURPLE_CONV_IM(offline->conv), offline->message, 0); + purple_conversation_send_message(offline->conv, offline->message, 0); discard_data(offline); } @@ -137,8 +137,7 @@ sending_msg_cb(PurpleAccount *account, const char *who, char **message, gpointer return; } - conv = purple_conversations_find_with_account(PURPLE_CONV_TYPE_IM, - who, account); + conv = purple_conversations_find_im_with_account(who, account); if (!conv) return; diff --git a/libpurple/plugins/psychic.c b/libpurple/plugins/psychic.c index 5f10ac1da2..63303d106d 100644 --- a/libpurple/plugins/psychic.c +++ b/libpurple/plugins/psychic.c @@ -55,7 +55,7 @@ buddy_typing_cb(PurpleAccount *acct, const char *name, void *data) { gconv = purple_conversations_find_im_with_account(name, acct); if(! gconv) { purple_debug_info("psychic", "no previous conversation exists\n"); - gconv = purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, name); + gconv = purple_im_conversation_new(acct, name); if(purple_prefs_get_bool(PREF_RAISE)) { purple_conversation_present(gconv); diff --git a/libpurple/plugins/statenotify.c b/libpurple/plugins/statenotify.c index 769821884d..deee2f950f 100644 --- a/libpurple/plugins/statenotify.c +++ b/libpurple/plugins/statenotify.c @@ -25,12 +25,11 @@ write_status(PurpleBuddy *buddy, const char *message) account = purple_buddy_get_account(buddy); buddy_name = purple_buddy_get_name(buddy); - conv = purple_conversations_find_with_account(PURPLE_CONV_TYPE_IM, - buddy_name, account); + conv = purple_conversations_find_im_with_account(buddy_name, account); if (conv == NULL) return; - g_return_if_fail(purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM); + g_return_if_fail(PURPLE_IS_IM_CONVERSATION(conv)); /* Prevent duplicate notifications for buddies in multiple groups */ if (buddy != purple_find_buddy(account, buddy_name)) |