summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann <sandmann@redhat.com>2008-03-09 13:30:42 -0400
committerSøren Sandmann <sandmann@redhat.com>2008-03-09 13:30:42 -0400
commit2ebe756bd2cc249d8b70214cc1fdb6a4dc1a0e4f (patch)
tree606cb53f5f0cf93d6127ba98deea5cf91117479c
parent561fd985b13fcc35ae73af5d91d98b2f540d8821 (diff)
Various
-rw-r--r--metadata.h5
-rw-r--r--siv.c8
-rw-r--r--siv.h (renamed from window.h)16
-rw-r--r--window.c2
4 files changed, 27 insertions, 4 deletions
diff --git a/metadata.h b/metadata.h
index 258f57c..5f7a762 100644
--- a/metadata.h
+++ b/metadata.h
@@ -1,3 +1,6 @@
+#ifndef META_DATA_H
+#define META_DATA_H
+
#include <glib.h>
typedef struct MetaData MetaData;
@@ -35,3 +38,5 @@ void meta_data_add_info (MetaData *data,
gboolean smooth_image,
BackgroundType background,
int zoom_level);
+
+#endif
diff --git a/siv.c b/siv.c
index 0edd19b..3e6a852 100644
--- a/siv.c
+++ b/siv.c
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include "window.h"
+#include "siv.h"
#include "metadata.h"
#define _(a) a
@@ -72,6 +72,12 @@ app_unregister_window (App *app, Window *window)
gtk_main_quit ();
}
+MetaInfo *
+app_get_meta_info (App *app, const char *file)
+{
+ /* FIXME */
+}
+
static void
app_new (int argc, char **argv)
{
diff --git a/window.h b/siv.h
index 92834e3..80a9eb5 100644
--- a/window.h
+++ b/siv.h
@@ -1,5 +1,9 @@
+#ifndef SIV_H
+#define SIV_H
+
#include <gtk/gtk.h>
#include <glade/glade.h>
+#include "metadata.h"
#define APPLICATION_NAME "Simple Image Viewer"
#define PACKAGE_VERSION "0.0.1"
@@ -8,13 +12,21 @@
typedef struct Window Window;
typedef struct App App;
-void app_register_window (App *app, Window *window);
-void app_unregister_window (App *app, Window *window);
+/* App */
+void app_register_window (App *app,
+ Window *window);
+void app_unregister_window (App *app,
+ Window *window);
+MetaInfo *app_get_meta_info (App *app,
+ const char *file);
+/* Window */
Window * window_new (App *app);
gboolean window_load_file (Window *window,
const char *file,
GError **err);
void window_show (Window *window);
void window_free (Window *window);
+
+#endif
diff --git a/window.c b/window.c
index d576bd9..617f33b 100644
--- a/window.c
+++ b/window.c
@@ -1,6 +1,6 @@
#include <math.h>
#include <gtk/gtk.h>
-#include "window.h"
+#include "siv.h"
#define MIN_ZOOM -80
#define MAX_ZOOM 65