Replaced an assertion with a condition soc.2013.gobjectification.plugins

Sat, 10 Aug 2013 07:27:53 +0530

author
Ankit Vani <a@nevitus.org>
date
Sat, 10 Aug 2013 07:27:53 +0530
branch
soc.2013.gobjectification.plugins
changeset 36483
5ecc9c19fd15
parent 36482
fbddfc86848d
child 36484
88133cd05ec3

Replaced an assertion with a condition

libpurple/plugins.c file | annotate | diff | comparison | revisions
--- a/libpurple/plugins.c	Sat Aug 10 04:59:02 2013 +0530
+++ b/libpurple/plugins.c	Sat Aug 10 07:27:53 2013 +0530
@@ -315,9 +315,10 @@
 
 	priv = PURPLE_PLUGIN_INFO_GET_PRIVATE(purple_plugin_get_info(plugin));
 
-	g_return_val_if_fail(priv != NULL, FALSE);
-
-	return priv->loadable;
+	if (priv)
+		return priv->loadable;
+	else
+		return FALSE;
 }
 
 const gchar *
@@ -496,21 +497,21 @@
 
 	g_object_class_install_property(obj_class, PROP_CATEGORY,
 		g_param_spec_string(PROP_CATEGORY_S,
-		                    "Category",
-		                    "The category that the plugin belongs to", NULL,
-		                    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+		                  "Category",
+		                  "The category that the plugin belongs to", NULL,
+		                  G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
 	g_object_class_install_property(obj_class, PROP_UI_REQUIREMENT,
 		g_param_spec_string(PROP_UI_REQUIREMENT_S,
-		                    "UI Requirement",
-		                    "ID of UI that is required by this plugin", NULL,
-		                    G_PARAM_WRITABLE));
+		                  "UI Requirement",
+		                  "ID of UI that is required by this plugin", NULL,
+		                  G_PARAM_WRITABLE));
 
 	g_object_class_install_property(obj_class, PROP_PREFERENCES_FRAME,
 		g_param_spec_pointer(PROP_PREFERENCES_FRAME_S,
-		                     "Preferences frame callback",
-		                     "The callback that returns the preferences frame",
-		                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+		                  "Preferences frame callback",
+		                  "The callback that returns the preferences frame",
+		                  G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 }
 
 /**************************************************************************
@@ -995,11 +996,11 @@
 #endif
 
 	purple_signal_register(handle, "plugin-load",
-						 purple_marshal_VOID__POINTER,
-						 G_TYPE_NONE, 1, PURPLE_TYPE_PLUGIN);
+	                       purple_marshal_VOID__POINTER,
+	                       G_TYPE_NONE, 1, PURPLE_TYPE_PLUGIN);
 	purple_signal_register(handle, "plugin-unload",
-						 purple_marshal_VOID__POINTER,
-						 G_TYPE_NONE, 1, PURPLE_TYPE_PLUGIN);
+	                       purple_marshal_VOID__POINTER,
+	                       G_TYPE_NONE, 1, PURPLE_TYPE_PLUGIN);
 }
 
 void

mercurial