Preparing for release v2.0.1

[geeqie.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index b105cba..f92710d 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -22,9 +22,7 @@
 #ifndef MAIN_H
 #define MAIN_H
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include <config.h>
 
 #ifdef HAVE_STRVERSCMP
 #  ifndef _GNU_SOURCE
@@ -77,13 +75,14 @@
 
 #define GQ_APPNAME "Geeqie"
 #define GQ_APPNAME_LC "geeqie"
-#define GQ_WEBSITE "http://www.geeqie.org/"
+#define GQ_WEBSITE "https://www.geeqie.org/"
 #define GQ_EMAIL_ADDRESS "geeqie@freelists.org"
 
 #define GQ_RC_DIR              "." GQ_APPNAME_LC
 #define GQ_COLLECTIONS_DIR     "collections"
 #define GQ_TRASH_DIR           "trash"
 #define GQ_WINDOW_LAYOUTS_DIR  "layouts"
+#define GQ_ARCHIVE_DIR "geeqie-archive"
 
 #define GQ_SYSTEM_WIDE_DIR    "/etc/" GQ_APPNAME_LC
 
@@ -125,14 +124,25 @@
 #include "debug.h"
 #include "options.h"
 
-#define TIMEZONE_DATABASE GQ_WEBSITE"downloads/timezone21.bin"
-
+#define TIMEZONE_DATABASE_WEB "https://cdn.bertold.org/zonedetect/db/db.zip"
+#define TIMEZONE_DATABASE_FILE "timezone21.bin"
+#define TIMEZONE_DATABASE_VERSION "out_v1"
 #define HELP_SEARCH_ENGINE "https://duckduckgo.com/?q=site:geeqie.org/help "
 
 #define STAR_RATING_NOT_READ -12345
 #define STAR_RATING_REJECTED 0x274C //Unicode Character 'Cross Mark'
 #define STAR_RATING_STAR 0x2738 //Unicode Character 'Heavy Eight Pointed Rectilinear Black Star'
 
+/* From http://stackoverflow.com/questions/3417837/ */
+#ifdef UNUSED
+#elif defined(__GNUC__)
+# define UNUSED(x) UNUSED_ ## x __attribute__((unused))
+#elif defined(__LCLINT__)
+# define UNUSED(x) /*@unused@*/ x
+#else
+# define UNUSED(x) x
+#endif
+
 /*
  *----------------------------------------------------------------------------
  * main.c
@@ -149,10 +159,11 @@ extern gchar *gq_prefix;
 extern gchar *gq_localedir;
 extern gchar *gq_helpdir;
 extern gchar *gq_htmldir;
-extern gchar *gq_app_dir;
-extern gchar *gq_bin_dir;
+extern gchar *gq_appdir;
+extern gchar *gq_bindir;
 extern gchar *gq_executable_path;
 extern gchar *desktop_file_template;
+extern gchar *instance_identifier;
 
 void keyboard_scroll_calc(gint *x, gint *y, GdkEventKey *event);
 gint key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data);