added fix from Dale Harvey to expand incomplete JIDs specified in user

[inkscape.git] / src / sp-image.cpp

diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index 86998156720ec511c979cf1196e719436ee78c0b..17f969b537c6f9d8229a76f719d7de910b6a5c1d 100644 (file)
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -118,7 +118,7 @@ public:
                     //g_message( " __read %d bytes", (int)got );
                     if ( !gdk_pixbuf_loader_write( loader, scratch + used, got, &err ) )
                     {
-                        //g_message("_error writing pixbuf data"); 
+                        //g_message("_error writing pixbuf data");
                     }
                 }
 
@@ -306,7 +306,7 @@ GdkPixbuf*  pixbuf_new_from_file( const char *filename, GError **error )
                                         "unknown", // PNG_SCALE_UNKNOWN
                                         "meter", // PNG_SCALE_METER
                                         "radian", // PNG_SCALE_RADIAN
-                                        "last", // 
+                                        "last", //
                                         NULL
                                     };
 
@@ -382,7 +382,7 @@ GdkPixbuf*  pixbuf_new_from_file( const char *filename, GError **error )
     }
     else
     {
-        g_warning ("unable to open file: %s", filename);
+        g_warning ("Unable to open linked file: %s", filename);
     }
 
 /*
@@ -729,7 +729,7 @@ sp_image_update (SPObject *object, SPCtx *ctx, unsigned int flags)
                                }
                        }
        }
-       
+
        sp_image_update_canvas_image ((SPImage *) object);
 }
 
@@ -788,13 +788,13 @@ sp_image_print (SPItem *item, SPPrintContext *ctx)
 
        if (!image->pixbuf) return;
        if ((image->width.computed <= 0.0) || (image->height.computed <= 0.0)) return;
-       
+
        px = gdk_pixbuf_get_pixels (image->pixbuf);
        w = gdk_pixbuf_get_width (image->pixbuf);
        h = gdk_pixbuf_get_height (image->pixbuf);
        rs = gdk_pixbuf_get_rowstride (image->pixbuf);
        pixskip = gdk_pixbuf_get_n_channels (image->pixbuf) * gdk_pixbuf_get_bits_per_sample (image->pixbuf) / 8;
-       
+
        if (image->aspect_align == SP_ASPECT_NONE) {
                /* fixme: (Lauris) */
                nr_matrix_set_translate (&tp, image->x.computed, image->y.computed);
@@ -821,13 +821,13 @@ sp_image_description(SPItem *item)
        SPImage *image = SP_IMAGE(item);
        char *href_desc;
         if (image->href) {
-            href_desc = (strncmp(image->href, "data:", 5) == 0) 
+            href_desc = (strncmp(image->href, "data:", 5) == 0)
                 ? g_strdup(_("embedded"))
                 : xml_quote_strdup(image->href);
         } else {
             g_warning("Attempting to call strncmp() with a null pointer.");
             href_desc = g_strdup(_("(null_pointer)")); // we call g_free() on href_desc
-        }                
+        }
 
        char *ret = ( image->pixbuf == NULL
                      ? g_strdup_printf(_("<b>Image with bad reference</b>: %s"), href_desc)