Fixed bug #3519711 in InfoPannel

2012-05-07 Juan A. Moreno <[email protected]> * src/ui/info_pannel.cpp: Bug #3519711 has been corrected. If "gtk-missing-image" was not located in the IconTheme, Gelide can't be started. * ui/icons/gelide-no-image.png: Added as default image for the info pannel.
tapule · May 7, 2012 · 495deb1 · 495deb1
1 parent 7a5ac56
commit 495deb1
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-07  Juan A. Moreno <[email protected]>
+	* src/ui/info_pannel.cpp:
+	Bug #3519711 has been corrected. If "gtk-missing-image" was not located in
+	the IconTheme, Gelide can't be started.
+
+	* ui/icons/gelide-no-image.png:
+	Added as default image for the info pannel.
+
 2012-04-21  Juan A. Moreno <[email protected]>
 	* src/gelide.hpp:
 	Corrected a bug who broke the debug mode.

diff --git a/src/ui/info_pannel.cpp b/src/ui/info_pannel.cpp
@@ -407,7 +407,9 @@ void CInfoPannel::initDescription(void){
 }
 
 void CInfoPannel::initImages(void){
+	Glib::RefPtr<Gtk::IconTheme> l_icon_theme;
 	Gtk::Image* l_i;
+	bool l_continue;
 
 	l_i = Gtk::manage(new Gtk::Image());
 
@@ -419,7 +421,34 @@ void CInfoPannel::initImages(void){
 	m_notebook_images.append_page(m_image_media, _("Media"));
 
 	//m_default = Gdk::Pixbuf::create_from_file(GELIDE_DEFAULT_IMAGE);
-	m_default = Gtk::IconTheme::get_default()->load_icon("gtk-missing-image", 200, Gtk::ICON_LOOKUP_USE_BUILTIN);
+	//m_default = Gtk::IconTheme::get_default()->load_icon("gtk-missing-image", 200, Gtk::ICON_LOOKUP_USE_BUILTIN);
+
+
+	l_icon_theme = Gtk::IconTheme::get_default();
+	l_continue = false;
+	// Comprobamos si se pudo obtener el icontheme
+	if(l_icon_theme){
+		// Intentamos cargar el icono
+		try{
+			m_default = l_icon_theme->load_icon("gtk-missing-image", 200, Gtk::ICON_LOOKUP_USE_BUILTIN);
+			l_continue = true;
+		}
+		catch(...){
+			l_continue = false;
+		}
+	}
+	// Si no se pudo añadir el icono del tema, lo añadimos del fichero
+	if(!l_continue){
+		try
+		{
+			m_default = Gdk::Pixbuf::create_from_file(GELIDE_UI_ICONS "gelide-no-image.png");
+		}
+		catch(const Glib::Exception& l_exception)
+		{
+			GELIDE_WARNING("InfoPannel loading default image (" << l_exception.what().c_str() << ")");
+			return;
+		}
+	}
 
 	m_pixbuf_snapshot = m_default->copy();
 	m_pixbuf_tittle = m_default->copy();

diff --git a/ui/icons/Makefile.am b/ui/icons/Makefile.am
@@ -12,6 +12,7 @@ ui_icons_DATA = \
 	gelide-favorite.png \
 	gelide-horizontal-browser.png \
 	gelide-import-systems.png \
+	gelide-no-image.png \
 	gelide-played.png \
 	gelide-rank.png \
 	gelide-show-browser.png \

diff --git a/ui/icons/gelide-no-image.png b/ui/icons/gelide-no-image.png