diff options
| author | raveit65 <[email protected]> | 2018-08-05 11:58:02 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-08-05 11:58:02 +0200 |
| commit | 22f5b2067bd2c0e820a12da18502b5e7099e984d (patch) | |
| tree | 8ca68d6246b720b740c74c1842101bb2510932ea | |
| parent | 70fd47058ace7814ec7f83243a62254e887f88ab (diff) | |
| download | eom-22f5b2067bd2c0e820a12da18502b5e7099e984d.tar.bz2 eom-22f5b2067bd2c0e820a12da18502b5e7099e984d.tar.xz | |
Fix build without XMP support
https://bugzilla.gnome.org/show_bug.cgi?id=737213
origin commit:
https://gitlab.gnome.org/GNOME/eog/commit/037affa
| -rw-r--r-- | src/eom-image.c | 4 | ||||
| -rw-r--r-- | src/eom-properties-dialog.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/eom-image.c b/src/eom-image.c index 9011138..5db3699 100644 --- a/src/eom-image.c +++ b/src/eom-image.c @@ -2040,14 +2040,14 @@ eom_image_get_exif_info (EomImage *img) gpointer eom_image_get_xmp_info (EomImage *img) { - EomImagePrivate *priv; gpointer data = NULL; g_return_val_if_fail (EOM_IS_IMAGE (img), NULL); +#ifdef HAVE_EXEMPI + EomImagePrivate *priv; priv = img->priv; -#ifdef HAVE_EXEMPI g_mutex_lock (&priv->status_mutex); data = (gpointer) xmp_copy (priv->xmp); g_mutex_unlock (&priv->status_mutex); diff --git a/src/eom-properties-dialog.c b/src/eom-properties-dialog.c index a6c3cf0..d5f6fd7 100644 --- a/src/eom-properties-dialog.c +++ b/src/eom-properties-dialog.c @@ -93,6 +93,9 @@ struct _EomPropertiesDialogPrivate { GtkWidget *xmp_keywords_label; GtkWidget *xmp_creator_label; GtkWidget *xmp_rights_label; +#else + GtkWidget *xmp_box; + GtkWidget *xmp_box_label; #endif #if HAVE_METADATA GtkWidget *metadata_box; @@ -685,9 +688,6 @@ static void eom_properties_dialog_init (EomPropertiesDialog *prop_dlg) { EomPropertiesDialogPrivate *priv; -#ifndef HAVE_EXEMPI - GtkWidget *xmp_box, *xmp_box_label; -#endif #if HAVE_METADATA GtkWidget *sw; #endif @@ -742,8 +742,8 @@ eom_properties_dialog_init (EomPropertiesDialog *prop_dlg) } #ifndef HAVE_EXEMPI - gtk_widget_hide (xmp_box); - gtk_widget_hide (xmp_box_label); + gtk_widget_hide (priv->xmp_box); + gtk_widget_hide (priv->xmp_box_label); #endif #else |