[gnome-utils] Move defines in the appropriate C files



commit c5a42e4d3d2da1a7036e1d8d595e826a121f571e
Author: Paolo Borelli <pborelli gnome org>
Date:   Sat Oct 9 17:58:51 2010 +0200

    Move defines in the appropriate C files

 baobab/src/baobab-prefs.c |    6 +++++-
 baobab/src/baobab.c       |    2 ++
 baobab/src/baobab.h       |    3 ---
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/baobab/src/baobab-prefs.c b/baobab/src/baobab-prefs.c
index 1b2de02..9857659 100644
--- a/baobab/src/baobab-prefs.c
+++ b/baobab/src/baobab-prefs.c
@@ -35,6 +35,8 @@
 #include "baobab-utils.h"
 #include "baobab-prefs.h"
 
+#define BAOBAB_PREFERENCES_UI_FILE PKGDATADIR "/baobab-dialog-scan-props.ui"
+
 enum
 {
 	COL_CHECK,
@@ -294,7 +296,9 @@ baobab_prefs_dialog (void)
 	GError *error = NULL;
 
 	builder = gtk_builder_new ();
-	gtk_builder_add_from_file (builder, BAOBAB_DIALOG_SCAN_UI_FILE, &error);
+	gtk_builder_add_from_file (builder,
+				   BAOBAB_PREFERENCES_UI_FILE,
+				   &error);
 
 	if (error) {
 		g_critical ("Can't load user interface file for the scan properties dialog: %s",
diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c
index f925814..2a916b9 100644
--- a/baobab/src/baobab.c
+++ b/baobab/src/baobab.c
@@ -38,6 +38,8 @@
 #include "baobab-treemap.h"
 #include "baobab-ringschart.h"
 
+#define BAOBAB_UI_FILE PKGDATADIR "/baobab-main-window.ui"
+
 static void push_iter_in_stack (GtkTreeIter *);
 static GtkTreeIter pop_iter_from_stack (void);
 
diff --git a/baobab/src/baobab.h b/baobab/src/baobab.h
index 0b05848..899d8cc 100644
--- a/baobab/src/baobab.h
+++ b/baobab/src/baobab.h
@@ -33,9 +33,6 @@
 typedef struct _baobab_fs baobab_fs;
 struct BaobabSearchOpt;
 
-#define BAOBAB_UI_FILE PKGDATADIR "/baobab-main-window.ui"
-#define BAOBAB_DIALOG_SCAN_UI_FILE PKGDATADIR "/baobab-dialog-scan-props.ui"
-
 /* Settings */
 #define BAOBAB_KEY_DIR "/apps/baobab"
 #define BAOBAB_TOOLBAR_VISIBLE_KEY	BAOBAB_KEY_DIR "/ui/toolbar_visible"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]