pidgin/purple-plugin-pack

Killing the last of the PURPLE_VERSION_CHECK stuff that we don't need anymore
org.guifications.plugins
2007-08-20, rekkanoryo
345b0b400b18
Parents 15f458441a7f
Children 755e8250b3b3
Killing the last of the PURPLE_VERSION_CHECK stuff that we don't need anymore
since we support only Pidgin 2.0.0 and newer, and also some whitespace tweaks
to groupmsg.
2 files changed, 28 insertions(+), 32 deletions(-)
  • +26 -29
    groupmsg/groupmsg.c
  • +2 -3
    mystatusbox/mystatusbox.c
    • --- a/groupmsg/groupmsg.c Sun Aug 19 20:34:22 2007 -0400
    +++ b/groupmsg/groupmsg.c Mon Aug 20 00:56:36 2007 -0400
    @@ -39,9 +39,6 @@
    GList *l;
    PurpleBuddy *b;
    PurpleConversation *conv = NULL;
    -#if !PURPLE_VERSION_CHECK(2,0,0)
    - PurpleConvWindow *win;
    -#endif
    purple_markup_html_to_xhtml(message, NULL, &stripped);
    @@ -55,12 +52,6 @@
    purple_conv_im_send(PURPLE_CONV_IM(conv), stripped);
    }
    }
    -#if !PURPLE_VERSION_CHECK(2,0,0)
    - if(conv) {
    - win = purple_conversation_get_window(conv);
    - purple_conv_window_raise(win);
    - }
    -#endif
    g_free(stripped);
    g_list_free(list);
    @@ -119,6 +110,7 @@
    _("Send"), G_CALLBACK(do_it_cb),
    _("Cancel"), G_CALLBACK(dont_do_it_cb),
    NULL, NULL, NULL, list);
    +
    g_free(tmp);
    }
    @@ -147,31 +139,36 @@
    static PurplePluginInfo info =
    {
    - PURPLE_PLUGIN_MAGIC, /**< magic */
    - PURPLE_MAJOR_VERSION, /**< major version */
    - PURPLE_MINOR_VERSION, /**< minor version */
    - PURPLE_PLUGIN_STANDARD, /**< type */
    - NULL, /**< ui_requirement */
    - 0, /**< flags */
    - NULL, /**< dependencies */
    - PURPLE_PRIORITY_DEFAULT, /**< priority */
    + PURPLE_PLUGIN_MAGIC, /**< magic */
    + PURPLE_MAJOR_VERSION, /**< major version */
    + PURPLE_MINOR_VERSION, /**< minor version */
    + PURPLE_PLUGIN_STANDARD, /**< type */
    + NULL, /**< ui_requirement */
    + 0, /**< flags */
    + NULL, /**< dependencies */
    + PURPLE_PRIORITY_DEFAULT, /**< priority */
    - "core-plugin_pack-groupmsg", /**< id */
    - NULL, /**< name */
    + "core-plugin_pack-groupmsg", /**< id */
    + NULL, /**< name */
    PP_VERSION, /**< version */
    - NULL, /** summary */
    - NULL, /** description */
    - "Stu Tomlinson <stu@nosnilmot.com>", /**< author */
    + NULL, /**< summary */
    + NULL, /** description */
    + "Stu Tomlinson <stu@nosnilmot.com>", /**< author */
    PP_WEBSITE, /**< homepage */
    - plugin_load, /**< load */
    - NULL, /**< unload */
    - NULL, /**< destroy */
    + plugin_load, /**< load */
    + NULL, /**< unload */
    + NULL, /**< destroy */
    - NULL, /**< ui_info */
    - NULL, /**< extra_info */
    - NULL, /**< prefs_info */
    - NULL /**< actions */
    + NULL, /**< ui_info */
    + NULL, /**< extra_info */
    + NULL, /**< prefs_info */
    + NULL, /**< actions */
    +
    + NULL, /**< reserved 1 */
    + NULL, /**< reserved 2 */
    + NULL, /**< reserved 3 */
    + NULL /**< reserved 4 */
    };
    --- a/mystatusbox/mystatusbox.c Sun Aug 19 20:34:22 2007 -0400
    +++ b/mystatusbox/mystatusbox.c Mon Aug 20 00:56:36 2007 -0400
    @@ -28,8 +28,6 @@
    #include <gdk/gdk.h>
    #include <gtk/gtk.h>
    -#if PURPLE_VERSION_CHECK(2,0,0) /* Stu is a chicken */
    -
    #include <core.h>
    #include <gtkblist.h>
    @@ -543,6 +541,7 @@
    NULL, /* extra_info */
    &prefs_info, /* prefs_info */
    actions, /* actions */
    +
    NULL, /* reserved 1 */
    NULL, /* reserved 2 */
    NULL, /* reserved 3 */
    @@ -571,4 +570,4 @@
    }
    PURPLE_INIT_PLUGIN(PLUGIN_STATIC_NAME, init_plugin, info)
    -#endif
    +