/soc/2013/ankitkv/gobjectification: 35b1e42281e5: Removed loadab...

[Ankit Vani]

Changeset: 35b1e42281e5e7d5e1dde1f325e74d6f332cf9ac
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-08-11 20:24 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/35b1e42281e5

Description:

Removed loadable field from plugin info dialog, and added license

diffstat:

 pidgin/gtkconv-theme-loader.c |   1 +
 pidgin/gtkconv.c              |   1 +
 pidgin/gtkdialogs.c           |  19 +++++++++++--------
 3 files changed, 13 insertions(+), 8 deletions(-)

diffs (70 lines):

diff --git a/pidgin/gtkconv-theme-loader.c b/pidgin/gtkconv-theme-loader.c
--- a/pidgin/gtkconv-theme-loader.c
+++ b/pidgin/gtkconv-theme-loader.c
@@ -26,6 +26,7 @@
 
 #include "xmlnode.h"
 #include "debug.h"
+#include "prefs.h"
 
 /*****************************************************************************
  * Conversation Theme Builder
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -43,6 +43,7 @@
 #include "imgstore.h"
 #include "log.h"
 #include "notify.h"
+#include "plugins.h"
 #include "prpl.h"
 #include "request.h"
 #include "theme-loader.h"
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -833,8 +833,8 @@ void pidgin_dialogs_plugins_info(void)
 	PurplePluginInfo *info;
 	char *title = g_strdup_printf(_("%s Plugin Information"), PIDGIN_NAME);
 	char *pname = NULL, *pauthor = NULL;
-	const char *pver, *pwebsite, *pid;
-	gboolean ploaded, ploadable;
+	const char *pver, *plicense, *pwebsite, *pid;
+	gboolean ploaded;
 	static GtkWidget *plugins_info = NULL;
 
 	str = g_string_sized_new(4096);
@@ -851,24 +851,27 @@ void pidgin_dialogs_plugins_info(void)
 		if ((pauthor = (char *)purple_plugin_info_get_author(info)) != NULL)
 			pauthor = g_markup_escape_text(pauthor, -1);
 		pver = purple_plugin_info_get_version(info);
+		plicense = purple_plugin_info_get_license(info);
 		pwebsite = purple_plugin_info_get_website(info);
 		pid = purple_plugin_info_get_id(info);
-		ploadable = purple_plugin_is_loadable(plugin);
 		ploaded = purple_plugin_is_loaded(plugin);
 
 		g_string_append_printf(str,
 				"<dt>%s</dt><dd>"
 				"<b>Author:</b> %s<br/>"
 				"<b>Version:</b> %s<br/>"
+				"<b>License:</b> %s<br/>"
 				"<b>Website:</b> %s<br/>"
 				"<b>ID String:</b> %s<br/>"
-				"<b>Loadable:</b> %s<br/>"
 				"<b>Loaded:</b> %s"
 				"</dd><br/>",
-				pname, pauthor ? pauthor : "(null)",
-				pver, pwebsite, pid,
-				ploadable ? "Yes" : "<span style=\"color: #FF0000;\"><b>No</b></span>",
-				ploaded ? "Yes" : "No");
+				pname,
+				pauthor  ? pauthor  : "(null)",
+				pver     ? pver     : "(null)",
+				plicense ? plicense : "(null)",
+				pwebsite ? pwebsite : "(null)",
+				pid,
+				ploaded  ? "Yes" : "No");
 
 		g_free(pname);
 		g_free(pauthor);