/pidgin/main: 82c6d1ca2224: Fix win32 build after gobj merge

[Tomasz Wasilczyk]

Changeset: 82c6d1ca2224930eb69e182d7671ce473aee4ab4
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2013-12-08 01:54 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/82c6d1ca2224

Description:

Fix win32 build after gobj merge

diffstat:

 libpurple/plugins/perl/common/Purple.xs        |  4 ++--
 pidgin/plugins/win32/transparency/win2ktrans.c |  1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diffs (42 lines):

diff --git a/libpurple/plugins/perl/common/Purple.xs b/libpurple/plugins/perl/common/Purple.xs
--- a/libpurple/plugins/perl/common/Purple.xs
+++ b/libpurple/plugins/perl/common/Purple.xs
@@ -7,12 +7,12 @@ PURPLE_PERL_BOOT_PROTO(Account__Option);
 PURPLE_PERL_BOOT_PROTO(Buddy__Icon);
 PURPLE_PERL_BOOT_PROTO(BuddyList);
 PURPLE_PERL_BOOT_PROTO(Certificate);
-PURPLE_PERL_BOOT_PROTO(Cipher);
 PURPLE_PERL_BOOT_PROTO(Cmd);
 PURPLE_PERL_BOOT_PROTO(Connection);
 PURPLE_PERL_BOOT_PROTO(Conversation);
 PURPLE_PERL_BOOT_PROTO(Core);
 PURPLE_PERL_BOOT_PROTO(Debug);
+PURPLE_PERL_BOOT_PROTO(Hash);
 PURPLE_PERL_BOOT_PROTO(Xfer);
 PURPLE_PERL_BOOT_PROTO(Idle);
 PURPLE_PERL_BOOT_PROTO(ImgStore);
@@ -48,12 +48,12 @@ BOOT:
 	PURPLE_PERL_BOOT(Buddy__Icon);
 	PURPLE_PERL_BOOT(BuddyList);
 	PURPLE_PERL_BOOT(Certificate);
-	PURPLE_PERL_BOOT(Cipher);
 	PURPLE_PERL_BOOT(Cmd);
 	PURPLE_PERL_BOOT(Connection);
 	PURPLE_PERL_BOOT(Conversation);
 	PURPLE_PERL_BOOT(Core);
 	PURPLE_PERL_BOOT(Debug);
+	PURPLE_PERL_BOOT(Hash);
 	PURPLE_PERL_BOOT(Xfer);
 	PURPLE_PERL_BOOT(Idle);
 	PURPLE_PERL_BOOT(ImgStore);
diff --git a/pidgin/plugins/win32/transparency/win2ktrans.c b/pidgin/plugins/win32/transparency/win2ktrans.c
--- a/pidgin/plugins/win32/transparency/win2ktrans.c
+++ b/pidgin/plugins/win32/transparency/win2ktrans.c
@@ -659,7 +659,6 @@ static GtkWidget *get_config_frame(Purpl
 static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
-	0, /* page_num (Reserved) */
 
 	/* padding */
 	NULL,