X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-toolbar.c;h=e52506c39dcb26adf8bd8f3be79db104ed04e7d6;hp=b2bae623cc804adfc1699b93128b79348f1b0237;hb=4c17eac51757809148b84e229bede6323aac270a;hpb=4a2c0a363e35c5d1c673aa34ea1fddb28ddde1e5

diff --git a/src/widgets/modest-toolbar.c b/src/widgets/modest-toolbar.c
index b2bae62..e52506c 100644
--- a/src/widgets/modest-toolbar.c
+++ b/src/widgets/modest-toolbar.c
@@ -27,6 +27,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <glib/gi18n.h>
 #include "modest-toolbar.h"
 
 /* 'private'/'protected' functions */
@@ -204,12 +205,13 @@ modest_toolbar_set_buttons (ModestToolbar *self, const GSList *buttons)
 				g_printerr ("modest: error getting data for toolbar button %d\n",
 					    button_id);
 			else {
-				GtkWidget *icon;
-				GtkToolItem *button;
-				GdkPixbuf *pixbuf;
+				GtkWidget *icon = NULL;
+				GtkToolItem *button = NULL;
+				GdkPixbuf *pixbuf = NULL;
 				
 				pixbuf = modest_icon_factory_get_icon_at_size (icon_name, 24, 24);
-				icon   = gtk_image_new_from_pixbuf ((GdkPixbuf*)pixbuf);
+				if (pixbuf)
+					icon   = gtk_image_new_from_pixbuf ((GdkPixbuf*)pixbuf);
 				button = gtk_tool_button_new (icon, label);
 				g_object_set_data (G_OBJECT(button), "button_id",
 						   GINT_TO_POINTER(button_id));