Commit 024a919c authored by Jehan's avatar Jehan

plug-ins: clean out some warnings.

This cleans just a third of the warnings in this metadata plug-in. It is
a very bad practice to define static const strings in a header file like
this, especially if this header is included in several files. Let's make
these macros.

Also why are these header tags sometimes used with the const name (now
macros), sometimes directly with the string literals? I fixed some of
these, but more string literals are lying around.

Remaining warnings are similar, about const string arrays. If really we
want this, we should declare these extern and define them in a separate
implementation file. This whole plug-in should be really reorganized and
cleaned in depth.
parent fdf5c7ed
Pipeline #129147 passed with stages
in 25 minutes and 38 seconds
......@@ -3089,11 +3089,11 @@ metadata_dialog_editor_set_metadata (GExiv2Metadata *metadata,
gint counter;
gint j;
counter = count_tags (metadata, licensor_header,
counter = count_tags (metadata, LICENSOR_HEADER,
licensor,
G_N_ELEMENTS (licensor));
get_tags (metadata, licensor_header,
get_tags (metadata, LICENSOR_HEADER,
licensor,
G_N_ELEMENTS (licensor), counter);
......@@ -3361,11 +3361,11 @@ metadata_dialog_editor_set_metadata (GExiv2Metadata *metadata,
GtkTreeIter iter;
gint counter;
counter = count_tags (metadata, copyrightowner_header,
counter = count_tags (metadata, COPYRIGHTOWNER_HEADER,
copyrightowner,
G_N_ELEMENTS (copyrightowner));
get_tags (metadata, copyrightowner_header,
get_tags (metadata, COPYRIGHTOWNER_HEADER,
copyrightowner,
G_N_ELEMENTS (copyrightowner), counter);
......@@ -3453,11 +3453,11 @@ metadata_dialog_editor_set_metadata (GExiv2Metadata *metadata,
GtkTreeIter iter;
gint counter;
counter = count_tags (metadata, imagecreator_header,
counter = count_tags (metadata, IMAGECREATOR_HEADER,
imagecreator,
G_N_ELEMENTS (imagecreator));
get_tags (metadata, imagecreator_header,
get_tags (metadata, IMAGECREATOR_HEADER,
imagecreator,
G_N_ELEMENTS (imagecreator), counter);
......@@ -3545,11 +3545,11 @@ metadata_dialog_editor_set_metadata (GExiv2Metadata *metadata,
GtkTreeIter iter;
gint counter;
counter = count_tags (metadata, artworkorobject_header,
counter = count_tags (metadata, ARTWORKOROBJECT_HEADER,
artworkorobject,
G_N_ELEMENTS (artworkorobject));
get_tags (metadata, artworkorobject_header,
get_tags (metadata, ARTWORKOROBJECT_HEADER,
artworkorobject,
G_N_ELEMENTS (artworkorobject), counter);
......@@ -3748,11 +3748,11 @@ metadata_dialog_editor_set_metadata (GExiv2Metadata *metadata,
GtkTreeIter iter;
gint counter;
counter = count_tags (metadata, registryid_header,
counter = count_tags (metadata, REGISTRYID_HEADER,
registryid,
G_N_ELEMENTS (registryid));
get_tags (metadata, registryid_header,
get_tags (metadata, REGISTRYID_HEADER,
registryid,
G_N_ELEMENTS (registryid), counter);
......@@ -3840,11 +3840,11 @@ metadata_dialog_editor_set_metadata (GExiv2Metadata *metadata,
GtkTreeIter iter;
gint counter;
counter = count_tags (metadata, locationshown_header,
counter = count_tags (metadata, LOCATIONSHOWN_HEADER,
locationshown,
G_N_ELEMENTS (locationshown));
get_tags (metadata, locationshown_header,
get_tags (metadata, LOCATIONSHOWN_HEADER,
locationshown,
G_N_ELEMENTS (locationshown), counter);
......@@ -4511,7 +4511,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
/* CLEAR LOCATION SHOW DATA */
gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata),
locationshown_header);
LOCATIONSHOWN_HEADER);
output_data[0] = 0;
for (row = 0; row < 256; row++)
......@@ -4521,7 +4521,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
for (item = 0; item < G_N_ELEMENTS (locationshown); item++)
{
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
locationshown_header, row, locationshown[item]);
LOCATIONSHOWN_HEADER, row, locationshown[item]);
gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata), tag);
}
}
......@@ -4543,7 +4543,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
locationshown_header, counter, locationshown[0]);
LOCATIONSHOWN_HEADER, counter, locationshown[0]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4553,7 +4553,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
locationshown_header, counter, locationshown[1]);
LOCATIONSHOWN_HEADER, counter, locationshown[1]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4563,7 +4563,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
locationshown_header, counter, locationshown[2]);
LOCATIONSHOWN_HEADER, counter, locationshown[2]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4573,7 +4573,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
locationshown_header, counter, locationshown[3]);
LOCATIONSHOWN_HEADER, counter, locationshown[3]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4583,7 +4583,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
locationshown_header, counter, locationshown[4]);
LOCATIONSHOWN_HEADER, counter, locationshown[4]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4593,7 +4593,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
locationshown_header, counter, locationshown[5]);
LOCATIONSHOWN_HEADER, counter, locationshown[5]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4613,7 +4613,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
/* CLEAR ARTWORK OR OBJECT DATA */
gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata),
artworkorobject_header);
ARTWORKOROBJECT_HEADER);
output_data[0] = 0;
for (row = 0; row < 256; row++)
......@@ -4623,7 +4623,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
for (item = 0; item < G_N_ELEMENTS (artworkorobject); item++)
{
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
artworkorobject_header, row, artworkorobject[item]);
ARTWORKOROBJECT_HEADER, row, artworkorobject[item]);
gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata), tag);
}
......@@ -4647,7 +4647,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
artworkorobject_header, counter, artworkorobject[0]);
ARTWORKOROBJECT_HEADER, counter, artworkorobject[0]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4657,7 +4657,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
artworkorobject_header, counter, artworkorobject[1]);
ARTWORKOROBJECT_HEADER, counter, artworkorobject[1]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4667,7 +4667,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
artworkorobject_header, counter, artworkorobject[2]);
ARTWORKOROBJECT_HEADER, counter, artworkorobject[2]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4677,7 +4677,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
artworkorobject_header, counter, artworkorobject[3]);
ARTWORKOROBJECT_HEADER, counter, artworkorobject[3]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4687,7 +4687,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
artworkorobject_header, counter, artworkorobject[4]);
ARTWORKOROBJECT_HEADER, counter, artworkorobject[4]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4697,7 +4697,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
artworkorobject_header, counter, artworkorobject[5]);
ARTWORKOROBJECT_HEADER, counter, artworkorobject[5]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4717,7 +4717,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
/* CLEAR REGISTRY ID DATA */
gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata),
registryid_header);
REGISTRYID_HEADER);
output_data[0] = 0;
for (row = 0; row < 256; row++)
......@@ -4727,7 +4727,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
for (item = 0; item < G_N_ELEMENTS (registryid); item++)
{
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
registryid_header, row, registryid[item]);
REGISTRYID_HEADER, row, registryid[item]);
gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata), tag);
}
......@@ -4751,7 +4751,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
registryid_header, counter, registryid[0]);
REGISTRYID_HEADER, counter, registryid[0]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4761,7 +4761,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
registryid_header, counter, registryid[1]);
REGISTRYID_HEADER, counter, registryid[1]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4781,7 +4781,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
/* CLEAR IMAGE CREATOR DATA */
gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata),
imagecreator_header);
IMAGECREATOR_HEADER);
output_data[0] = 0;
for (row = 0; row < 256; row++)
......@@ -4791,7 +4791,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
for (item = 0; item < G_N_ELEMENTS (imagecreator); item++)
{
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
imagecreator_header, row, imagecreator[item]);
IMAGECREATOR_HEADER, row, imagecreator[item]);
gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata), tag);
}
......@@ -4815,7 +4815,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
imagecreator_header, counter, imagecreator[0]);
IMAGECREATOR_HEADER, counter, imagecreator[0]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4825,7 +4825,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
imagecreator_header, counter, imagecreator[1]);
IMAGECREATOR_HEADER, counter, imagecreator[1]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4845,7 +4845,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
/* CLEAR COPYRIGHT OWNER DATA */
gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata),
copyrightowner_header);
COPYRIGHTOWNER_HEADER);
output_data[0] = 0;
for (row = 0; row < 256; row++)
......@@ -4855,7 +4855,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
for (item = 0; item < G_N_ELEMENTS (copyrightowner); item++)
{
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
copyrightowner_header, row, copyrightowner[item]);
COPYRIGHTOWNER_HEADER, row, copyrightowner[item]);
gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata), tag);
}
......@@ -4879,7 +4879,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
copyrightowner_header, counter, copyrightowner[0]);
COPYRIGHTOWNER_HEADER, counter, copyrightowner[0]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4889,7 +4889,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
copyrightowner_header, counter, copyrightowner[1]);
COPYRIGHTOWNER_HEADER, counter, copyrightowner[1]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4909,7 +4909,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
/* CLEAR LICENSOR DATA */
gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata),
licensor_header);
LICENSOR_HEADER);
output_data[0] = 0;
for (row = 0; row < 256; row++)
......@@ -4919,7 +4919,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
for (item = 0; item < G_N_ELEMENTS (licensor); item++)
{
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
licensor_header, row, licensor[item]);
LICENSOR_HEADER, row, licensor[item]);
gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata), tag);
}
......@@ -4946,7 +4946,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
licensor_header, counter, licensor[0]);
LICENSOR_HEADER, counter, licensor[0]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4956,7 +4956,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
licensor_header, counter, licensor[1]);
LICENSOR_HEADER, counter, licensor[1]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4966,7 +4966,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
licensor_header, counter, licensor[2]);
LICENSOR_HEADER, counter, licensor[2]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -4976,7 +4976,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
licensor_header, counter, licensor[3]);
LICENSOR_HEADER, counter, licensor[3]);
strcpy (type1, phone_types[0].data);
......@@ -4999,7 +4999,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
licensor_header, counter, licensor[4]);
LICENSOR_HEADER, counter, licensor[4]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -5009,7 +5009,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
licensor_header, counter, licensor[5]);
LICENSOR_HEADER, counter, licensor[5]);
strcpy (type2, phone_types[0].data);
......@@ -5034,7 +5034,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
licensor_header, counter, licensor[6]);
LICENSOR_HEADER, counter, licensor[6]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......@@ -5044,7 +5044,7 @@ metadata_editor_write_callback (GtkWidget *dialog,
-1);
g_snprintf (tag, sizeof (tag), "%s[%d]%s",
licensor_header, counter, licensor[7]);
LICENSOR_HEADER, counter, licensor[7]);
set_tag_string (g_metadata, tag, tag_data);
g_free (tag_data);
......
......@@ -404,7 +404,7 @@ static const TranslateTag imageSupplierInfoTags[] =
/* Plus and IPTC extension tags */
static const gchar *licensor_header = "Xmp.plus.Licensor";
#define LICENSOR_HEADER "Xmp.plus.Licensor"
static const gchar *licensor[] =
{
"/plus:LicensorName",
......@@ -418,7 +418,7 @@ static const gchar *licensor[] =
};
#ifdef USE_TAGS
static const gchar *imagesupplier_header = "Xmp.plus.ImageSupplier";
#define IMAGESUPPLIER_HEADER "Xmp.plus.ImageSupplier"
static const gchar *imagesupplier[] =
{
"/plus:ImageSupplierName",
......@@ -426,28 +426,28 @@ static const gchar *imagesupplier[] =
};
#endif
static const gchar *imagecreator_header = "Xmp.plus.ImageCreator";
#define IMAGECREATOR_HEADER "Xmp.plus.ImageCreator"
static const gchar *imagecreator[] =
{
"/plus:ImageCreatorName",
"/plus:ImageCreatorID"
};
static const gchar *copyrightowner_header = "Xmp.plus.CopyrightOwner";
#define COPYRIGHTOWNER_HEADER "Xmp.plus.CopyrightOwner"
static const gchar *copyrightowner[] =
{
"/plus:CopyrightOwnerName",
"/plus:CopyrightOwnerID"
};
static const gchar *registryid_header = "Xmp.iptcExt.RegistryId";
#define REGISTRYID_HEADER "Xmp.iptcExt.RegistryId"
static const gchar *registryid[] =
{
"/Iptc4xmpExt:RegOrgId",
"/Iptc4xmpExt:RegItemId"
};
static const gchar *artworkorobject_header = "Xmp.iptcExt.ArtworkOrObject";
#define ARTWORKOROBJECT_HEADER "Xmp.iptcExt.ArtworkOrObject"
static const gchar *artworkorobject[] =
{
"/Iptc4xmpExt:AODateCreated",
......@@ -458,7 +458,7 @@ static const gchar *artworkorobject[] =
"/Iptc4xmpExt:AOCreator"
};
static const gchar *locationshown_header = "Xmp.iptcExt.LocationShown";
#define LOCATIONSHOWN_HEADER "Xmp.iptcExt.LocationShown"
static const gchar *locationshown[] =
{
"/Iptc4xmpExt:Sublocation",
......@@ -470,7 +470,7 @@ static const gchar *locationshown[] =
};
#ifdef USE_TAGS
static const gchar *locationcreated_header = "Xmp.iptcExt.LocationCreated";
#define LOCATIONCREATED_HEADER "Xmp.iptcExt.LocationCreated"
static const gchar *locationcreated[] =
{
"/Iptc4xmpExt:Sublocation",
......@@ -483,4 +483,3 @@ static const gchar *locationcreated[] =
#endif
#endif /* __METADATA_TAGS_H__ */
......@@ -221,7 +221,7 @@ set_tag_ui (metadata_editor *args,
}
}
/* Add new values values */
if (!strcmp ("Xmp.plus.Licensor", name))
if (!strcmp (LICENSOR_HEADER, name))
{
for (row = 1; row < row_count+1; row++)
{
......@@ -264,7 +264,7 @@ set_tag_ui (metadata_editor *args,
}
}
}
else if (!strcmp ("Xmp.plus.ImageCreator", name))
else if (!strcmp (IMAGECREATOR_HEADER, name))
{
for (row = 1; row < row_count+1; row++)
{
......@@ -295,7 +295,7 @@ set_tag_ui (metadata_editor *args,
}
}
}
else if (!strcmp ("Xmp.iptcExt.ArtworkOrObject", name))
else if (!strcmp (ARTWORKOROBJECT_HEADER, name))
{
for (row = 1; row < row_count+1; row++)
{
......@@ -334,7 +334,7 @@ set_tag_ui (metadata_editor *args,
}
}
}
else if (!strcmp ("Xmp.iptcExt.RegistryId", name))
else if (!strcmp (REGISTRYID_HEADER, name))
{
for (row = 1; row < row_count+1; row++)
{
......@@ -365,7 +365,7 @@ set_tag_ui (metadata_editor *args,
}
}
}
else if (!strcmp ("Xmp.plus.CopyrightOwner", name))
else if (!strcmp (COPYRIGHTOWNER_HEADER, name))
{
if (row_count > 0)
{
......@@ -399,7 +399,7 @@ set_tag_ui (metadata_editor *args,
}
}
}
else if (!strcmp ("Xmp.iptcExt.LocationShown", name))
else if (!strcmp (LOCATIONSHOWN_HEADER, name))
{
for (row = 1; row < row_count+1; row++)
{
......@@ -604,7 +604,7 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
{
if (gtk_tree_model_iter_nth_child(treemodel, &iter, NULL, row))
{
if (!strcmp ("Xmp.plus.Licensor", name))
if (!strcmp (LICENSOR_HEADER, name))
{
gtk_tree_model_get (treemodel, &iter,
COL_LICENSOR_NAME, &tagdata[row][0],
......@@ -640,7 +640,7 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
xmldata = g_strconcat (xmldata, "\t\t\t</list-element>\n", NULL);
}
}
else if (!strcmp ("Xmp.plus.CopyrightOwner", name))
else if (!strcmp (COPYRIGHTOWNER_HEADER, name))
{
gtk_tree_model_get (treemodel, &iter,
COL_CR_OWNER_NAME, &tagdata[row][0],
......@@ -662,7 +662,7 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
xmldata = g_strconcat (xmldata, "\t\t\t</list-element>\n", NULL);
}
}
else if (!strcmp ("Xmp.plus.ImageCreator", name))
else if (!strcmp (IMAGECREATOR_HEADER, name))
{
gtk_tree_model_get (treemodel, &iter,
COL_IMG_CR8_NAME, &tagdata[row][0],
......@@ -686,7 +686,7 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
xmldata = g_strconcat (xmldata, "\t\t\t</list-element>\n", NULL);
}
}
else if (!strcmp ("Xmp.iptcExt.ArtworkOrObject", name))
else if (!strcmp (ARTWORKOROBJECT_HEADER, name))
{
gtk_tree_model_get (treemodel, &iter,
COL_AOO_TITLE, &tagdata[row][0],
......@@ -718,7 +718,7 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
xmldata = g_strconcat (xmldata, "\t\t\t</list-element>\n", NULL);
}
}
else if (!strcmp ("Xmp.iptcExt.RegistryId", name))
else if (!strcmp (REGISTRYID_HEADER, name))
{
gtk_tree_model_get (treemodel, &iter,
COL_REGSITRY_ORG_ID, &tagdata[row][0],
......@@ -742,7 +742,7 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
xmldata = g_strconcat (xmldata, "\t\t\t</list-element>\n", NULL);
}
}
else if (!strcmp ("Xmp.iptcExt.LocationShown", name))
else if (!strcmp (LOCATIONSHOWN_HEADER, name))
{
gtk_tree_model_get (treemodel, &iter,
COL_LOC_SHO_SUB_LOC, &tagdata[row][0],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment