Mercurial > pidgin3 / changeset

changeset

Merge default

Wed, 23 Oct 2013 22:07:58 +0200

author
Tomasz Wasilczyk <twasilczyk@pidgin.im>
date
Wed, 23 Oct 2013 22:07:58 +0200
changeset 34497
e8d3d970af5c
parent 34496
f1eeb0d0cea5 (current diff)
parent 34477
86f6c431da7b (diff)
child 34498
ca86b49b6d84

Merge default

--- a/finch/plugins/gnttinyurl.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/finch/plugins/gnttinyurl.c	Wed Oct 23 22:07:58 2013 +0200
@@ -465,8 +465,6 @@
 
 static PurplePluginUiInfo prefs_info = {
   get_plugin_pref_frame,
-  0,    /* page_num (Reserved) */
-  NULL, /* frame (Reserved) */
 
   /* padding */
   NULL,
--- a/libpurple/plugin.h	Wed Oct 23 21:00:07 2013 +0200
+++ b/libpurple/plugin.h	Wed Oct 23 22:07:58 2013 +0200
@@ -160,6 +160,7 @@
 	void *extra;                           /**< Plugin-specific data.     */
 	gboolean unloadable;                   /**< Unloadable                */
 	GList *dependent_plugins;              /**< Plugins depending on this */
+	gpointer ui_data;                      /**< The UI data. */
 
 	void (*_purple_reserved1)(void);
 	void (*_purple_reserved2)(void);
@@ -173,9 +174,6 @@
 struct _PurplePluginUiInfo {
 	PurplePluginPrefFrame *(*get_plugin_pref_frame)(PurplePlugin *plugin);
 
-	int page_num;                                         /**< Reserved */
-	PurplePluginPrefFrame *frame;                           /**< Reserved */
-
 	void (*_purple_reserved1)(void);
 	void (*_purple_reserved2)(void);
 	void (*_purple_reserved3)(void);
--- a/libpurple/plugins/autoaccept.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/libpurple/plugins/autoaccept.c	Wed Oct 23 22:07:58 2013 +0200
@@ -298,8 +298,6 @@
 
 static PurplePluginUiInfo prefs_info = {
 	get_plugin_pref_frame,
-	0,
-	NULL,
 
 	/* padding */
 	NULL,
--- a/libpurple/plugins/joinpart.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/libpurple/plugins/joinpart.c	Wed Oct 23 22:07:58 2013 +0200
@@ -252,8 +252,6 @@
 
 static PurplePluginUiInfo prefs_info = {
 	get_plugin_pref_frame,
-	0,   /* page_num (reserved) */
-	NULL, /* frame (reserved) */
 
 	/* padding */
 	NULL,
--- a/libpurple/plugins/log_reader.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/libpurple/plugins/log_reader.c	Wed Oct 23 22:07:58 2013 +0200
@@ -2909,8 +2909,6 @@
 
 static PurplePluginUiInfo prefs_info = {
 	get_plugin_pref_frame,
-	0,   /* page_num (reserved) */
-	NULL, /* frame (reserved) */
 
 	/* padding */
 	NULL,
--- a/libpurple/plugins/newline.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/libpurple/plugins/newline.c	Wed Oct 23 22:07:58 2013 +0200
@@ -80,8 +80,6 @@
 
 static PurplePluginUiInfo prefs_info = {
 	get_plugin_pref_frame,
-	0,   /* page_num (Reserved) */
-	NULL, /* frame (Reserved) */
 	/* Padding */
 	NULL,
 	NULL,
--- a/libpurple/plugins/offlinemsg.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/libpurple/plugins/offlinemsg.c	Wed Oct 23 22:07:58 2013 +0200
@@ -207,8 +207,6 @@
 
 static PurplePluginUiInfo prefs_info = {
 	get_plugin_pref_frame,
-	0,
-	NULL,
 
 	/* padding */
 	NULL,
--- a/libpurple/plugins/perl/perl.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/libpurple/plugins/perl/perl.c	Wed Oct 23 22:07:58 2013 +0200
@@ -117,8 +117,6 @@
 static PurplePluginUiInfo ui_info =
 {
 	purple_perl_get_plugin_frame,
-	0,   /* page_num (Reserved) */
-	NULL, /* frame (Reserved)    */
 	/* Padding */
 	NULL,
 	NULL,
--- a/libpurple/plugins/pluginpref_example.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/libpurple/plugins/pluginpref_example.c	Wed Oct 23 22:07:58 2013 +0200
@@ -109,8 +109,6 @@
 
 static PurplePluginUiInfo prefs_info = {
 	get_plugin_pref_frame,
-	0,   /* page_num (Reserved) */
-	NULL, /* frame (Reserved) */
 	/* Padding */
 	NULL,
 	NULL,
--- a/libpurple/plugins/psychic.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/libpurple/plugins/psychic.c	Wed Oct 23 22:07:58 2013 +0200
@@ -125,8 +125,6 @@
 
 static PurplePluginUiInfo prefs_info = {
   get_plugin_pref_frame,
-  0,    /* page_num (Reserved) */
-  NULL, /* frame (Reserved) */
 
   /* padding */
   NULL,
--- a/libpurple/plugins/statenotify.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/libpurple/plugins/statenotify.c	Wed Oct 23 22:07:58 2013 +0200
@@ -136,8 +136,6 @@
 static PurplePluginUiInfo prefs_info =
 {
 	get_plugin_pref_frame,
-	0,   /* page_num (Reserved) */
-	NULL, /* frame (Reserved) */
 
 	/* padding */
 	NULL,
--- a/libpurple/protocols/gg/pubdir-prpl.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/libpurple/protocols/gg/pubdir-prpl.c	Wed Oct 23 22:07:58 2013 +0200
@@ -531,8 +531,8 @@
 	purple_request_field_group_add_field(group, field);
 
 	field = purple_request_field_choice_new("gender", _("Gender"),
-		GINT_TO_POINTER(form->gender));
-	purple_request_field_choice_add(field, _("Male or female"), 0);
+		form ? GINT_TO_POINTER(form->gender) : NULL);
+	purple_request_field_choice_add(field, _("Male or female"), NULL);
 	purple_request_field_choice_add(field, _("Male"),
 		GINT_TO_POINTER(GGP_PUBDIR_GENDER_MALE));
 	purple_request_field_choice_add(field, _("Female"),
--- a/pidgin/gtkplugin.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/pidgin/gtkplugin.c	Wed Oct 23 22:07:58 2013 +0200
@@ -91,7 +91,7 @@
 
 		config = pidgin_plugin_pref_create_frame(frame);
 
-		plugin->info->prefs_info->frame = frame;
+		plugin->ui_data = frame;
 	}
 
 	return config;
@@ -227,9 +227,9 @@
 		}
 		gtk_widget_destroy(d);
 
-		if (plug->info->prefs_info && plug->info->prefs_info->frame) {
-			purple_plugin_pref_frame_destroy(plug->info->prefs_info->frame);
-			plug->info->prefs_info->frame = NULL;
+		if (plug->info->prefs_info && plug->ui_data) {
+			purple_plugin_pref_frame_destroy(plug->ui_data);
+			plug->ui_data = NULL;
 		}
 
 		break;
--- a/pidgin/gtkplugin.h	Wed Oct 23 21:00:07 2013 +0200
+++ b/pidgin/gtkplugin.h	Wed Oct 23 22:07:58 2013 +0200
@@ -38,8 +38,6 @@
 {
 	GtkWidget *(*get_config_frame)(PurplePlugin *plugin);
 
-	int page_num;                                         /**< Reserved */
-
 	/* padding */
 	void (*_pidgin_reserved1)(void);
 	void (*_pidgin_reserved2)(void);
--- a/pidgin/plugins/contact_priority.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/pidgin/plugins/contact_priority.c	Wed Oct 23 22:07:58 2013 +0200
@@ -165,7 +165,6 @@
 static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
-	0, /* page_num (Reserved) */
 	/* Padding */
 	NULL,
 	NULL,
--- a/pidgin/plugins/convcolors.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/pidgin/plugins/convcolors.c	Wed Oct 23 22:07:58 2013 +0200
@@ -386,7 +386,6 @@
 static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
-	0,
 
 	/* padding */
 	NULL,
--- a/pidgin/plugins/extplacement.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/pidgin/plugins/extplacement.c	Wed Oct 23 22:07:58 2013 +0200
@@ -122,8 +122,6 @@
 
 static PurplePluginUiInfo prefs_info = {
 	get_plugin_pref_frame,
-	0,   /* page_num (Reserved) */
-	NULL, /* frame (Reserved) */
 
 	/* padding */
 	NULL,
--- a/pidgin/plugins/gestures/gestures.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/pidgin/plugins/gestures/gestures.c	Wed Oct 23 22:07:58 2013 +0200
@@ -259,7 +259,6 @@
 static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
-	0, /* page_num (Reserved) */
 
 	/* padding */
 	NULL,
--- a/pidgin/plugins/markerline.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/pidgin/plugins/markerline.c	Wed Oct 23 22:07:58 2013 +0200
@@ -219,8 +219,6 @@
 
 static PurplePluginUiInfo prefs_info = {
 	get_plugin_pref_frame,
-	0,
-	NULL,
 
 	/* padding */
 	NULL,
--- a/pidgin/plugins/musicmessaging/musicmessaging.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/pidgin/plugins/musicmessaging/musicmessaging.c	Wed Oct 23 22:07:58 2013 +0200
@@ -665,7 +665,6 @@
 static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
-	0, /* page_num (reserved) */
 
 	/* padding */
 	NULL,
--- a/pidgin/plugins/notify.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/pidgin/plugins/notify.c	Wed Oct 23 22:07:58 2013 +0200
@@ -893,7 +893,6 @@
 static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
-	0, /* page_num (Reserved) */
 
 	/* padding */
 	NULL,
--- a/pidgin/plugins/pidginrc.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/pidgin/plugins/pidginrc.c	Wed Oct 23 22:07:58 2013 +0200
@@ -600,7 +600,6 @@
 static PidginPluginUiInfo purplerc_ui_info =
 {
 	purplerc_get_config_frame,
-	0, /* page_num (Reserved) */
 
 	/* padding */
 	NULL,
--- a/pidgin/plugins/spellchk.c	Wed Oct 23 21:00:07 2013 +0200
+++ b/pidgin/plugins/spellchk.c	Wed Oct 23 22:07:58 2013 +0200
@@ -2319,7 +2319,6 @@
 static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
-	0, /* page_num (Reserved) */
 
 	/* padding */
 	NULL,

Mercurial Repository: pidgin3

mercurial