pidgin/pidgin

Remove more GtkImHtml dependencies (from perl and two other plugins)

2014-01-31, Tomasz Wasilczyk
add13288757e
Parents d268154529ff
Children d299a86801152bb1339642f6
Remove more GtkImHtml dependencies (from perl and two other plugins)
11 files changed, 11 insertions(+), 395 deletions(-)
  • +0 -1
    pidgin/plugins/disco/xmppdisco.c
  • +0 -1
    pidgin/plugins/history.c
  • +0 -2
    pidgin/plugins/perl/Makefile.am
  • +0 -332
    pidgin/plugins/perl/common/GtkIMHtml.xs
  • +0 -22
    pidgin/plugins/perl/common/GtkIMHtmlToolbar.xs
  • +11 -9
    pidgin/plugins/perl/common/GtkThemes.xs
  • +0 -2
    pidgin/plugins/perl/common/MANIFEST
  • +0 -2
    pidgin/plugins/perl/common/Makefile.mingw
  • +0 -4
    pidgin/plugins/perl/common/Pidgin.xs
  • +0 -13
    pidgin/plugins/perl/common/gtkmodule.h
  • +0 -7
    pidgin/plugins/perl/common/typemap
    • --- a/pidgin/plugins/disco/xmppdisco.c Fri Jan 31 13:52:45 2014 +0100
    +++ b/pidgin/plugins/disco/xmppdisco.c Fri Jan 31 14:47:31 2014 +0100
    @@ -44,7 +44,6 @@
    #include "version.h"
    #include "gtkconv.h"
    -#include "gtkimhtml.h"
    #include "gtkplugin.h"
    #include "xmppdisco.h"
    --- a/pidgin/plugins/history.c Fri Jan 31 13:52:45 2014 +0100
    +++ b/pidgin/plugins/history.c Fri Jan 31 14:47:31 2014 +0100
    @@ -14,7 +14,6 @@
    #include "version.h"
    #include "gtkconv.h"
    -#include "gtkimhtml.h"
    #include "gtkplugin.h"
    #include "gtkwebview.h"
    --- a/pidgin/plugins/perl/Makefile.am Fri Jan 31 13:52:45 2014 +0100
    +++ b/pidgin/plugins/perl/Makefile.am Fri Jan 31 14:47:31 2014 +0100
    @@ -9,8 +9,6 @@
    common/GtkDebug.xs \
    common/GtkDialogs.xs \
    common/GtkFt.xs \
    - common/GtkIMHtml.xs \
    - common/GtkIMHtmlToolbar.xs \
    common/GtkLog.xs \
    common/GtkMenuTray.xs \
    common/GtkPlugin.xs \
    --- a/pidgin/plugins/perl/common/GtkIMHtml.xs Fri Jan 31 13:52:45 2014 +0100
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,332 +0,0 @@
    -#include "gtkmodule.h"
    -
    -/* This can't work at the moment since I don't have a typemap for Gtk::Widget.
    - * I thought about using the one from libgtk2-perl but wasn't sure how to go
    - * about doing that.
    -Gtk::Widget
    -gtk_imhtml_new(a, b)
    -*/
    -
    -/* This can't work at the moment since I don't have a typemap for
    - * Gtk::TextIter.
    - * I thought about using the one from libgtk2-perl but wasn't sure how to go
    - * about doing that.
    -void
    -gtk_imhtml_insert_html_at_iter(imhtml, text, options, iter)
    - Pidgin::IMHtml imhtml
    - const gchar * text
    - Pidgin::IMHtml::Options options
    - Gtk::TextIter iter
    -*/
    -
    -/* This can't work at the moment since I don't have a typemap for Gtk::Widget.
    - * I thought about using the one from libgtk2-perl but wasn't sure how to go
    - * about doing that.
    -void
    -gtk_imhtml_delete(imhtml, start, end)
    - Pidgin::IMHtml imhtml
    - Gtk::TextIter start
    - Gtk::TextIter end
    -*/
    -
    -/* This can't work at the moment since I don't have a typemap for Gtk::Widget.
    - * I thought about using the one from libgtk2-perl but wasn't sure how to go
    - * about doing that.
    -void
    -gtk_imhtml_insert_link(imhtml, mark, url, text)
    - Pidgin::IMHtml imhtml
    - Gtk::TextMark mark
    - const char * url
    - const char * text
    -*/
    -
    -/* This can't work at the moment since I don't have a typemap for Gtk::Widget.
    - * I thought about using the one from libgtk2-perl but wasn't sure how to go
    - * about doing that.
    -void
    -gtk_imhtml_insert_smiley_at_iter(imhtml, sml, smiley, iter)
    - Pidgin::IMHtml imhtml
    - const char * sml
    - char * smiley
    - Gtk::TextIter iter
    -
    -void
    -gtk_imhtml_insert_image_at_iter(imhtml, id, iter)
    - Pidgin::IMHtml imhtml
    - int id
    - Gtk::TextIter iter
    -*/
    -
    -/* This can't work at the moment since I don't have a typemap for Gtk::Widget.
    - * I thought about using the one from libgtk2-perl but wasn't sure how to go
    - * about doing that.
    -gchar_own *
    -gtk_imhtml_get_markup_range(imhtml, start, end)
    - Pidgin::IMHtml imhtml
    - Gtk::TextIter start
    - Gtk::TextIter end
    -*/
    -
    -/* This can't work at the moment since I don't have a typemap for Gtk::Widget.
    - * I thought about using the one from libgtk2-perl but wasn't sure how to go
    - * about doing that.
    -gchar_own *
    -gtk_imhtml_get_text(imhtml, start, end)
    - Pidgin::IMHtml imhtml
    - Gtk::TextIter start
    - Gtk::TextIter end
    -*/
    -
    -/* This can't work at the moment since I don't have a typemap for Gtk::Widget.
    - * I thought about using the one from libgtk2-perl but wasn't sure how to go
    - * about doing that.
    -void
    -gtk_imhtml_hr_add_to(scale, imhtml, iter)
    - Pidgin::IMHtml::Scalable scale
    - Pidgin::IMHtml imhtml
    - Gtk::TextIter iter
    -*/
    -
    -/* This can't work at the moment since I don't have a typemap for gboolean *.
    -void
    -gtk_imhtml_get_current_format(imhtml, bold, italic, underline)
    - Pidgin::IMHtml imhtml
    - gboolean * bold
    - gboolean * italic
    - gboolean * underline
    -*/
    -
    -MODULE = Pidgin::IMHtml PACKAGE = Pidgin::IMHtml PREFIX = gtk_imhtml_
    -PROTOTYPES: ENABLE
    -
    -Pidgin::IMHtml::Smiley
    -gtk_imhtml_smiley_get(imhtml, sml, text)
    - Pidgin::IMHtml imhtml
    - const gchar * sml
    - const gchar * text
    -
    -void
    -gtk_imhtml_associate_smiley(imhtml, sml, smiley)
    - Pidgin::IMHtml imhtml
    - const gchar * sml
    - Pidgin::IMHtml::Smiley smiley
    -
    -void
    -gtk_imhtml_remove_smileys(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -void
    -gtk_imhtml_set_funcs(imhtml, f)
    - Pidgin::IMHtml imhtml
    - Pidgin::IMHtml::Funcs f
    -
    -void
    -gtk_imhtml_show_comments(imhtml, show)
    - Pidgin::IMHtml imhtml
    - gboolean show
    -
    -const char *
    -gtk_imhtml_get_protocol_name(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -void
    -gtk_imhtml_set_protocol_name(imhtml, protocol_name)
    - Pidgin::IMHtml imhtml
    - const gchar * protocol_name
    -
    -void
    -gtk_imhtml_append_text(imhtml, text, options)
    - Pidgin::IMHtml imhtml
    - const gchar * text
    - Pidgin::IMHtml::Options options
    -
    -void
    -gtk_imhtml_append_text_with_images(imhtml, text, options, unused = NULL)
    - Pidgin::IMHtml imhtml
    - const gchar * text
    - Pidgin::IMHtml::Options options
    - SV *unused
    -PREINIT:
    - GSList *t_GL;
    - int i, t_len;
    -PPCODE:
    - t_GL = NULL;
    - t_len = av_len((AV *)SvRV(unused));
    -
    - for (i = 0; i <= t_len; i++) {
    - STRLEN t_sl;
    - t_GL = g_slist_append(t_GL, SvPV(*av_fetch((AV *)SvRV(unused), i, 0), t_sl));
    - }
    - gtk_imhtml_append_text_with_images(imhtml, text, options, t_GL);
    -
    -void
    -gtk_imhtml_scroll_to_end(imhtml, smooth)
    - Pidgin::IMHtml imhtml
    - gboolean smooth
    -
    -void
    -gtk_imhtml_clear(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -void
    -gtk_imhtml_page_up(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -void
    -gtk_imhtml_page_down(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -void
    -gtk_imhtml_set_editable(imhtml, editable)
    - Pidgin::IMHtml imhtml
    - gboolean editable
    -
    -void
    -gtk_imhtml_set_whole_buffer_formatting_only(imhtml, wbo)
    - Pidgin::IMHtml imhtml
    - gboolean wbo
    -
    -void
    -gtk_imhtml_set_format_functions(imhtml, buttons)
    - Pidgin::IMHtml imhtml
    - Pidgin::IMHtml::Buttons buttons
    -
    -Pidgin::IMHtml::Buttons
    -gtk_imhtml_get_format_functions(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -gchar_own *
    -gtk_imhtml_get_current_fontface(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -gchar_own *
    -gtk_imhtml_get_current_forecolor(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -gchar_own *
    -gtk_imhtml_get_current_backcolor(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -gchar_own *
    -gtk_imhtml_get_current_background(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -gint
    -gtk_imhtml_get_current_fontsize(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -gboolean
    -gtk_imhtml_get_editable(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -void
    -gtk_imhtml_clear_formatting(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -void
    -gtk_imhtml_toggle_bold(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -void
    -gtk_imhtml_toggle_italic(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -void
    -gtk_imhtml_toggle_underline(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -void
    -gtk_imhtml_toggle_strike(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -void
    -gtk_imhtml_toggle_forecolor(imhtml, color)
    - Pidgin::IMHtml imhtml
    - const char * color
    -
    -void
    -gtk_imhtml_toggle_backcolor(imhtml, color)
    - Pidgin::IMHtml imhtml
    - const char * color
    -
    -void
    -gtk_imhtml_toggle_background(imhtml, color)
    - Pidgin::IMHtml imhtml
    - const char * color
    -
    -void
    -gtk_imhtml_toggle_fontface(imhtml, face)
    - Pidgin::IMHtml imhtml
    - const char * face
    -
    -void
    -gtk_imhtml_toggle_link(imhtml, url)
    - Pidgin::IMHtml imhtml
    - const char * url
    -
    -void
    -gtk_imhtml_insert_smiley(imhtml, sml, smiley)
    - Pidgin::IMHtml imhtml
    - const char * sml
    - char * smiley
    -
    -void
    -gtk_imhtml_font_set_size(imhtml, size)
    - Pidgin::IMHtml imhtml
    - gint size
    -
    -void
    -gtk_imhtml_font_shrink(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -void
    -gtk_imhtml_font_grow(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -gchar_own *
    -gtk_imhtml_get_markup(imhtml)
    - Pidgin::IMHtml imhtml
    -
    -# /* ETAN Test this, and document well that it returns an arrayref */
    -void
    -gtk_imhtml_get_markup_lines(imhtml)
    - Pidgin::IMHtml imhtml
    -PREINIT:
    - gint i;
    - AV *lines;
    - gchar **bufs;
    -PPCODE:
    - bufs = gtk_imhtml_get_markup_lines(imhtml);
    - lines = newAV();
    - for (i = 0; bufs[i] != NULL; i++) {
    - av_push(lines, newSVpv(bufs[i], 0));
    - }
    - XPUSHs(sv_2mortal(newRV_noinc((SV *)lines)));
    -
    -MODULE = Pidgin::IMHtml PACKAGE = Pidgin::IMHtml::Hr PREFIX = gtk_imhtml_hr_
    -PROTOTYPES: ENABLE
    -
    -Pidgin::IMHtml::Scalable
    -gtk_imhtml_hr_new()
    -
    -void
    -gtk_imhtml_hr_free(scale)
    - Pidgin::IMHtml::Scalable scale
    -
    -void
    -gtk_imhtml_hr_scale(scale, width, height)
    - Pidgin::IMHtml::Scalable scale
    - int width
    - int height
    -
    -MODULE = Pidgin::IMHtml PACKAGE = Pidgin::IMHtml::Search PREFIX = gtk_imhtml_search_
    -PROTOTYPES: ENABLE
    -
    -gboolean
    -gtk_imhtml_search_find(imhtml, text)
    - Pidgin::IMHtml imhtml
    - const gchar * text
    -
    -void
    -gtk_imhtml_search_clear(imhtml)
    - Pidgin::IMHtml imhtml
    --- a/pidgin/plugins/perl/common/GtkIMHtmlToolbar.xs Fri Jan 31 13:52:45 2014 +0100
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,22 +0,0 @@
    -#include "gtkmodule.h"
    -
    -/* This can't work at the moment since I don't have a typemap for Gtk::Widget.
    - * I thought about using the one from libgtk2-perl but wasn't sure how to go
    - * about doing that.
    -
    -Gtk::Widget
    -gtk_imhtmltoolbar_new()
    -
    -void
    -gtk_imhtmltoolbar_attach(toolbar, imhtml)
    - Pidgin::IMHtmlToolbar toolbar
    - Gtk::Widget imhtml
    -*/
    -
    -MODULE = Pidgin::IMHtmlToolbar PACKAGE = Pidgin::IMHtmlToolbar PREFIX = gtk_imhtmltoolbar_
    -PROTOTYPES: ENABLE
    -
    -void
    -gtk_imhtmltoolbar_associate_smileys(toolbar, proto_id)
    - Pidgin::IMHtmlToolbar toolbar
    - const char * proto_id
    --- a/pidgin/plugins/perl/common/GtkThemes.xs Fri Jan 31 13:52:45 2014 +0100
    +++ b/pidgin/plugins/perl/common/GtkThemes.xs Fri Jan 31 14:47:31 2014 +0100
    @@ -17,12 +17,14 @@
    const char * file
    gboolean load
    -void
    -pidgin_themes_get_proto_smileys(id)
    - const char * id
    -PREINIT:
    - GSList *l;
    -PPCODE:
    - for (l = pidgin_themes_get_proto_smileys(id); l != NULL; l = l->next) {
    - XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Pidgin::IMHtml::Smiley")));
    - }
    +# We are dropping IMHtml, so this one should be converted to non-IMHtml
    +# smiley or dropped.
    +#void
    +#pidgin_themes_get_proto_smileys(id)
    +# const char * id
    +#PREINIT:
    +# GSList *l;
    +#PPCODE:
    +# for (l = pidgin_themes_get_proto_smileys(id); l != NULL; l = l->next) {
    +# XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Pidgin::IMHtml::Smiley")));
    +# }
    --- a/pidgin/plugins/perl/common/MANIFEST Fri Jan 31 13:52:45 2014 +0100
    +++ b/pidgin/plugins/perl/common/MANIFEST Fri Jan 31 14:47:31 2014 +0100
    @@ -6,8 +6,6 @@
    GtkDebug.xs
    GtkDialogs.xs
    GtkFt.xs
    -GtkIMHtml.xs
    -GtkIMHtmlToolbar.xs
    GtkLog.xs
    GtkMenuTray.xs
    GtkPlugin.xs
    --- a/pidgin/plugins/perl/common/Makefile.mingw Fri Jan 31 13:52:45 2014 +0100
    +++ b/pidgin/plugins/perl/common/Makefile.mingw Fri Jan 31 14:47:31 2014 +0100
    @@ -55,8 +55,6 @@
    GtkDebug.xs \
    GtkDialogs.xs \
    GtkFt.xs \
    - GtkIMHtml.xs \
    - GtkIMHtmlToolbar.xs \
    GtkLog.xs \
    GtkMenuTray.xs \
    GtkPlugin.xs \
    --- a/pidgin/plugins/perl/common/Pidgin.xs Fri Jan 31 13:52:45 2014 +0100
    +++ b/pidgin/plugins/perl/common/Pidgin.xs Fri Jan 31 14:47:31 2014 +0100
    @@ -14,8 +14,6 @@
    PIDGIN_PERL_BOOT_PROTO(Conversation__Window);
    PIDGIN_PERL_BOOT_PROTO(Debug);
    PIDGIN_PERL_BOOT_PROTO(Dialogs);
    -PIDGIN_PERL_BOOT_PROTO(IMHtml);
    -PIDGIN_PERL_BOOT_PROTO(IMHtmlToolbar);
    PIDGIN_PERL_BOOT_PROTO(Log);
    PIDGIN_PERL_BOOT_PROTO(MenuTray);
    PIDGIN_PERL_BOOT_PROTO(Plugin);
    @@ -45,8 +43,6 @@
    PIDGIN_PERL_BOOT(Conversation__Window);
    PIDGIN_PERL_BOOT(Debug);
    PIDGIN_PERL_BOOT(Dialogs);
    - PIDGIN_PERL_BOOT(IMHtml);
    - PIDGIN_PERL_BOOT(IMHtmlToolbar);
    PIDGIN_PERL_BOOT(Log);
    PIDGIN_PERL_BOOT(MenuTray);
    PIDGIN_PERL_BOOT(Plugin);
    --- a/pidgin/plugins/perl/common/gtkmodule.h Fri Jan 31 13:52:45 2014 +0100
    +++ b/pidgin/plugins/perl/common/gtkmodule.h Fri Jan 31 14:47:31 2014 +0100
    @@ -27,8 +27,6 @@
    #include "gtkdebug.h"
    #include "gtkdialogs.h"
    #include "gtkxfer.h"
    -#include "gtkimhtml.h"
    -#include "gtkimhtmltoolbar.h"
    #include "gtklog.h"
    #include "gtkmenutray.h"
    #include "gtkplugin.h"
    @@ -62,17 +60,6 @@
    /* gtkxfer.h */
    typedef PidginXferDialog * Pidgin__Xfer__Dialog;
    -/* gtkimhtml.h */
    -typedef GtkIMHtml * Pidgin__IMHtml;
    -typedef GtkIMHtmlButtons Pidgin__IMHtml__Buttons;
    -typedef GtkIMHtmlFuncs * Pidgin__IMHtml__Funcs;
    -typedef GtkIMHtmlScalable * Pidgin__IMHtml__Scalable;
    -typedef GtkIMHtmlSmiley * Pidgin__IMHtml__Smiley;
    -typedef GtkIMHtmlOptions Pidgin__IMHtml__Options;
    -
    -/* gtkimhtmltoolbar.h */
    -typedef GtkIMHtmlToolbar * Pidgin__IMHtmlToolbar;
    -
    /* gtkmenutray.h */
    typedef PidginMenuTray * Pidgin__MenuTray;
    --- a/pidgin/plugins/perl/common/typemap Fri Jan 31 13:52:45 2014 +0100
    +++ b/pidgin/plugins/perl/common/typemap Fri Jan 31 14:47:31 2014 +0100
    @@ -7,13 +7,6 @@
    Pidgin::Conversation::PlacementFunc T_PurpleObj
    Pidgin::Conversation::Window T_PurpleObj
    Pidgin::Xfer::Dialog T_PurpleObj
    -Pidgin::IMHtml T_PurpleObj
    -Pidgin::IMHtml::Buttons T_IV
    -Pidgin::IMHtml::Funcs T_PurpleObj
    -Pidgin::IMHtml::Scalable T_PurpleObj
    -Pidgin::IMHtml::Smiley T_PurpleObj
    -Pidgin::IMHtml::Options T_IV
    -Pidgin::IMHtmlToolbar T_PurpleObj
    Pidgin::MenuTray T_PurpleObj
    Pidgin::StatusBox T_PurpleObj
    Pidgin::UnseenState T_IV