HGKeeper

pidgin/android/libpurple

Change char* to const char* in PurplePluginInfo

2013-04-27, Tomasz Wasilczyk

dc870eacc2d0

Parents eb212da4069d
Children 1046f312d35e

Change char* to const char* in PurplePluginInfo

6 files changed, 89 insertions(+), 40 deletions(-)

+1 -1

libpurple/example/nullclient.c

+1 -1

libpurple/plugin.c

+7 -7

libpurple/plugin.h

+3 -0

libpurple/plugins/perl/perl-common.h

+39 -17

libpurple/plugins/perl/perl.c

+38 -14

libpurple/plugins/tcl/tcl.c

~~--- a/libpurple/example/nullclient.c Mon Apr 22 23:54:33 2013 +0200~~

+++ b/libpurple/example/nullclient.c Sat Apr 27 14:39:33 2013 +0200

@@ -269,7 +269,7 @@

PurplePluginInfo *info = plugin->info;

if (info && info->name) {

printf("\t%d: %s\n", i++, info->name);

~~- names = g_list_append(names, info->id);~~

+ names = g_list_append(names, (gpointer)info->id);

}

printf("Select the protocol [0-%d]: ", i-1);

~~--- a/libpurple/plugin.c Mon Apr 22 23:54:33 2013 +0200~~

+++ b/libpurple/plugin.c Sat Apr 27 14:39:33 2013 +0200

@@ -573,7 +573,7 @@

for (l = dep_list; l != NULL; l = l->next)

{

PurplePlugin *dep_plugin = (PurplePlugin *)l->data;

~~- dep_plugin->dependent_plugins = g_list_prepend(dep_plugin->dependent_plugins, plugin->info->id);~~

+ dep_plugin->dependent_plugins = g_list_prepend(dep_plugin->dependent_plugins, (gpointer)plugin->info->id);

}

g_list_free(dep_list);

~~--- a/libpurple/plugin.h Mon Apr 22 23:54:33 2013 +0200~~

+++ b/libpurple/plugin.h Sat Apr 27 14:39:33 2013 +0200

@@ -86,13 +86,13 @@

GList *dependencies;

PurplePluginPriority priority;

~~- char *id;~~

~~- char *name;~~

~~- char *version;~~

~~- char *summary;~~

~~- char *description;~~

~~- char *author;~~

~~- char *homepage;~~

+ const char *id;

+ const char *name;

+ const char *version;

+ const char *summary;

+ const char *description;

+ const char *author;

+ const char *homepage;

/**

* If a plugin defines a 'load' function, and it returns FALSE,

~~--- a/libpurple/plugins/perl/perl-common.h Mon Apr 22 23:54:33 2013 +0200~~

+++ b/libpurple/plugins/perl/perl-common.h Sat Apr 27 14:39:33 2013 +0200

@@ -35,9 +35,12 @@

#define PURPLE_PERL_BOOT(x) \

purple_perl_callXS(boot_Purple__##x, cv, mark)

+typedef struct _PurplePerlInfoStrings PurplePerlInfoStrings;

typedef struct

{

PurplePlugin *plugin;

+ PurplePerlInfoStrings *info_strings;

char *package;

char *load_sub;

char *unload_sub;

~~--- a/libpurple/plugins/perl/perl.c Mon Apr 22 23:54:33 2013 +0200~~

+++ b/libpurple/plugins/perl/perl.c Sat Apr 27 14:39:33 2013 +0200

@@ -103,6 +103,17 @@

PerlInterpreter *my_perl = NULL;

+struct _PurplePerlInfoStrings

+ char *name;

+ char *id;

+ char *homepage;

+ char *author;

+ char *summary;

+ char *description;

+ char *version;

+};

static PurplePluginUiInfo ui_info =

{

purple_perl_get_plugin_frame,

@@ -123,6 +134,21 @@

};

#endif

+static void perl_infostrings_free(PurplePerlInfoStrings *info_strings)

+ if (info_strings == NULL)

+ return;

+ g_free(info_strings->name);

+ g_free(info_strings->id);

+ g_free(info_strings->homepage);

+ g_free(info_strings->author);

+ g_free(info_strings->summary);

+ g_free(info_strings->description);

+ g_free(info_strings->version);

+ g_free(info_strings);

static void

#ifdef OLD_PERL

xs_init()

@@ -350,6 +376,7 @@

info = g_new0(PurplePluginInfo, 1);

gps = g_new0(PurplePerlScript, 1);

+ gps->info_strings = g_new0(PurplePerlInfoStrings, 1);

info->magic = PURPLE_PLUGIN_MAGIC;

info->major_version = PURPLE_MAJOR_VERSION;

@@ -369,9 +396,9 @@

/* We know this one exists. */

key = hv_fetch(plugin_info, "name", strlen("name"), 0);

~~- info->name = g_strdup(SvPVutf8_nolen(*key));~~

+ info->name = gps->info_strings->name = g_strdup(SvPVutf8_nolen(*key));

/* Set id here in case we don't find one later. */

~~- info->id = g_strdup(info->name);~~

+ info->id = gps->info_strings->id = g_strdup(info->name);

#ifdef PURPLE_GTKPERL

if ((key = hv_fetch(plugin_info, "GTK_UI",

@@ -381,23 +408,23 @@

if ((key = hv_fetch(plugin_info, "url",

strlen("url"), 0)))

~~- info->homepage = g_strdup(SvPVutf8_nolen(*key));~~

+ info->homepage = gps->info_strings->homepage = g_strdup(SvPVutf8_nolen(*key));

if ((key = hv_fetch(plugin_info, "author",

strlen("author"), 0)))

~~- info->author = g_strdup(SvPVutf8_nolen(*key));~~

+ info->author = gps->info_strings->author = g_strdup(SvPVutf8_nolen(*key));

if ((key = hv_fetch(plugin_info, "summary",

strlen("summary"), 0)))

~~- info->summary = g_strdup(SvPVutf8_nolen(*key));~~

+ info->summary = gps->info_strings->summary = g_strdup(SvPVutf8_nolen(*key));

if ((key = hv_fetch(plugin_info, "description",

strlen("description"), 0)))

~~- info->description = g_strdup(SvPVutf8_nolen(*key));~~

+ info->description = gps->info_strings->description = g_strdup(SvPVutf8_nolen(*key));

if ((key = hv_fetch(plugin_info, "version",

strlen("version"), 0)))

~~- info->version = g_strdup(SvPVutf8_nolen(*key));~~

+ info->version = gps->info_strings->version = g_strdup(SvPVutf8_nolen(*key));

/* We know this one exists. */

key = hv_fetch(plugin_info, "load", strlen("load"), 0);

@@ -412,8 +439,8 @@

if ((key = hv_fetch(plugin_info, "id",

strlen("id"), 0))) {

~~- g_free(info->id);~~

~~- info->id = g_strdup_printf("perl-%s",~~

+ g_free(gps->info_strings->id);

+ info->id = gps->info_strings->id = g_strdup_printf("perl-%s",

SvPVutf8_nolen(*key));

}

@@ -600,16 +627,11 @@

if (plugin->info != NULL) {

PurplePerlScript *gps;

~~- g_free(plugin->info->name);~~

~~- g_free(plugin->info->id);~~

~~- g_free(plugin->info->homepage);~~

~~- g_free(plugin->info->author);~~

~~- g_free(plugin->info->summary);~~

~~- g_free(plugin->info->description);~~

~~- g_free(plugin->info->version);~~

gps = (PurplePerlScript *)plugin->info->extra_info;

if (gps != NULL) {

+ perl_infostrings_free(gps->info_strings);

+ gps->info_strings = NULL;

g_free(gps->package);

g_free(gps->load_sub);

g_free(gps->unload_sub);

~~--- a/libpurple/plugins/tcl/tcl.c Mon Apr 22 23:54:33 2013 +0200~~

+++ b/libpurple/plugins/tcl/tcl.c Sat Apr 27 14:39:33 2013 +0200

@@ -50,6 +50,16 @@

Tcl_Interp *interp;

};

+typedef struct {

+ char *id;

+ char *name;

+ char *version;

+ char *summary;

+ char *description;

+ char *author;

+ char *homepage;

+} tcl_plugin_info_strings;

PurpleStringref *PurpleTclRefAccount;

PurpleStringref *PurpleTclRefConnection;

PurpleStringref *PurpleTclRefConversation;

@@ -68,6 +78,21 @@

static gboolean tcl_loaded = FALSE;

+static void tcl_plugin_info_strings_free(tcl_plugin_info_strings *strings)

+ if (strings == NULL)

+ return;

+ g_free(strings->id);

+ g_free(strings->name);

+ g_free(strings->version);

+ g_free(strings->summary);

+ g_free(strings->description);

+ g_free(strings->author);

+ g_free(strings->homepage);

+ g_free(strings);

PurplePlugin *tcl_interp_get_plugin(Tcl_Interp *interp)

{

struct tcl_plugin_data *data;

@@ -219,7 +244,9 @@

result = Tcl_GetObjResult(interp);

if (Tcl_ListObjGetElements(interp, result, &nelems, &listitems) == TCL_OK) {

if ((nelems == 6) || (nelems == 7)) {

+ tcl_plugin_info_strings *strings = g_new0(tcl_plugin_info_strings, 1);

info = g_new0(PurplePluginInfo, 1);

+ info->extra_info = strings;

info->magic = PURPLE_PLUGIN_MAGIC;

info->major_version = PURPLE_MAJOR_VERSION;

@@ -227,17 +254,17 @@

info->type = PURPLE_PLUGIN_STANDARD;

info->dependencies = g_list_append(info->dependencies, "core-tcl");

~~- info->name = g_strdup(Tcl_GetString(listitems[0]));~~

~~- info->version = g_strdup(Tcl_GetString(listitems[1]));~~

~~- info->summary = g_strdup(Tcl_GetString(listitems[2]));~~

~~- info->description = g_strdup(Tcl_GetString(listitems[3]));~~

~~- info->author = g_strdup(Tcl_GetString(listitems[4]));~~

~~- info->homepage = g_strdup(Tcl_GetString(listitems[5]));~~

+ info->name = strings->name = g_strdup(Tcl_GetString(listitems[0]));

+ info->version = strings->version = g_strdup(Tcl_GetString(listitems[1]));

+ info->summary = strings->summary = g_strdup(Tcl_GetString(listitems[2]));

+ info->description = strings->description = g_strdup(Tcl_GetString(listitems[3]));

+ info->author = strings->author = g_strdup(Tcl_GetString(listitems[4]));

+ info->homepage = strings->homepage = g_strdup(Tcl_GetString(listitems[5]));

if (nelems == 6)

~~- info->id = g_strdup_printf("tcl-%s", Tcl_GetString(listitems[0]));~~

+ info->id = strings->id = g_strdup_printf("tcl-%s", Tcl_GetString(listitems[0]));

else if (nelems == 7)

~~- info->id = g_strdup_printf("tcl-%s", Tcl_GetString(listitems[6]));~~

+ info->id = strings->id = g_strdup_printf("tcl-%s", Tcl_GetString(listitems[6]));

plugin->info = info;

@@ -314,12 +341,9 @@

static void tcl_destroy_plugin(PurplePlugin *plugin)

{

if (plugin->info != NULL) {

~~- g_free(plugin->info->id);~~

~~- g_free(plugin->info->name);~~

~~- g_free(plugin->info->version);~~

~~- g_free(plugin->info->description);~~

~~- g_free(plugin->info->author);~~

~~- g_free(plugin->info->homepage);~~

+ tcl_plugin_info_strings *info_strings = plugin->info->extra_info;

+ tcl_plugin_info_strings_free(info_strings);

+ plugin->info->extra_info = NULL;

}

return;