Merged in default (pull request #465)

Fri, 08 Feb 2019 03:10:23 +0000

author
Gary Kramlich <grim@reaperworld.com>
date
Fri, 08 Feb 2019 03:10:23 +0000
changeset 39429
6c109ae83abf
parent 39424
793f7d43e2f0 (diff)
parent 39428
ef00e03ece89 (current diff)
child 39436
026ac0b3708f

Merged in default (pull request #465)

Flip dependencies to use fallbacks

Approved-by: Gary Kramlich

--- a/finch/gntmedia.c	Thu Feb 07 05:35:50 2019 -0500
+++ b/finch/gntmedia.c	Fri Feb 08 03:10:23 2019 +0000
@@ -289,8 +289,7 @@
 		{
 			if (media->priv->media)
 				g_object_unref(media->priv->media);
-			media->priv->media = g_value_get_object(value);
-			g_object_ref(media->priv->media);
+			media->priv->media = g_value_dup_object(value);
 			g_signal_connect_swapped(G_OBJECT(media->priv->accept), "activate",
 				 G_CALLBACK(finch_media_accept_cb), media->priv->media);
 			g_signal_connect_swapped(G_OBJECT(media->priv->reject), "activate",
--- a/libpurple/account.c	Thu Feb 07 05:35:50 2019 -0500
+++ b/libpurple/account.c	Fri Feb 08 03:10:23 2019 +0000
@@ -2469,7 +2469,7 @@
 		const char *default_string_value = g_value_get_string(default_value);
 		if (purple_strequal(string_value, default_string_value))
 			return NULL;
-		value = g_strdup(g_value_get_string(attr_value));
+		value = g_value_dup_string(attr_value);
 	}
 	else if (attr_type == G_TYPE_INT)
 	{
--- a/libpurple/connection.c	Thu Feb 07 05:35:50 2019 -0500
+++ b/libpurple/connection.c	Fri Feb 08 03:10:23 2019 +0000
@@ -734,7 +734,7 @@
 			break;
 		case PROP_PASSWORD:
 			g_free(priv->password);
-			priv->password = g_strdup(g_value_get_string(value));
+			priv->password = g_value_dup_string(value);
 			break;
 		case PROP_DISPLAY_NAME:
 			purple_connection_set_display_name(gc, g_value_get_string(value));
--- a/libpurple/conversation.c	Thu Feb 07 05:35:50 2019 -0500
+++ b/libpurple/conversation.c	Fri Feb 08 03:10:23 2019 +0000
@@ -938,11 +938,11 @@
 			break;
 		case PROP_NAME:
 			g_free(priv->name);
-			priv->name = g_strdup(g_value_get_string(value));
+			priv->name = g_value_dup_string(value);
 			break;
 		case PROP_TITLE:
 			g_free(priv->title);
-			priv->title = g_strdup(g_value_get_string(value));
+			priv->title = g_value_dup_string(value);
 			break;
 		case PROP_LOGGING:
 			purple_conversation_set_logging(conv, g_value_get_boolean(value));
--- a/libpurple/conversationtypes.c	Thu Feb 07 05:35:50 2019 -0500
+++ b/libpurple/conversationtypes.c	Fri Feb 08 03:10:23 2019 +0000
@@ -1743,11 +1743,11 @@
 			break;
 		case CU_PROP_NAME:
 			g_free(priv->name);
-			priv->name = g_strdup(g_value_get_string(value));
+			priv->name = g_value_dup_string(value);
 			break;
 		case CU_PROP_ALIAS:
 			g_free(priv->alias);
-			priv->alias = g_strdup(g_value_get_string(value));
+			priv->alias = g_value_dup_string(value);
 			break;
 		case CU_PROP_FLAGS:
 			priv->flags = g_value_get_flags(value);
--- a/libpurple/message.c	Thu Feb 07 05:35:50 2019 -0500
+++ b/libpurple/message.c	Fri Feb 08 03:10:23 2019 +0000
@@ -304,19 +304,19 @@
 	switch (par_id) {
 		case PROP_AUTHOR:
 			g_free(priv->author);
-			priv->author = g_strdup(g_value_get_string(value));
+			priv->author = g_value_dup_string(value);
 			break;
 		case PROP_AUTHOR_ALIAS:
 			g_free(priv->author_alias);
-			priv->author_alias = g_strdup(g_value_get_string(value));
+			priv->author_alias = g_value_dup_string(value);
 			break;
 		case PROP_RECIPIENT:
 			g_free(priv->recipient);
-			priv->recipient = g_strdup(g_value_get_string(value));
+			priv->recipient = g_value_dup_string(value);
 			break;
 		case PROP_CONTENTS:
 			g_free(priv->contents);
-			priv->contents = g_strdup(g_value_get_string(value));
+			priv->contents = g_value_dup_string(value);
 			break;
 		case PROP_TIME:
 			priv->msgtime = g_value_get_uint64(value);
--- a/libpurple/plugins.c	Thu Feb 07 05:35:50 2019 -0500
+++ b/libpurple/plugins.c	Fri Feb 08 03:10:23 2019 +0000
@@ -334,7 +334,7 @@
 
 	switch (param_id) {
 		case PROP_UI_REQUIREMENT:
-			priv->ui_requirement = g_strdup(g_value_get_string(value));
+			priv->ui_requirement = g_value_dup_string(value);
 			break;
 		case PROP_ACTIONS_CB:
 			priv->actions_cb = g_value_get_pointer(value);
--- a/libpurple/whiteboard.c	Thu Feb 07 05:35:50 2019 -0500
+++ b/libpurple/whiteboard.c	Fri Feb 08 03:10:23 2019 +0000
@@ -381,7 +381,7 @@
 			priv->account = g_value_get_object(value);
 			break;
 		case PROP_WHO:
-			priv->who = g_strdup(g_value_get_string(value));
+			priv->who = g_value_dup_string(value);
 			break;
 		case PROP_DRAW_LIST:
 			purple_whiteboard_set_draw_list(wb, g_value_get_pointer(value));
--- a/pidgin/gtkmedia.c	Thu Feb 07 05:35:50 2019 -0500
+++ b/pidgin/gtkmedia.c	Fri Feb 08 03:10:23 2019 +0000
@@ -1098,8 +1098,7 @@
 		{
 			if (media->priv->media)
 				g_object_unref(media->priv->media);
-			media->priv->media = g_value_get_object(value);
-			g_object_ref(media->priv->media);
+			media->priv->media = g_value_dup_object(value);
 
 			if (purple_media_is_initiator(media->priv->media,
 					 NULL, NULL) == TRUE)

mercurial