qulogic/pidgin

Fix win32 build

2014-06-12, Tomasz Wasilczyk
97ea8574aeea
Parents 4c9faa80e58b
Children 09387009bb17
Fix win32 build
2 files changed, 6 insertions(+), 7 deletions(-)
  • +5 -6
    pidgin/win32/gtkwin32dep.c
  • +1 -1
    pidgin/win32/gtkwin32dep.h
    • --- a/pidgin/win32/gtkwin32dep.c Thu Jun 12 21:39:38 2014 +0200
    +++ b/pidgin/win32/gtkwin32dep.c Thu Jun 12 21:43:10 2014 +0200
    @@ -340,14 +340,10 @@
    }
    void
    -winpidgin_conv_blink(PurpleConversation *conv, PurpleMessageFlags flags) {
    +winpidgin_conv_blink(PurpleConversation *conv) {
    PidginConvWindow *win;
    GtkWindow *window;
    - /* Don't flash for our own messages or system messages */
    - if(flags & PURPLE_MESSAGE_SEND || flags & PURPLE_MESSAGE_SYSTEM)
    - return;
    -
    if(conv == NULL) {
    purple_debug_info("winpidgin", "No conversation found to blink.\n");
    return;
    @@ -379,8 +375,11 @@
    static gboolean
    winpidgin_conv_im_blink(PurpleConversation *conv, PurpleMessage *pmsg)
    {
    + /* Don't flash for our own messages or system messages */
    + if (purple_message_get_flags(pmsg) & (PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_SYSTEM))
    + return FALSE;
    if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/win32/blink_im"))
    - winpidgin_conv_blink(conv, flags);
    + winpidgin_conv_blink(conv);
    return FALSE;
    }
    --- a/pidgin/win32/gtkwin32dep.h Thu Jun 12 21:39:38 2014 +0200
    +++ b/pidgin/win32/gtkwin32dep.h Thu Jun 12 21:43:10 2014 +0200
    @@ -41,7 +41,7 @@
    void winpidgin_notify_uri(const char *uri);
    void winpidgin_shell_execute(const char *target, const char *verb, const char *clazz);
    void winpidgin_ensure_onscreen(GtkWidget *win);
    -void winpidgin_conv_blink(PurpleConversation *conv, PurpleMessageFlags flags);
    +void winpidgin_conv_blink(PurpleConversation *conv);
    void winpidgin_window_flash(GtkWindow *window, gboolean flash);
    DWORD winpidgin_get_lastactive(void);