gqview.h -> main.h

diff --git a/autogen.sh b/autogen.sh
index 09e4eb0..50cfe96 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,7 +8,7 @@ test -z "$srcdir" && srcdir=.
 
 (test -f $srcdir/configure.in \
   && test -f $srcdir/src/main.c \
-  && test -f $srcdir/src/gqview.h) || {
+  && test -f $srcdir/src/main.h) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level geeqie directory"
     exit 1

diff --git a/src/Makefile.am b/src/Makefile.am
index 90ef58d..e17ca06 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -102,7 +102,6 @@ geeqie_SOURCES = \
        fullscreen.c    \
        fullscreen.h    \
        globals.c       \
-       gqview.h        \
        histogram.c     \
        histogram.h     \
        image.c         \
@@ -124,6 +123,7 @@ geeqie_SOURCES = \
        layout_util.c   \
        layout_util.h   \
        main.c          \
+       main.h          \
        md5-util.c      \
        md5-util.h      \
        menu.c          \

diff --git a/src/bar_exif.c b/src/bar_exif.c
index 3b7d9e7..9f1ea94 100644 (file)
--- a/src/bar_exif.c
+++ b/src/bar_exif.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "bar_exif.h"
 
 #include "exif.h"

diff --git a/src/bar_info.c b/src/bar_info.c
index 27d1293..953b230 100644 (file)
--- a/src/bar_info.c
+++ b/src/bar_info.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "exif.h"
 
 #include "bar_info.h"

diff --git a/src/bar_sort.c b/src/bar_sort.c
index e5c073a..ea96435 100644 (file)
--- a/src/bar_sort.c
+++ b/src/bar_sort.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "bar_sort.h"
 
 #include "collect.h"

diff --git a/src/cache-loader.c b/src/cache-loader.c
index 1874f3d..12f348a 100644 (file)
--- a/src/cache-loader.c
+++ b/src/cache-loader.c
@@ -9,7 +9,7 @@
  * This software comes with no warranty of any kind, use at your own risk!
  */
 
-#include "gqview.h"
+#include "main.h"
 #include "cache-loader.h"
 #include "cache.h"
 

diff --git a/src/cache.c b/src/cache.c
index a61b0c5..55fd475 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -9,7 +9,7 @@
  * This software comes with no warranty of any kind, use at your own risk!
  */
 
-#include "gqview.h"
+#include "main.h"
 #include "cache.h"
 
 #include "md5-util.h"

diff --git a/src/cache_maint.c b/src/cache_maint.c
index 86ded03..946b564 100644 (file)
--- a/src/cache_maint.c
+++ b/src/cache_maint.c
@@ -9,7 +9,7 @@
  * This software comes with no warranty of any kind, use at your own risk!
  */
 
-#include "gqview.h"
+#include "main.h"
 #include "cache_maint.h"
 
 #include "cache.h"

diff --git a/src/collect-dlg.c b/src/collect-dlg.c
index 673e01f..ce5c7ca 100644 (file)
--- a/src/collect-dlg.c
+++ b/src/collect-dlg.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "collect.h"
 #include "collect-dlg.h"
 

diff --git a/src/collect-io.c b/src/collect-io.c
index 2df5e85..1b0862a 100644 (file)
--- a/src/collect-io.c
+++ b/src/collect-io.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "collect-io.h"
 
 #include "collect.h"

diff --git a/src/collect-table.c b/src/collect-table.c
index 79770da..56b4827 100644 (file)
--- a/src/collect-table.c
+++ b/src/collect-table.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "collect-table.h"
 
 #include "cellrenderericon.h"

diff --git a/src/collect.c b/src/collect.c
index 7542a29..deaee71 100644 (file)
--- a/src/collect.c
+++ b/src/collect.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "collect.h"
 
 #include "collect-dlg.h"

diff --git a/src/color-man.c b/src/color-man.c
index 4e3d0f5..1bc8ceb 100644 (file)
--- a/src/color-man.c
+++ b/src/color-man.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "color-man.h"
 
 #include "image.h"

diff --git a/src/dnd.c b/src/dnd.c
index 1e3b905..7ae79e5 100644 (file)
--- a/src/dnd.c
+++ b/src/dnd.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "dnd.h"
 
 #include "collect.h"

diff --git a/src/dupe.c b/src/dupe.c
index f0e4f60..4dc64b3 100644 (file)
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "dupe.h"
 
 #include "cache.h"

diff --git a/src/editors.c b/src/editors.c
index 9738d9f..16c9eef 100644 (file)
--- a/src/editors.c
+++ b/src/editors.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "editors.h"
 
 #include "utilops.h"

diff --git a/src/exif-common.c b/src/exif-common.c
index 53fa0e7..8f50d67 100644 (file)
--- a/src/exif-common.c
+++ b/src/exif-common.c
@@ -21,7 +21,7 @@
 
 #include "intl.h"
 
-#include "gqview.h"
+#include "main.h"
 #include "exif.h"
 
 #include "filelist.h"

diff --git a/src/exif.c b/src/exif.c
index 35c3d25..7fea472 100644 (file)
--- a/src/exif.c
+++ b/src/exif.c
@@ -69,7 +69,7 @@
 
 #include "intl.h"
 
-#include "gqview.h"
+#include "main.h"
 #include "exif-int.h"
 
 #include "format_raw.h"

diff --git a/src/exiv2.cc b/src/exiv2.cc
index cf59670..3b40488 100644 (file)
--- a/src/exiv2.cc
+++ b/src/exiv2.cc
@@ -40,7 +40,7 @@
 
 extern "C" {
 #include <glib.h> 
-#include "gqview.h"
+#include "main.h"
 #include "exif.h"
 #include "filelist.h"
 

diff --git a/src/filelist.c b/src/filelist.c
index 1947e50..145e6fd 100644 (file)
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "filelist.h"
 
 #include "cache.h"

diff --git a/src/format_canon.c b/src/format_canon.c
index f4e0646..b87bbd3 100644 (file)
--- a/src/format_canon.c
+++ b/src/format_canon.c
@@ -29,7 +29,7 @@
 
 #include "intl.h"
 
-#include "gqview.h"
+#include "main.h"
 #include "format_canon.h"
 #include "format_raw.h"
 

diff --git a/src/format_fuji.c b/src/format_fuji.c
index 995a1c8..f13b757 100644 (file)
--- a/src/format_fuji.c
+++ b/src/format_fuji.c
@@ -24,7 +24,7 @@
 
 #include "intl.h"
 
-#include "gqview.h"
+#include "main.h"
 #include "format_fuji.h"
 #include "format_raw.h"
 

diff --git a/src/format_nikon.c b/src/format_nikon.c
index 2af0e57..dc40948 100644 (file)
--- a/src/format_nikon.c
+++ b/src/format_nikon.c
@@ -25,7 +25,7 @@
 
 #include "intl.h"
 
-#include "gqview.h"
+#include "main.h"
 #include "format_nikon.h"
 
 #include "exif.h"

diff --git a/src/format_olympus.c b/src/format_olympus.c
index 1953d74..9aea844 100644 (file)
--- a/src/format_olympus.c
+++ b/src/format_olympus.c
@@ -21,7 +21,7 @@
 
 #include "intl.h"
 
-#include "gqview.h"
+#include "main.h"
 #include "format_olympus.h"
 #include "format_raw.h"
 

diff --git a/src/format_raw.c b/src/format_raw.c
index c377c89..7f616d2 100644 (file)
--- a/src/format_raw.c
+++ b/src/format_raw.c
@@ -27,7 +27,7 @@
 
 #include "intl.h"
 
-#include "gqview.h"
+#include "main.h"
 #include "format_raw.h"
 
 #include "format_canon.h"

diff --git a/src/fullscreen.c b/src/fullscreen.c
index 223e4c3..1cbd6af 100644 (file)
--- a/src/fullscreen.c
+++ b/src/fullscreen.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "fullscreen.h"
 
 #include "image.h"

diff --git a/src/globals.c b/src/globals.c
index 6506456..c9b2a84 100644 (file)
--- a/src/globals.c
+++ b/src/globals.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 
 
 GList *filename_filter = NULL;

diff --git a/src/histogram.c b/src/histogram.c
index 38c4876..f8a5833 100644 (file)
--- a/src/histogram.c
+++ b/src/histogram.c
@@ -9,7 +9,7 @@
  * This software comes with no warranty of any kind, use at your own risk!
  */
 
-#include "gqview.h"
+#include "main.h"
 #include "histogram.h"
 #include <math.h>
 

diff --git a/src/image-load.c b/src/image-load.c
index 349f020..d18a953 100644 (file)
--- a/src/image-load.c
+++ b/src/image-load.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "image-load.h"
 #include "filelist.h"
 

diff --git a/src/image-overlay.c b/src/image-overlay.c
index e86a653..73fb79e 100644 (file)
--- a/src/image-overlay.c
+++ b/src/image-overlay.c
@@ -9,7 +9,7 @@
  * This software comes with no warranty of any kind, use at your own risk!
  */
 
-#include "gqview.h"
+#include "main.h"
 #include "image-overlay.h"
 
 #include "collect.h"

diff --git a/src/image.c b/src/image.c
index 9e46f6e..4604335 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "image.h"
 
 

diff --git a/src/img-view.c b/src/img-view.c
index 803bed9..f4f69ca 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "img-view.h"
 
 #include "collect.h"

diff --git a/src/info.c b/src/info.c
index 649547d..025d058 100644 (file)
--- a/src/info.c
+++ b/src/info.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "info.h"
 
 #include "bar_info.h"

diff --git a/src/layout.c b/src/layout.c
index d9fd72c..4a233a8 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -9,7 +9,7 @@
  * This software comes with no warranty of any kind, use at your own risk!
  */
 
-#include "gqview.h"
+#include "main.h"
 #include "layout.h"
 
 #include "image.h"

diff --git a/src/layout_config.c b/src/layout_config.c
index 135105e..337213d 100644 (file)
--- a/src/layout_config.c
+++ b/src/layout_config.c
@@ -9,7 +9,7 @@
  * This software comes with no warranty of any kind, use at your own risk!
  */
 
-#include "gqview.h"
+#include "main.h"
 #include "layout_config.h"
 
 

diff --git a/src/layout_image.c b/src/layout_image.c
index 7a07c4a..5106c3c 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -9,7 +9,7 @@
  * This software comes with no warranty of any kind, use at your own risk!
  */
 
-#include "gqview.h"
+#include "main.h"
 #include "layout_image.h"
 
 #include "collect.h"

diff --git a/src/layout_util.c b/src/layout_util.c
index 47c6138..1fcbc88 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "layout_util.h"
 
 #include "bar_info.h"

diff --git a/src/main.c b/src/main.c
index 31d601c..00b8b69 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 
 #include "cache.h"
 #include "collect.h"

diff --git a/src/gqview.h b/src/main.h
similarity index 100%
rename from src/gqview.h
rename to src/main.h

diff --git a/src/menu.c b/src/menu.c
index 15fafcf..f24677e 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "menu.h"
 
 #include "cache_maint.h"

diff --git a/src/pan-calendar.c b/src/pan-calendar.c
index 8504023..159230f 100644 (file)
--- a/src/pan-calendar.c
+++ b/src/pan-calendar.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "pan-types.h"
 
 #include <math.h>

diff --git a/src/pan-folder.c b/src/pan-folder.c
index b7ca3b4..ec2eda9 100644 (file)
--- a/src/pan-folder.c
+++ b/src/pan-folder.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "pan-types.h"
 
 #include <math.h>

diff --git a/src/pan-grid.c b/src/pan-grid.c
index 3528869..ef7c0ec 100644 (file)
--- a/src/pan-grid.c
+++ b/src/pan-grid.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "pan-types.h"
 
 #include <math.h>

diff --git a/src/pan-item.c b/src/pan-item.c
index 998d35b..5beec57 100644 (file)
--- a/src/pan-item.c
+++ b/src/pan-item.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "pan-types.h"
 
 

diff --git a/src/pan-timeline.c b/src/pan-timeline.c
index 2abf016..a3fabbb 100644 (file)
--- a/src/pan-timeline.c
+++ b/src/pan-timeline.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "pan-types.h"
 
 

diff --git a/src/pan-util.c b/src/pan-util.c
index 79f9031..43c7017 100644 (file)
--- a/src/pan-util.c
+++ b/src/pan-util.c
@@ -9,7 +9,7 @@
  * This software comes with no warranty of any kind, use at your own risk!
  */
 
-#include "gqview.h"
+#include "main.h"
 #include "pan-types.h"
 
 #include "ui_fileops.h"

diff --git a/src/pan-view.c b/src/pan-view.c
index 6b1316f..8cf2a2f 100644 (file)
--- a/src/pan-view.c
+++ b/src/pan-view.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "pan-view.h"
 
 #include "pan-types.h"

diff --git a/src/pixbuf_util.c b/src/pixbuf_util.c
index efeff8b..2d3fbe0 100644 (file)
--- a/src/pixbuf_util.c
+++ b/src/pixbuf_util.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "pixbuf_util.h"
 
 #include "icons/icons_inline.h"

diff --git a/src/preferences.c b/src/preferences.c
index afdf8d3..9b30170 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "preferences.h"
 
 #include "cache_maint.h"

diff --git a/src/print.c b/src/print.c
index 29fbafc..be7015c 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "print.h"
 
 #include "filelist.h"

diff --git a/src/rcfile.c b/src/rcfile.c
index e8c8140..a5aee85 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -12,7 +12,7 @@
 #include <glib/gstdio.h>
 #include <errno.h>
 
-#include "gqview.h"
+#include "main.h"
 #include "rcfile.h"
 
 #include "filelist.h"

diff --git a/src/remote.c b/src/remote.c
index 5d04c51..283b260 100644 (file)
--- a/src/remote.c
+++ b/src/remote.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "remote.h"
 
 

diff --git a/src/search.c b/src/search.c
index ddf3692..fa2e6af 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "search.h"
 
 #include "bar_info.h"

diff --git a/src/similar.c b/src/similar.c
index be2f950..1998e81 100644 (file)
--- a/src/similar.c
+++ b/src/similar.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "similar.h"
 
 /*

diff --git a/src/slideshow.c b/src/slideshow.c
index 52e9fe6..964d114 100644 (file)
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "collect.h"
 #include "image.h"
 #include "slideshow.h"

diff --git a/src/thumb.c b/src/thumb.c
index 0f4cb0c..50450b8 100644 (file)
--- a/src/thumb.c
+++ b/src/thumb.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "thumb.h"
 
 #include "cache.h"

diff --git a/src/thumb_standard.c b/src/thumb_standard.c
index 875b27d..985e162 100644 (file)
--- a/src/thumb_standard.c
+++ b/src/thumb_standard.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "thumb_standard.h"
 
 #include "cache.h"     /* for cache_ensure_dir_exists */

diff --git a/src/ui_bookmark.c b/src/ui_bookmark.c
index c3891e9..39e58b3 100644 (file)
--- a/src/ui_bookmark.c
+++ b/src/ui_bookmark.c
@@ -22,7 +22,7 @@
 
 #include <gdk/gdkkeysyms.h> /* for key values */
 
-#include "gqview.h"
+#include "main.h"
 #include "filelist.h"
 
 #include "ui_bookmark.h"

diff --git a/src/ui_fileops.c b/src/ui_fileops.c
index 62a2322..e0b17b4 100644 (file)
--- a/src/ui_fileops.c
+++ b/src/ui_fileops.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>   /* for locale warning dialog */
 
-#include "gqview.h"
+#include "main.h"
 #include "ui_fileops.h"
 
 #include "ui_utildlg.h"        /* for locale warning dialog */

diff --git a/src/ui_pathsel.c b/src/ui_pathsel.c
index 8b3dbc0..22c9027 100644 (file)
--- a/src/ui_pathsel.c
+++ b/src/ui_pathsel.c
@@ -28,7 +28,7 @@
 
 #include <gdk/gdkkeysyms.h> /* for key values */
 
-#include "gqview.h"
+#include "main.h"
 #include "ui_pathsel.h"
 
 #include "ui_bookmark.h"

diff --git a/src/ui_tabcomp.c b/src/ui_tabcomp.c
index 7ab8c8f..2a49579 100644 (file)
--- a/src/ui_tabcomp.c
+++ b/src/ui_tabcomp.c
@@ -25,7 +25,7 @@
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "gqview.h"
+#include "main.h"
 #include "ui_tabcomp.h"
 
 #include "ui_bookmark.h"

diff --git a/src/ui_utildlg.c b/src/ui_utildlg.c
index 8dedca5..e4352d2 100644 (file)
--- a/src/ui_utildlg.c
+++ b/src/ui_utildlg.c
@@ -22,7 +22,7 @@
 
 #include <gdk/gdkkeysyms.h> /* for keyboard values */
 
-#include "gqview.h"
+#include "main.h"
 #include "ui_utildlg.h"
 
 #include "filelist.h"

diff --git a/src/utilops.c b/src/utilops.c
index 7954018..dc6a12f 100644 (file)
--- a/src/utilops.c
+++ b/src/utilops.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "gqview.h"
+#include "main.h"
 #include "utilops.h"
 
 

diff --git a/src/view_dir_list.c b/src/view_dir_list.c
index f973262..48cf6ae 100644 (file)
--- a/src/view_dir_list.c
+++ b/src/view_dir_list.c
@@ -9,7 +9,7 @@
  * This software comes with no warranty of any kind, use at your own risk!
  */
 
-#include "gqview.h"
+#include "main.h"
 #include "view_dir_list.h"
 
 #include "dnd.h"

diff --git a/src/view_dir_tree.c b/src/view_dir_tree.c
index 91790bc..18f24ba 100644 (file)
--- a/src/view_dir_tree.c
+++ b/src/view_dir_tree.c
@@ -9,7 +9,7 @@
  * This software comes with no warranty of any kind, use at your own risk!
  */
 
-#include "gqview.h"
+#include "main.h"
 #include "view_dir_tree.h"
 
 

diff --git a/src/view_file_icon.c b/src/view_file_icon.c
index e60658b..90a4231 100644 (file)
--- a/src/view_file_icon.c
+++ b/src/view_file_icon.c
@@ -9,7 +9,7 @@
  * This software comes with no warranty of any kind, use at your own risk!
  */
 
-#include "gqview.h"
+#include "main.h"
 #include "view_file_icon.h"
 
 #include "cellrenderericon.h"

diff --git a/src/view_file_list.c b/src/view_file_list.c
index 4f2968e..456cba3 100644 (file)
--- a/src/view_file_list.c
+++ b/src/view_file_list.c
@@ -9,7 +9,7 @@
  * This software comes with no warranty of any kind, use at your own risk!
  */
 
-#include "gqview.h"
+#include "main.h"
 #include "view_file_list.h"
 
 #include "cache_maint.h"