grim/guifications2

removed an unused variable, other various cleanups

2011-12-04, Gary Kramlich
54ed4e02e6d1
Parents 8dc511042f99
Children ad463181534e
removed an unused variable, other various cleanups
1 files changed, 18 insertions(+), 13 deletions(-)
  • +18 -13
    src/gf_event.c
    • --- a/src/gf_event.c Sun Dec 04 18:12:14 2011 -0600
    +++ b/src/gf_event.c Sun Dec 04 18:12:41 2011 -0600
    @@ -671,7 +671,7 @@
    void
    gf_events_init(PurplePlugin *plugin) {
    GList *l, *ll = NULL;
    - void *blist_handle, *accounts_handle, *conv_handle;
    + void *blist_handle, *conv_handle, *xfers_handle;
    g_return_if_fail(plugin);
    @@ -736,7 +736,7 @@
    gf_event_new("new-emails", TOKENS_DEFAULT "c", _("Emails"),
    _("Displaed when you receive multiple new emails."),
    GF_EVENT_PRIORITY_NORMAL);
    -
    +
    gf_event_new(GF_NOTIFICATION_MASTER, TOKENS_DEFAULT "Ccnr",
    _("Master"), _("Master notification for the theme editor."),
    GF_EVENT_PRIORITY_NORMAL);
    @@ -779,8 +779,8 @@
    /* connect all of our signals */
    blist_handle = purple_blist_get_handle();
    - accounts_handle = purple_accounts_get_handle();
    conv_handle = purple_conversations_get_handle();
    + xfers_handle = purple_xfers_get_handle();
    /* blist signals */
    purple_signal_connect(blist_handle, "buddy-signed-on", plugin,
    @@ -812,24 +812,29 @@
    purple_signal_connect(conv_handle, "chat-topic-changed", plugin,
    PURPLE_CALLBACK(gf_event_topic_changed), "topic-changed");
    - /* both of these are used just to not display the flood of guifications we'd get if
    - * we weren't throttling them. Makes it look much prettier im my opinion :)
    + /* both of these are used just to not display the flood of guifications
    + * we'd get if we weren't throttling them. Makes it look much prettier
    + * im my opinion :)
    */
    purple_signal_connect(purple_connections_get_handle(), "signed-on", plugin,
    - PURPLE_CALLBACK(gf_event_connection_throttle), NULL);
    + PURPLE_CALLBACK(gf_event_connection_throttle), NULL);
    purple_signal_connect(conv_handle, "chat-joined", plugin,
    - PURPLE_CALLBACK(gf_event_conversation_throttle), NULL);
    + PURPLE_CALLBACK(gf_event_conversation_throttle),
    + NULL);
    /* mail stuff */
    gf_event_email_init();
    - purple_signal_connect(purple_xfers_get_handle(), "file-recv-cancel", plugin,
    - PURPLE_CALLBACK(gf_event_file_recv_cancel), "file-remote-cancel");
    - purple_signal_connect(purple_xfers_get_handle(), "file-recv-complete", plugin,
    - PURPLE_CALLBACK(gf_event_file_recv_cancel), "file-recv-complete");
    - purple_signal_connect(purple_xfers_get_handle(), "file-send-complete", plugin,
    - PURPLE_CALLBACK(gf_event_file_recv_cancel), "file-send-complete");
    + purple_signal_connect(xfers_handle, "file-recv-cancel", plugin,
    + PURPLE_CALLBACK(gf_event_file_recv_cancel),
    + "file-remote-cancel");
    + purple_signal_connect(xfers_handle, "file-recv-complete", plugin,
    + PURPLE_CALLBACK(gf_event_file_recv_cancel),
    + "file-recv-complete");
    + purple_signal_connect(xfers_handle, "file-send-complete", plugin,
    + PURPLE_CALLBACK(gf_event_file_recv_cancel),
    + "file-send-complete");
    }
    void