diff options
| author | Mike Ruprecht <cmaiku@gmail.com> | 2018-11-05 17:00:16 -0600 |
|---|---|---|
| committer | Mike Ruprecht <cmaiku@gmail.com> | 2018-11-05 17:00:16 -0600 |
| commit | c793c7086292287d02295a8faf6b7669733ad39b (patch) | |
| tree | ecd14c3ca8272ff0f9a1685e54198206a543233a | |
| parent | d2f58fe88fd8f2a9e03dd4d1b6e7df5a72207ad8 (diff) | |
| download | pidgin-c793c7086292287d02295a8faf6b7669733ad39b.tar.gz | |
pidgin: Fix various -Wincompatible-pointer-types warnings
| -rw-r--r-- | pidgin/gtkblist.c | 2 | ||||
| -rw-r--r-- | pidgin/gtkconv.c | 4 | ||||
| -rw-r--r-- | pidgin/gtkutils.c | 9 | ||||
| -rw-r--r-- | pidgin/gtkwebviewtoolbar.c | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c index 8f26c71fc0..5f2d53548c 100644 --- a/pidgin/gtkblist.c +++ b/pidgin/gtkblist.c @@ -3666,7 +3666,7 @@ static const GtkActionEntry blist_menu_entries[] = { { "OnlineHelp", GTK_STOCK_HELP, N_("Online _Help"), "F1", NULL, gtk_blist_show_onlinehelp_cb }, { "DebugWindow", NULL, N_("_Debug Window"), NULL, NULL, toggle_debug }, { "PluginInformation", NULL, N_("_Plugin Information"), NULL, NULL, pidgin_dialogs_plugins_info }, - { "About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, _pidgin_about_cb }, + { "About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, G_CALLBACK(_pidgin_about_cb) }, }; /* Toggle items */ diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c index 4bc88c2219..5eeccead35 100644 --- a/pidgin/gtkconv.c +++ b/pidgin/gtkconv.c @@ -1694,7 +1694,9 @@ create_chat_menu(PurpleChatConversation *chat, const char *who, PurpleConnection real_who = purple_protocol_chat_iface_get_user_real_name(protocol, gc, purple_chat_conversation_get_id(chat), who); - if (!purple_protocol_xfer_can_receive(protocol, gc, real_who ? real_who : who)) { + if (!purple_protocol_xfer_can_receive( + PURPLE_PROTOCOL_XFER(protocol), + gc, real_who ? real_who : who)) { can_receive_file = FALSE; } diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c index 14e14c9578..4c04c7f709 100644 --- a/pidgin/gtkutils.c +++ b/pidgin/gtkutils.c @@ -1438,10 +1438,13 @@ pidgin_dnd_file_send_image(PurpleAccount *account, const gchar *who, im = TRUE; if (protocol && PURPLE_IS_PROTOCOL_XFER(protocol)) { - PurpleProtocolXferInterface *iface = PURPLE_PROTOCOL_XFER(protocol); + PurpleProtocolXferInterface *iface = + PURPLE_PROTOCOL_XFER_GET_IFACE(protocol); if(iface->can_receive) { - ft = purple_protocol_xfer_can_receive(protocol, gc, who); + ft = purple_protocol_xfer_can_receive( + PURPLE_PROTOCOL_XFER(protocol), + gc, who); } else { ft = (iface->send_file) ? TRUE : FALSE; } @@ -2356,7 +2359,7 @@ pidgin_convert_buddy_icon(PurpleProtocol *protocol, const char *path, size_t *le g_strfreev(protocol_formats); return NULL; } - original = g_object_ref(G_OBJECT(pixbuf)); + original = g_object_ref(pixbuf); new_width = orig_width; new_height = orig_height; diff --git a/pidgin/gtkwebviewtoolbar.c b/pidgin/gtkwebviewtoolbar.c index 40d544b8d5..93624f3334 100644 --- a/pidgin/gtkwebviewtoolbar.c +++ b/pidgin/gtkwebviewtoolbar.c @@ -1063,7 +1063,7 @@ toggle_action_set_active_block(GtkToggleAction *action, gboolean is_active, GObject *object; g_return_if_fail(toolbar); - object = g_object_ref(action); + object = g_object_ref(G_OBJECT(action)); g_signal_handlers_block_matched(object, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, toolbar); |