From eb3598e7e27619c759ef33bb9ec4ffb8898523de Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Fri, 20 Sep 2013 00:45:16 -0400
Subject: Refactor status-bar text for multiple items, was very broken

Fixed bugs:
  - https://launchpad.net/bugs/1199192

(bzr r12550)
---
 src/sp-image.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/sp-image.cpp')

diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index 80daf33c3..c3352fcf0 100644
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -613,6 +613,10 @@ void SPImage::print(SPPrintContext *ctx) {
     }
 }
 
+const char* SPImage::display_name() {
+    return _("Image");
+}
+
 gchar* SPImage::description() {
     char *href_desc;
 
@@ -626,8 +630,8 @@ gchar* SPImage::description() {
     }
 
     char *ret = ( this->pixbuf == NULL
-                  ? g_strdup_printf(_("<b>Image with bad reference</b>: %s"), href_desc)
-                  : g_strdup_printf(_("<b>Image</b> %d &#215; %d: %s"),
+                  ? g_strdup_printf(_("[bad reference]: %s"), href_desc)
+                  : g_strdup_printf(_("%d &#215; %d: %s"),
                                     this->pixbuf->width(),
                                     this->pixbuf->height(),
                                     href_desc) );
-- 
cgit v1.2.3


From 4768c87314c3de876a7bffa4006cd43aa57dac74 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Sat, 21 Sep 2013 13:02:20 +0100
Subject: Drop unused static function declarations

(bzr r12565)
---
 src/sp-image.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/sp-image.cpp')

diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index c3352fcf0..38c749dd3 100644
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -78,9 +78,6 @@ static void sp_image_set_curve(SPImage *image);
 static Inkscape::Pixbuf *sp_image_repr_read_image(gchar const *href, gchar const *absref, gchar const *base );
 static void sp_image_update_arenaitem (SPImage *img, Inkscape::DrawingImage *ai);
 static void sp_image_update_canvas_image (SPImage *image);
-static GdkPixbuf * sp_image_repr_read_dataURI (const gchar * uri_data);
-static GdkPixbuf * sp_image_repr_read_b64 (const gchar * uri_data);
-static void pixbuf_set_mime_data(GdkPixbuf *pb, guchar *data, gsize len, GdkPixbufFormat *fmt);
 
 #ifdef DEBUG_LCMS
 extern guint update_in_progress;
-- 
cgit v1.2.3


From 6f65ca557f8ad953b55b9a703643bbc790eb8da5 Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Tue, 24 Sep 2013 11:09:43 -0400
Subject: change names for displayName and detailedDescription, improve char
 code and remove const.

(bzr r12584)
---
 src/sp-image.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/sp-image.cpp')

diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index 38c749dd3..05dfb5f48 100644
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -610,7 +610,7 @@ void SPImage::print(SPPrintContext *ctx) {
     }
 }
 
-const char* SPImage::display_name() {
+const char* SPImage::displayName() {
     return _("Image");
 }
 
-- 
cgit v1.2.3