Merge lp:~ballogy/gloobus-preview/drop-icns into lp:gloobus-preview

[Balló György]

Remove icns plugin

It's replaced by the imagemagick plugin, which supports much more image formats.

=== modified file 'configure.ac'
--- configure.ac	2014-12-25 16:27:26 +0000
+++ configure.ac	2014-12-26 04:39:04 +0000
@@ -81,7 +81,6 @@
     src/plugin-folder/Makefile
     src/plugin-compressed/Makefile
     src/plugin-djvu/Makefile
-    src/plugin-icns/Makefile
     src/plugin-gstreamer-audio/Makefile
     src/plugin-gstreamer-video/Makefile
     src/plugin-pdf/Makefile
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2014-12-25 16:27:26 +0000
+++ src/Makefile.am	2014-12-26 04:39:04 +0000
@@ -6,7 +6,6 @@
     plugin-folder \
     plugin-compressed \
     plugin-djvu \
-    plugin-icns \
     plugin-gstreamer-audio \
     plugin-gstreamer-video \
     plugin-pdf \
 
=== modified file 'src/gloobus-preview-plugin-manager.cpp'
--- src/gloobus-preview-plugin-manager.cpp	2014-12-25 16:21:13 +0000
+++ src/gloobus-preview-plugin-manager.cpp	2014-12-26 04:39:04 +0000
@@ -100,7 +100,6 @@
 #include "plugin-folder/plugin-folder.h"
 #include "plugin-gstreamer-audio/plugin-gstreamer-audio.h"
 #include "plugin-gstreamer-video/plugin-gstreamer-video.h"
-#include "plugin-icns/plugin-icns.h"
 #include "plugin-pdf/office-plugin.h"
 #include "plugin-pdf/pdf-plugin.h"
 #include "plugin-pixbuf/plugin-pixbuf.h"
 
=== removed directory 'src/plugin-icns'
=== removed file 'src/plugin-icns/Makefile.am'
--- src/plugin-icns/Makefile.am	2010-01-24 20:25:39 +0000
+++ src/plugin-icns/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-plugindir = $(prefix)/lib/gloobus/
-
-AM_CPPFLAGS += $(GTK_CFLAGS) 
-AM_LDFLAGS = $(GTK_LIBS) 
-
-plugin_LTLIBRARIES = icns.la 
-icns_la_SOURCES = plugin-icns.cpp 
-icns_la_LDFLAGS = -module -export-dynamic $(AM_LDFLAGS)
-
-noinst_HEADERS = plugin-icns.h
 
=== removed file 'src/plugin-icns/plugin-icns.cpp'
--- src/plugin-icns/plugin-icns.cpp	2010-05-11 20:20:59 +0000
+++ src/plugin-icns/plugin-icns.cpp	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-#include "plugin-icns.h"
-
-
-GdkPixbuf * iIcons::get_pixbuf ()
-{
-	GdkPixbuf * temp;
-	string final_name;
-	
-	temp = load_icns	 ("512","32");
-	if(temp == NULL)
-		temp = load_icns ("256","32");
-	if(temp == NULL)
-		temp = load_icns ("128","32");
-	
-	/*if (temp == NULL)
-	{
-		final_name = "/tmp/_128x128x32.png";
-		g_print("PLUGIN:Filename to load: %s\n", final_name.c_str());	
-		temp = gdk_pixbuf_new_from_file(final_name.c_str(),NULL);
-	}*/
-	
-
-	if(temp == NULL)
-	{
-		return ui->get_file_icon(m_file_info, 200);
-	}
-	else
-	{
-
-		return temp;
-	}
-
-};
-
-// ==================== LOAD ICNS ======================= //
-GdkPixbuf* iIcons::	load_icns	(string size, string depth)
-{
-	GdkPixbuf * temp;
-	string final_name;
-	//FIXME: Take care of the spaces and change them for "\ "
-	string cmd = "icns2png -x -s " + size +" -d "+ depth + " -o /tmp/ " + replace_spaces(m_filename);
-	g_debug("PLUGIN: Loading icon (%s)",m_filename.c_str());
-	g_debug("PLUGIN: %s",cmd.c_str());
-
-	//Launch icns2png
-	g_spawn_command_line_sync (cmd.c_str(), NULL, NULL, NULL, NULL);
-	
-	//Get the created file
-	int last_slash = m_filename.rfind("/");
-	int last_dot =   m_filename.rfind(".");
-	
-	//g_print("PLUGIN SLASH:%i DOT:%i\n",last_slash, last_dot);
-
-	final_name = "/tmp"+ m_filename.substr(last_slash, last_dot - last_slash ) +"_"+size+"x"+size+"x"+depth+".png";
-	g_debug("PLUGIN:Filename to load: %s", final_name.c_str());
-	temp = gdk_pixbuf_new_from_file(final_name.c_str(),NULL);
-	if(temp != NULL)
-	{
-		string cmd = "rm \"" + final_name + "\"";
-		g_spawn_command_line_sync (cmd.c_str(), NULL, NULL, NULL, NULL);
-	}
-	
-	return temp;
-}
-
-// ==================== REPLACE SPACES ======================= //
-string iIcons::replace_spaces	(string str)
-{
-	int pos = -2;
-	while(str.find(" ",pos+2) != string::npos)
-	{
-		pos = str.find(" ",pos+2);
-		str = str.replace(pos,1,"\\ ");
-		g_debug("PLUGIN STR: %s",str.c_str());
-	}
-	return str;
-	
-	/*pos = str.find(" ",0);
-	if(pos != string::npos)
-	{
-		str = str.replace(pos,1,"\\ ");
-	}*/
-	return str;
-}
 
=== removed file 'src/plugin-icns/plugin-icns.h'
--- src/plugin-icns/plugin-icns.h	2010-05-13 18:56:37 +0000
+++ src/plugin-icns/plugin-icns.h	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-#ifndef _IICNS_
-#define _IICNS_
-
-#ifndef PLUGIN_LOADER
-
-// Pixbuf can load icns, we do not need this anymore !
-
-//#include "../gloobus-preview-plugin-manager.h"
-#include "../gloobus-preview-interface-image.h"
-
-class iIcons : public iImage
-{
-	public:
-	virtual		GdkPixbuf*		get_pixbuf  ();
-				string			replace_spaces	(string str);
-				GdkPixbuf*		load_icns		(string size, string depth);
-};
-
-extern "C" interface * create() {
-    return new iIcons;
-}
-
-extern "C" void destroy(interface * p) {
-    delete (iIcons*)p;
-}
-
-extern "C" int getVersion() {
-	return MANAGER_VERSION;
-}
-
-#endif
-
-#ifdef PLUGIN_LOADER
-/*
-PluginManager::register_plugin("icns");
-
-if(interface::is_program_available("icns2png")) {
-	PluginManager::register_filetype("image/x-icns", 1);
-}
-*/
-#endif
-
-#endif
-