[brasero] Fix build without preview
- From: Tomas Bzatek <tbzatek src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [brasero] Fix build without preview
- Date: Tue, 18 Sep 2012 14:58:09 +0000 (UTC)
commit 0b3775a946d1b255cf4f9b14b7f14a9a187aed51
Author: Tomas Bzatek <tbzatek redhat com>
Date: Tue Sep 18 16:55:02 2012 +0200
Fix build without preview
Blind patch, please test thoroughly.
src/brasero-layout.c | 10 ++++++++++
src/brasero-preview.c | 2 +-
src/brasero-preview.h | 4 ++--
src/brasero-project.c | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/src/brasero-layout.c b/src/brasero-layout.c
index 7380f76..0beb06e 100644
--- a/src/brasero-layout.c
+++ b/src/brasero-layout.c
@@ -39,7 +39,11 @@
#include "brasero-setting.h"
#include "brasero-layout.h"
+
+#ifdef BUILD_PREVIEW
#include "brasero-preview.h"
+#endif
+
#include "brasero-project.h"
#include "brasero-uri-container.h"
#include "brasero-layout-object.h"
@@ -318,6 +322,7 @@ brasero_layout_add_project (BraseroLayout *layout,
layout->priv->project = project;
}
+#ifdef BUILD_PREVIEW
static void
brasero_layout_preview_toggled_cb (GtkToggleAction *action, BraseroLayout *layout)
{
@@ -334,11 +339,13 @@ brasero_layout_preview_toggled_cb (GtkToggleAction *action, BraseroLayout *layou
BRASERO_SETTING_SHOW_PREVIEW,
GINT_TO_POINTER (active));
}
+#endif
void
brasero_layout_add_preview (BraseroLayout *layout,
GtkWidget *preview)
{
+#ifdef BUILD_PREVIEW
gpointer value;
gboolean active;
gchar *accelerator;
@@ -376,6 +383,7 @@ brasero_layout_add_preview (BraseroLayout *layout,
gtk_widget_hide (layout->priv->preview_pane);
brasero_preview_set_enabled (BRASERO_PREVIEW (layout->priv->preview_pane), active);
+#endif
}
/**************************** for the source panes *****************************/
@@ -660,8 +668,10 @@ brasero_layout_load (BraseroLayout *layout,
GtkTreeIter iter;
gpointer value;
+#ifdef BUILD_PREVIEW
if (layout->priv->preview_pane)
brasero_preview_hide (BRASERO_PREVIEW (layout->priv->preview_pane));
+#endif
if (type == BRASERO_LAYOUT_NONE) {
gtk_widget_hide (GTK_WIDGET (layout));
diff --git a/src/brasero-preview.c b/src/brasero-preview.c
index baa50eb..f73f81a 100644
--- a/src/brasero-preview.c
+++ b/src/brasero-preview.c
@@ -216,4 +216,4 @@ brasero_preview_new (void)
return g_object_new (BRASERO_TYPE_PREVIEW, NULL);
}
-#endif
+#endif /* BUILD_PREVIEW */
diff --git a/src/brasero-preview.h b/src/brasero-preview.h
index ee1373b..2efb5fd 100644
--- a/src/brasero-preview.h
+++ b/src/brasero-preview.h
@@ -72,6 +72,6 @@ brasero_preview_set_enabled (BraseroPreview *self,
G_END_DECLS
-#endif /* PLAYER_H */
-
#endif /* _BRASERO_PREVIEW_H_ */
+
+#endif /* BUILD_PREVIEW */
diff --git a/src/brasero-project.c b/src/brasero-project.c
index e1989a3..f7147fb 100644
--- a/src/brasero-project.c
+++ b/src/brasero-project.c
@@ -2145,6 +2145,7 @@ brasero_project_file_chooser_response_cb (GtkWidget *chooser,
g_slist_free (uris);
}
+#ifdef BUILD_PREVIEW
static void
brasero_project_preview_ready (BraseroPlayer *player,
GtkFileChooser *chooser)
@@ -2164,6 +2165,7 @@ brasero_project_update_preview (GtkFileChooser *chooser,
brasero_player_set_uri (player, uri);
g_free (uri);
}
+#endif
static void
brasero_project_add_uris_cb (GtkAction *action,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]