[gnac/gnac-gsettings] Moved declaration of settings_ui to gnac-ui.c
- From: Benoît Dupasquier <bdupasqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnac/gnac-gsettings] Moved declaration of settings_ui to gnac-ui.c
- Date: Tue, 12 Oct 2010 22:18:50 +0000 (UTC)
commit 79f1b723dea2386d61a22ecdea359d83374360ce
Author: Benoît Dupasquier <bdupasqu src gnome org>
Date: Tue Oct 12 23:18:42 2010 +0100
Moved declaration of settings_ui to gnac-ui.c
src/gnac-main.c | 1 -
src/gnac-main.h | 4 ----
src/gnac-ui.c | 2 ++
src/gnac-ui.h | 5 +++++
4 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/src/gnac-main.c b/src/gnac-main.c
index 28eb0dd..f85bf57 100644
--- a/src/gnac-main.c
+++ b/src/gnac-main.c
@@ -53,7 +53,6 @@
#include "profiles/gnac-profiles-utils.h"
-GSettings *settings_ui;
GSettings *settings;
static LibgnacConverter *converter;
diff --git a/src/gnac-main.h b/src/gnac-main.h
index 818f28a..1730412 100644
--- a/src/gnac-main.h
+++ b/src/gnac-main.h
@@ -31,9 +31,6 @@
#include "libgnac-converter.h"
-#define GNAC_SCHEMA_UI "org.gnome.Gnac.ui"
-#define GNAC_KEY_TRAY_ICON "tray-icon"
-
#define GNAC_SCHEMA "org.gnome.Gnac.conversion"
#define GNAC_KEY_CLEAR_SOURCE "clear-sources"
#define GNAC_KEY_DESTINATION_DIRECTORY "destination-directory"
@@ -58,7 +55,6 @@ typedef enum {
} GnacState;
extern GSettings *settings;
-extern GSettings *settings_ui;
void
gnac_add_file(GFile *file);
diff --git a/src/gnac-ui.c b/src/gnac-ui.c
index 4dd2a1c..7733a07 100644
--- a/src/gnac-ui.c
+++ b/src/gnac-ui.c
@@ -49,6 +49,8 @@
#include "libgnac-debug.h"
#include "profiles/gnac-profiles.h"
+GSettings *settings_ui;
+
extern GnacState state;
extern guint nb_files_added;
extern LibgnacMetadata *metadata;
diff --git a/src/gnac-ui.h b/src/gnac-ui.h
index e0761e3..90a8889 100644
--- a/src/gnac-ui.h
+++ b/src/gnac-ui.h
@@ -31,12 +31,17 @@
#include "gnac-options.h"
+#define GNAC_SCHEMA_UI "org.gnome.Gnac.ui"
+#define GNAC_KEY_TRAY_ICON "tray-icon"
+
G_BEGIN_DECLS
enum {
TARGET_STRING
};
+extern GSettings *settings_ui;
+
void
gnac_ui_set_progress_fraction(gdouble fraction);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]