/soc/2013/bhaskar/plugins-window: 0581dc4b5b9a: Don't create an ...

[Bhaskar Kandiyal]

Changeset: 0581dc4b5b9af7b0b77184ad44fd8f7f4427988a
Author:	 Bhaskar Kandiyal <bkandiyal at gmail.com>
Date:	 2013-09-14 18:56 +0530
Branch:	 soc.2013.plugins_window
URL: https://hg.pidgin.im/soc/2013/bhaskar/plugins-window/rev/0581dc4b5b9a

Description:

Don't create an initial folder when installing zipped themes or plugins

diffstat:

 pidgin/gtkplugin-updater.h |  3 +--
 pidgin/gtkplugin.c         |  6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (43 lines):

diff --git a/pidgin/gtkplugin-updater.h b/pidgin/gtkplugin-updater.h
--- a/pidgin/gtkplugin-updater.h
+++ b/pidgin/gtkplugin-updater.h
@@ -30,7 +30,7 @@
 #include <glib.h>
 
 static const gchar* PIDGIN_PLUGIN_WEBSITE_URI = "http://bhaskar-kandiyal.rhcloud.com";
-/*static const gchar* PIDGIN_PLUGIN_WEBSITE_URI = "http://127.0.0.1:8000"; */ /* For local debugging only */
+/* static const gchar* PIDGIN_PLUGIN_WEBSITE_URI = "http://127.0.0.1:8000"; */ /* For local debugging only */
 
 typedef enum
 {
@@ -63,7 +63,6 @@ gboolean pidgin_plugin_updater_check_for
 /**
  * Installs pending updates
  */
-
 void pidgin_plugin_updater_install_pending_updates();
 
 G_END_DECLS
diff --git a/pidgin/gtkplugin.c b/pidgin/gtkplugin.c
--- a/pidgin/gtkplugin.c
+++ b/pidgin/gtkplugin.c
@@ -786,7 +786,9 @@ webview_download_status(gpointer data)
 		/* If it's a zip file then extract it to the appropriate folder */
 		if(g_str_has_suffix(filename, ".zip"))
 		{
-			id = g_utf8_strrchr(filename, -1, '.');
+			path = g_build_filename(purple_user_dir(), type, NULL);
+
+			/*id = g_utf8_strrchr(filename, -1, '.');
 			if(id == NULL)
 			{
 				path = g_build_filename(purple_user_dir(), type, filename, NULL);
@@ -799,7 +801,7 @@ webview_download_status(gpointer data)
 				purple_debug_info("plugins", "ID: %s, Extracting file to: %s\n", id, path);
 				g_mkdir_with_parents(path, 0755);
 				g_free(id);
-			}
+			}*/
 
 			plugin_file = g_filename_from_uri(webkit_download_get_destination_uri(download), NULL, NULL);
 			purple_debug_info("plugins", "Download saved at: %s\n", plugin_file);