merge of 'fb0aecf9c28a46386c5a75c60f4b406fab6ba290'

     and '0360bc9b1d778641f24c6da0ad4ae2084937c280'

10 files changed, 127 insertions, 23 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index d26e459cdf..db70257d85 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -87,6 +87,7 @@ Adam Cowell
 Palmer Cox
 Jeramey Crawford
 Michael Culbertson
+Steven Danna
 Martijn Dekker
 Vinicius Depizzol
 Philip Derrin
diff --git a/finch/libgnt/Makefile.am b/finch/libgnt/Makefile.am
index 8fec24f862..e948357b08 100644
--- a/finch/libgnt/Makefile.am
+++ b/finch/libgnt/Makefile.am
@@ -66,10 +66,10 @@ CLEANFILES = \
 
 gntmarshal.c: $(srcdir)/genmarshal gntmarshal.h
 	echo "#include \"gntmarshal.h\"" > $@
-	cat $(srcdir)/genmarshal | glib-genmarshal --prefix=gnt_closure_marshal --body >> $@
+	glib-genmarshal --prefix=gnt_closure_marshal --body $(srcdir)/genmarshal >> $@
 
 gntmarshal.h: $(srcdir)/genmarshal
-	cat $(srcdir)/genmarshal | glib-genmarshal --prefix=gnt_closure_marshal --header > $@
+	glib-genmarshal --prefix=gnt_closure_marshal --header $(srcdir)/genmarshal > $@
 
 libgnt_laincludedir=$(includedir)/gnt
 libgnt_lainclude_HEADERS = \
diff --git a/libpurple/idle.c b/libpurple/idle.c
index 01eb71ef39..54dc438f80 100644
--- a/libpurple/idle.c
+++ b/libpurple/idle.c
@@ -197,8 +197,8 @@ check_idleness(void)
 	}
 	else if (!no_away && time_idle < away_seconds)
 	{
-		purple_savedstatus_set_idleaway(FALSE);
 		no_away = 1;
+		purple_savedstatus_set_idleaway(FALSE);
 		if (time_until_next_idle_event == 0 || (away_seconds - time_idle) < time_until_next_idle_event)
 			time_until_next_idle_event = away_seconds - time_idle;
 	}
diff --git a/libpurple/plugins/perl/common/SavedStatuses.xs b/libpurple/plugins/perl/common/SavedStatuses.xs
index 6df794270c..09ae918740 100644
--- a/libpurple/plugins/perl/common/SavedStatuses.xs
+++ b/libpurple/plugins/perl/common/SavedStatuses.xs
@@ -1,40 +1,128 @@
 #include "module.h"
 
+/* I can't get this to work, both with and without the const on the return
+ * type I get errors from gcc. One way about ignoring types in a cast, and the
+ * other about assigning to read-only variables.
+const Purple::StatusType
+purple_savedstatus_substatus_get_type(substatus)
+	const Purple::SavedStatus::Sub substatus
+*/
+
 MODULE = Purple::SavedStatus  PACKAGE = Purple::SavedStatus  PREFIX = purple_savedstatus_
 PROTOTYPES: ENABLE
 
+Purple::SavedStatus
+purple_savedstatus_new(title, type)
+	const char *title
+	Purple::StatusPrimitive type
+
+void
+purple_savedstatus_set_title(status, title)
+	Purple::SavedStatus status
+	const char *title
+
+void
+purple_savedstatus_set_type(status, type)
+	Purple::SavedStatus status
+	Purple::StatusPrimitive type
+
+void
+purple_savedstatus_set_message(status, message)
+	Purple::SavedStatus status
+	const char *message
+
+void
+purple_savedstatus_set_substatus(status, account, type, message)
+	Purple::SavedStatus status
+	Purple::Account account
+	Purple::StatusType type
+	const char *message
+
+void
+purple_savedstatus_unset_substatus(status, account)
+	Purple::SavedStatus status
+	Purple::Account account
+
 gboolean
 purple_savedstatus_delete(title)
 	const char *title
 
 Purple::SavedStatus
+purple_savedstatus_get_current()
+
+Purple::SavedStatus
+purple_savedstatus_get_default()
+
+Purple::SavedStatus
+purple_savedstatus_get_idleaway()
+
+gboolean
+purple_savedstatus_is_idleaway()
+
+void
+purple_savedstatus_set_idleaway(idleaway)
+	gboolean idleaway
+
+Purple::SavedStatus
+purple_savedstatus_get_startup()
+
+Purple::SavedStatus
 purple_savedstatus_find(title)
 	const char *title
 
-const char *
-purple_savedstatus_get_message(saved_status)
-	Purple::SavedStatus saved_status
+Purple::SavedStatus
+purple_savedstatus_find_by_creation_time(creation_time)
+	time_t creation_time
+
+Purple::SavedStatus
+purple_savedstatus_find_transient_by_type_and_message(type, message)
+	Purple::StatusPrimitive type
+	const char *message
+
+gboolean
+purple_savedstatus_is_transient(saved_status)
+	const Purple::SavedStatus saved_status
 
 const char *
 purple_savedstatus_get_title(saved_status)
-	Purple::SavedStatus saved_status
+	const Purple::SavedStatus saved_status
 
 Purple::StatusPrimitive
 purple_savedstatus_get_type(saved_status)
+	const Purple::SavedStatus saved_status
+
+const char *
+purple_savedstatus_get_message(saved_status)
+	const Purple::SavedStatus saved_status
+
+time_t
+purple_savedstatus_get_creation_time(saved_status)
+	const Purple::SavedStatus saved_status
+
+gboolean
+purple_savedstatus_has_substatuses(saved_status)
+	const Purple::SavedStatus saved_status
+
+Purple::SavedStatus::Sub
+purple_savedstatus_get_substatus(saved_status, account)
 	Purple::SavedStatus saved_status
+	Purple::Account account
 
-Purple::SavedStatus
-purple_savedstatus_new(title, type)
-	const char *title
-	Purple::StatusPrimitive type
+void
+purple_savedstatus_activate(saved_status)
+	Purple::SavedStatus saved_status
 
 void
-purple_savedstatus_set_message(status, message)
-	Purple::SavedStatus status
-	const char *message
+purple_savedstatus_activate_for_account(saved_status, account)
+	const Purple::SavedStatus saved_status
+	Purple::Account account
 
-Purple::SavedStatus
-purple_savedstatus_get_current()
+MODULE = Purple::SavedStatus::Sub  PACKAGE = Purple::SavedStatus::Sub  PREFIX = purple_savedstatus_substatus_
+PROTOTYPES: ENABLE
+
+const char *
+purple_savedstatus_substatus_get_message(substatus)
+	const Purple::SavedStatus::Sub substatus
 
 MODULE = Purple::SavedStatus  PACKAGE = Purple::SavedStatuses  PREFIX = purple_savedstatuses_
 PROTOTYPES: ENABLE
@@ -48,6 +136,16 @@ PPCODE:
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::SavedStatus")));
 	}
 
+void
+purple_savedstatuses_get_popular(how_many)
+	unsigned int how_many
+PREINIT:
+	const GList *l;
+PPCODE:
+	for (l = purple_savedstatuses_get_popular(how_many); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::SavedStatus")));
+	}
+
 Purple::Handle
 purple_savedstatuses_get_handle()
 
diff --git a/libpurple/plugins/perl/common/module.h b/libpurple/plugins/perl/common/module.h
index d399802c44..f4d38d7ec3 100644
--- a/libpurple/plugins/perl/common/module.h
+++ b/libpurple/plugins/perl/common/module.h
@@ -236,7 +236,7 @@ typedef PurpleRoomlistUiOps *		Purple__Roomlist__UiOps;
 
 /* savedstatuses.h */
 typedef PurpleSavedStatus *		Purple__SavedStatus;
-typedef PurpleSavedStatusSub *		Purple__SavedStatusSub;
+typedef PurpleSavedStatusSub *		Purple__SavedStatus__Sub;
 
 /* sound.h */
 typedef PurpleSoundEventID		Purple__SoundEventID;
diff --git a/libpurple/plugins/perl/common/typemap b/libpurple/plugins/perl/common/typemap
index 6c7d82b91c..859cabc3a3 100644
--- a/libpurple/plugins/perl/common/typemap
+++ b/libpurple/plugins/perl/common/typemap
@@ -137,7 +137,9 @@ Purple::RoomlistFieldType			T_IV
 Purple::RoomlistRoomType			T_IV
 
 Purple::SavedStatus			T_PurpleObj
-Purple::SavedStatusSub			T_PurpleObj
+const Purple::SavedStatus			T_PurpleObj
+Purple::SavedStatus::Sub			T_PurpleObj
+const Purple::SavedStatus::Sub			T_PurpleObj
 Purple::SoundEventID			T_IV
 Purple::Sound::UiOps			T_PurpleObj
 
diff --git a/libpurple/protocols/gg/lib/pubdir50.c b/libpurple/protocols/gg/lib/pubdir50.c
index 8fb672da51..20ad6dff49 100644
--- a/libpurple/protocols/gg/lib/pubdir50.c
+++ b/libpurple/protocols/gg/lib/pubdir50.c
@@ -347,7 +347,7 @@ int gg_pubdir50_handle_reply(struct gg_event *e, const char *packet, int length)
 
 		/* jeśli dostaliśmy namier na następne wyniki, to znaczy że
 		 * mamy koniec wyników i nie jest to kolejna osoba. */
-		if (!g_ascii_strcasecmp(field, "nextstart")) {
+		if (!strcasecmp(field, "nextstart")) {
 			res->next = atoi(value);
 			num--;
 		} else {
@@ -390,7 +390,7 @@ const char *gg_pubdir50_get(gg_pubdir50_t res, int num, const char *field)
 	}
 
 	for (i = 0; i < res->entries_count; i++) {
-		if (res->entries[i].num == num && !g_ascii_strcasecmp(res->entries[i].field, field)) {
+		if (res->entries[i].num == num && !strcasecmp(res->entries[i].field, field)) {
 			value = res->entries[i].value;
 			break;
 		}
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c
index f991786e6a..cc4f16b96a 100644
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -342,8 +342,10 @@ msn_show_hotmail_inbox(PurplePluginAction *action)
 
 	if (session->passport_info.file == NULL)
 	{
+		MsnCmdProc *cmdproc = session->notification->cmdproc;
 		purple_notify_error(gc, NULL,
 						  _("This Hotmail account may not be active."), NULL);
+		msn_cmdproc_send(cmdproc, "URL", "%s", "INBOX");
 		return;
 	}
 
diff --git a/libpurple/protocols/msn/notification.c b/libpurple/protocols/msn/notification.c
index 6573a4f3b8..2c884b3e10 100644
--- a/libpurple/protocols/msn/notification.c
+++ b/libpurple/protocols/msn/notification.c
@@ -592,6 +592,10 @@ static void
 qng_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	static int count = 0;
+	MsnSession *session = cmdproc->session;
+
+	if (session->passport_info.file == NULL)
+		return;
 
 	if (count++ < 26)
 		return;
diff --git a/pidgin/plugins/pidginrc.c b/pidgin/plugins/pidginrc.c
index 49daf0e1ce..5c62ef52cf 100644
--- a/pidgin/plugins/pidginrc.c
+++ b/pidgin/plugins/pidginrc.c
@@ -45,15 +45,12 @@ static const char *color_names[] = {
 static GtkWidget *color_widgets[G_N_ELEMENTS(color_prefs)];
 
 static const char *widget_size_prefs[] = {
-	"/plugins/gtk/purplerc/size/GtkTreeView::expander_size",
 	"/plugins/gtk/purplerc/size/GtkTreeView::horizontal_separator"
 };
 static const char *widget_size_prefs_set[] = {
-	"/plugins/gtk/purplerc/set/size/GtkTreeView::expander_size",
 	"/plugins/gtk/purplerc/set/size/GtkTreeView::horizontal_separator"
 };
 static const char *widget_size_names[] = {
-	N_("GtkTreeView Expander Size"),
 	N_("GtkTreeView Horizontal Separation")
 };
 static GtkWidget *widget_size_widgets[G_N_ELEMENTS(widget_size_prefs)];