Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/silc/silc.c	Sun Sep 01 00:58:23 2013 +0530
+++ b/libpurple/protocols/silc/silc.c	Sun Sep 01 01:40:21 2013 +0530
@@ -2213,12 +2213,9 @@
 static gboolean
 plugin_load(PurplePlugin *plugin, GError **error)
 {
-	my_protocol = purple_protocols_add(SILCPURPLE_TYPE_PROTOCOL);
-
-	if (!my_protocol) {
-		g_set_error(error, SILCPURPLE_DOMAIN, 0, _("Failed to add silc protocol"));
+	my_protocol = purple_protocols_add(SILCPURPLE_TYPE_PROTOCOL, error);
+	if (!my_protocol)
 		return FALSE;
-	}
 
 	return TRUE;
 }
@@ -2226,10 +2223,8 @@
 static gboolean
 plugin_unload(PurplePlugin *plugin, GError **error)
 {
-	if (!purple_protocols_remove(my_protocol)) {
-		g_set_error(error, SILCPURPLE_DOMAIN, 0, _("Failed to remove silc protocol"));
+	if (!purple_protocols_remove(my_protocol, error))
 		return FALSE;
-	}
 
 	return TRUE;
 }