changeset 14581:3ed24586efcb

[gaim-migrate @ 17305] Remove a couple more commented out functions, fix the class we were blessing things into with smiley themes, and add an indentatation level to the bootstrap section of GtkUI.xs (doesn't matter now but bit me during some of my testing). committer: Tailor Script <[e-mail]>

--- a/gtk/plugins/perl/common/GtkThemes.xs	Mon Sep 18 04:24:03 2006 +0000
+++ b/gtk/plugins/perl/common/GtkThemes.xs	Mon Sep 18 04:26:33 2006 +0000
@@ -1,13 +1,5 @@
 #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.
-void
-gaim_gtkthemes_smiley_themeize(widget)
-	Gtk::Widget * widget
-*/
-
 MODULE = Gaim::GtkUI::Themes  PACKAGE = Gaim::GtkUI::Themes  PREFIX = gaim_gtkthemes_
 PROTOTYPES: ENABLE
 
@@ -32,5 +24,5 @@
 	GSList *l;
 PPCODE:
 	for (l = gaim_gtkthemes_get_proto_smileys(id); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gtk::IMHtml::Smiley")));
+		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::GtkUI::IMHtml::Smiley")));
 	}

--- a/gtk/plugins/perl/common/GtkUI.xs	Mon Sep 18 04:24:03 2006 +0000
+++ b/gtk/plugins/perl/common/GtkUI.xs	Mon Sep 18 04:26:33 2006 +0000
@@ -1,24 +1,5 @@
 #include "gtkmodule.h"
 
-/*
-#define GAIM_PERL_BOOT_PROTO(x) \
-	void boot_Gaim__##x(pTHX_ CV *cv);
-
-#define GAIM_PERL_BOOT(x) \
-	gaim_perl_callXS(boot_Gaim__##x, cv, mark)
-
-static void
-gaim_perl_callXS(void (*subaddr)(pTHX_ CV *cv), CV *cv, SV **mark)
-{
-	dSP;
-
-	PUSHMARK(mark);
-	(*subaddr)(aTHX_ cv);
-
-	PUTBACK;
-}
-*/
-
 /* Prototypes for the BOOT section below. */
 GAIM_PERL_BOOT_PROTO(GtkUI__Account);
 GAIM_PERL_BOOT_PROTO(GtkUI__BuddyList);
@@ -51,29 +32,29 @@
 PROTOTYPES: ENABLE
 
 BOOT:
-GAIM_PERL_BOOT(GtkUI__Account);
-GAIM_PERL_BOOT(GtkUI__BuddyList);
-GAIM_PERL_BOOT(GtkUI__Connection);
-GAIM_PERL_BOOT(GtkUI__Conversation);
-GAIM_PERL_BOOT(GtkUI__Conversation__Window);
-GAIM_PERL_BOOT(GtkUI__Debug);
-GAIM_PERL_BOOT(GtkUI__Dialogs);
-GAIM_PERL_BOOT(GtkUI__IMHtml);
-GAIM_PERL_BOOT(GtkUI__IMHtmlToolbar);
-GAIM_PERL_BOOT(GtkUI__Log);
-GAIM_PERL_BOOT(GtkUI__MenuTray);
-GAIM_PERL_BOOT(GtkUI__Plugin);
-GAIM_PERL_BOOT(GtkUI__PluginPref);
-GAIM_PERL_BOOT(GtkUI__Pounce);
-GAIM_PERL_BOOT(GtkUI__Prefs);
-GAIM_PERL_BOOT(GtkUI__Privacy);
-GAIM_PERL_BOOT(GtkUI__Roomlist);
-GAIM_PERL_BOOT(GtkUI__Status);
+	GAIM_PERL_BOOT(GtkUI__Account);
+	GAIM_PERL_BOOT(GtkUI__BuddyList);
+	GAIM_PERL_BOOT(GtkUI__Connection);
+	GAIM_PERL_BOOT(GtkUI__Conversation);
+	GAIM_PERL_BOOT(GtkUI__Conversation__Window);
+	GAIM_PERL_BOOT(GtkUI__Debug);
+	GAIM_PERL_BOOT(GtkUI__Dialogs);
+	GAIM_PERL_BOOT(GtkUI__IMHtml);
+	GAIM_PERL_BOOT(GtkUI__IMHtmlToolbar);
+	GAIM_PERL_BOOT(GtkUI__Log);
+	GAIM_PERL_BOOT(GtkUI__MenuTray);
+	GAIM_PERL_BOOT(GtkUI__Plugin);
+	GAIM_PERL_BOOT(GtkUI__PluginPref);
+	GAIM_PERL_BOOT(GtkUI__Pounce);
+	GAIM_PERL_BOOT(GtkUI__Prefs);
+	GAIM_PERL_BOOT(GtkUI__Privacy);
+	GAIM_PERL_BOOT(GtkUI__Roomlist);
+	GAIM_PERL_BOOT(GtkUI__Status);
 #ifndef _WIN32
-GAIM_PERL_BOOT(GtkUI__Session);
+	GAIM_PERL_BOOT(GtkUI__Session);
 #endif
-GAIM_PERL_BOOT(GtkUI__Sound);
-GAIM_PERL_BOOT(GtkUI__StatusBox);
-GAIM_PERL_BOOT(GtkUI__Themes);
-GAIM_PERL_BOOT(GtkUI__Utils);
-GAIM_PERL_BOOT(GtkUI__Xfer);
+	GAIM_PERL_BOOT(GtkUI__Sound);
+	GAIM_PERL_BOOT(GtkUI__StatusBox);
+	GAIM_PERL_BOOT(GtkUI__Themes);
+	GAIM_PERL_BOOT(GtkUI__Utils);
+	GAIM_PERL_BOOT(GtkUI__Xfer);