/soc/2013/ankitkv/gobjectification: c1936deaa35b: Merged gtkdoc-...

Ankit Vani a at nevitus.org
Fri Jan 31 09:47:28 EST 2014


Changeset: c1936deaa35b616e5b66a4f3c8cfb97e6518136a
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-01-31 20:17 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/c1936deaa35b

Description:

Merged gtkdoc-conversion

diffstat:

 pidgin/gtkblist.c                              |   16 -
 pidgin/plugins/disco/xmppdisco.c               |    1 -
 pidgin/plugins/history.c                       |    1 -
 pidgin/plugins/perl/Makefile.am                |    2 -
 pidgin/plugins/perl/common/GtkIMHtml.xs        |  332 -------------------------
 pidgin/plugins/perl/common/GtkIMHtmlToolbar.xs |   22 -
 pidgin/plugins/perl/common/GtkThemes.xs        |   20 +-
 pidgin/plugins/perl/common/MANIFEST            |    2 -
 pidgin/plugins/perl/common/Makefile.mingw      |    2 -
 pidgin/plugins/perl/common/Pidgin.xs           |    4 -
 pidgin/plugins/perl/common/gtkmodule.h         |   13 -
 pidgin/plugins/perl/common/typemap             |    7 -
 pidgin/plugins/xmppconsole.c                   |   66 +++-
 13 files changed, 62 insertions(+), 426 deletions(-)

diffs (truncated from 677 to 300 lines):

diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -50,7 +50,6 @@
 #include "gtkdebug.h"
 #include "gtkdialogs.h"
 #include "gtkxfer.h"
-#include "gtkimhtml.h"
 #include "gtklog.h"
 #include "gtkmenutray.h"
 #include "gtkpounce.h"
@@ -5024,24 +5023,9 @@ account_status_changed(PurpleAccount *ac
 static gboolean
 gtk_blist_window_key_press_cb(GtkWidget *w, GdkEventKey *event, PidginBuddyList *gtkblist)
 {
-	GtkWidget *widget;
-
-	if (!gtkblist)
-		return FALSE;
-
 	/* clear any tooltips */
 	pidgin_blist_tooltip_destroy();
 
-	widget = gtk_window_get_focus(GTK_WINDOW(gtkblist->window));
-
-	if (GTK_IS_IMHTML(widget) || GTK_IS_ENTRY(widget)) {
-#if GTK_CHECK_VERSION(3,0,0)
-		if (gtk_bindings_activate(G_OBJECT(widget), event->keyval, event->state))
-#else
-		if (gtk_bindings_activate(GTK_OBJECT(widget), event->keyval, event->state))
-#endif
-			return TRUE;
-	}
 	return FALSE;
 }
 
diff --git a/pidgin/plugins/disco/xmppdisco.c b/pidgin/plugins/disco/xmppdisco.c
--- a/pidgin/plugins/disco/xmppdisco.c
+++ b/pidgin/plugins/disco/xmppdisco.c
@@ -44,7 +44,6 @@ disco#info:
 #include "version.h"
 
 #include "gtkconv.h"
-#include "gtkimhtml.h"
 #include "gtkplugin.h"
 
 #include "xmppdisco.h"
diff --git a/pidgin/plugins/history.c b/pidgin/plugins/history.c
--- a/pidgin/plugins/history.c
+++ b/pidgin/plugins/history.c
@@ -14,7 +14,6 @@
 #include "version.h"
 
 #include "gtkconv.h"
-#include "gtkimhtml.h"
 #include "gtkplugin.h"
 #include "gtkwebview.h"
 
diff --git a/pidgin/plugins/perl/Makefile.am b/pidgin/plugins/perl/Makefile.am
--- a/pidgin/plugins/perl/Makefile.am
+++ b/pidgin/plugins/perl/Makefile.am
@@ -9,8 +9,6 @@ common_sources = \
 	common/GtkDebug.xs \
 	common/GtkDialogs.xs \
 	common/GtkFt.xs \
-	common/GtkIMHtml.xs \
-	common/GtkIMHtmlToolbar.xs \
 	common/GtkLog.xs \
 	common/GtkMenuTray.xs \
 	common/GtkPlugin.xs \
diff --git a/pidgin/plugins/perl/common/GtkIMHtml.xs b/pidgin/plugins/perl/common/GtkIMHtml.xs
deleted file mode 100644
--- a/pidgin/plugins/perl/common/GtkIMHtml.xs
+++ /dev/null
@@ -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
-



More information about the Commits mailing list