[Gaim-commits] SF.net SVN: gaim: [17305] trunk/gtk/plugins/perl/common

[<de...@us...>]

Revision: 17305
          http://svn.sourceforge.net/gaim/?rev=17305&view=rev
Author:   deryni9
Date:     2006-09-17 21:26:33 -0700 (Sun, 17 Sep 2006)

Log Message:
-----------
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).

Modified Paths:
--------------
    trunk/gtk/plugins/perl/common/GtkThemes.xs
    trunk/gtk/plugins/perl/common/GtkUI.xs

Modified: trunk/gtk/plugins/perl/common/GtkThemes.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkThemes.xs	2006-09-18 04:24:03 UTC (rev 17304)
+++ trunk/gtk/plugins/perl/common/GtkThemes.xs	2006-09-18 04:26:33 UTC (rev 17305)
@@ -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")));
 	}

Modified: trunk/gtk/plugins/perl/common/GtkUI.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkUI.xs	2006-09-18 04:24:03 UTC (rev 17304)
+++ trunk/gtk/plugins/perl/common/GtkUI.xs	2006-09-18 04:26:33 UTC (rev 17305)
@@ -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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.