[gnumeric] Namespace.

[Morten Welinder <mortenw src gnome org>]

commit c960000e43846b91412cc6a3b0bfd1080dd4f2ad
Author: Morten Welinder <terra gnome org>
Date:   Sat Feb 28 16:38:57 2015 -0500

    Namespace.

 plugins/excel/ms-excel-write.c        |    4 ++--
 plugins/excel/xlsx-read-drawing.c     |    2 +-
 plugins/excel/xlsx-write.c            |    2 +-
 plugins/openoffice/openoffice-write.c |    2 +-
 src/sheet-object-image.c              |    6 +++---
 src/sheet-object-image.h              |    2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/plugins/excel/ms-excel-write.c b/plugins/excel/ms-excel-write.c
index 53a0510..1c2650a 100644
--- a/plugins/excel/ms-excel-write.c
+++ b/plugins/excel/ms-excel-write.c
@@ -4681,7 +4681,7 @@ excel_write_other_v8 (ExcelWriteSheet *esheet,
                shape = 0xc9;
                type = MSOT_COMBO;
                flags = 0x2011;
-       } else if (IS_SHEET_OBJECT_IMAGE (so)) {
+       } else if (GNM_IS_SO_IMAGE (so)) {
                shape = 0x4b;
                type = MSOT_PICTURE;
                flags = 0x6011;
@@ -5805,7 +5805,7 @@ excel_sheet_new (ExcelWriteState *ewb, Sheet *sheet,
                        esheet->objects =
                                g_slist_prepend (esheet->objects, so);
                        handled = TRUE;
-               } else if (IS_SHEET_OBJECT_IMAGE (so)) {
+               } else if (GNM_IS_SO_IMAGE (so)) {
                        SheetObjectImage *soi = SHEET_OBJECT_IMAGE (l->data);
                        BlipInf *bi = blipinf_new (soi);
 
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index 318a82c..08a7477 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -3041,7 +3041,7 @@ static void
 xlsx_blip_start (GsfXMLIn *xin, xmlChar const **attrs)
 {
        XLSXReadState *state = (XLSXReadState *)xin->user_state;
-       g_return_if_fail (IS_SHEET_OBJECT_IMAGE (state->so));
+       g_return_if_fail (GNM_IS_SO_IMAGE (state->so));
        for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
                if (!strcmp (attrs[0], "r:embed")) {
                        GsfOpenPkgRel const *rel = gsf_open_pkg_lookup_rel_by_id (
diff --git a/plugins/excel/xlsx-write.c b/plugins/excel/xlsx-write.c
index 0ef673f..410aa11 100644
--- a/plugins/excel/xlsx-write.c
+++ b/plugins/excel/xlsx-write.c
@@ -2766,7 +2766,7 @@ xlsx_write_sheet (XLSXWriteState *state, GsfOutfile *wb_part, Sheet *sheet)
                else if (IS_SHEET_OBJECT_GRAPH (so) ||
                         IS_GNM_SO_LINE (so) ||
                         IS_GNM_SO_FILLED (so) ||
-                        IS_SHEET_OBJECT_IMAGE (so))
+                        GNM_IS_SO_IMAGE (so))
                        drawing_objs = g_slist_prepend (drawing_objs, so);
                else if (GNM_IS_SOW_SCROLLBAR (so) || GNM_IS_SOW_SLIDER (so) ||
                         GNM_IS_SOW_SPINBUTTON (so) ||
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 5edbea9..559c45a 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -3039,7 +3039,7 @@ odf_write_frame (GnmOOExport *state, SheetObject *so)
 {
        if (IS_SHEET_OBJECT_GRAPH (so))
                odf_write_graph (state, so, g_hash_table_lookup (state->graphs, so));
-       else if (IS_SHEET_OBJECT_IMAGE (so)) {
+       else if (GNM_IS_SO_IMAGE (so)) {
                gsf_xml_out_start_element (state->xml, DRAW "frame");
                odf_write_frame_size (state, so);
                odf_write_image (state, so, g_hash_table_lookup (state->images, so));
diff --git a/src/sheet-object-image.c b/src/sheet-object-image.c
index 12f0b13..ba9d237 100644
--- a/src/sheet-object-image.c
+++ b/src/sheet-object-image.c
@@ -139,7 +139,7 @@ sheet_object_image_set_image (SheetObjectImage *soi,
                              unsigned      data_len,
                              gboolean      copy_data)
 {
-       g_return_if_fail (IS_SHEET_OBJECT_IMAGE (soi));
+       g_return_if_fail (GNM_IS_SO_IMAGE (soi));
 
        g_free (soi->type);
        soi->type = (type && *type) ? g_strdup (type) : NULL;
@@ -166,7 +166,7 @@ sheet_object_image_set_crop (SheetObjectImage *soi,
                             double crop_left,  double crop_top,
                             double crop_right, double crop_bottom)
 {
-       g_return_if_fail (IS_SHEET_OBJECT_IMAGE (soi));
+       g_return_if_fail (GNM_IS_SO_IMAGE (soi));
 
        soi->crop_left   = crop_left;
        soi->crop_top    = crop_top;
@@ -413,7 +413,7 @@ gnm_soi_write_xml_sax (SheetObject const *so, GsfXMLOut *output,
 {
        SheetObjectImage *soi;
 
-       g_return_if_fail (IS_SHEET_OBJECT_IMAGE (so));
+       g_return_if_fail (GNM_IS_SO_IMAGE (so));
        soi = SHEET_OBJECT_IMAGE (so);
 
        gsf_xml_out_add_float (output, "crop-top", soi->crop_top, 3);
diff --git a/src/sheet-object-image.h b/src/sheet-object-image.h
index 53a1a72..67c94d9 100644
--- a/src/sheet-object-image.h
+++ b/src/sheet-object-image.h
@@ -8,7 +8,7 @@ G_BEGIN_DECLS
 
 #define SHEET_OBJECT_IMAGE_TYPE  (sheet_object_image_get_type ())
 #define SHEET_OBJECT_IMAGE(o)   (G_TYPE_CHECK_INSTANCE_CAST((o), SHEET_OBJECT_IMAGE_TYPE, SheetObjectImage))
-#define IS_SHEET_OBJECT_IMAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SHEET_OBJECT_IMAGE_TYPE))
+#define GNM_IS_SO_IMAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SHEET_OBJECT_IMAGE_TYPE))
 
 typedef struct _SheetObjectImage SheetObjectImage;