Upgraded version and removed old code

maoserr · Aug 27, 2014 · e9f7684 · e9f7684
1 parent 2c87909
commit e9f7684
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(PRO_NAME "RedshiftGUI")
 # Project version
 set(RSG_VERSION_MAJOR 0)
 set(RSG_VERSION_MINOR 2)
-set(RSG_VERSION_PATCH 1)
+set(RSG_VERSION_PATCH 4)
 set(RSG_VERSION
 	"${RSG_VERSION_MAJOR}.${RSG_VERSION_MINOR}.${RSG_VERSION_PATCH}")
 # Project information

diff --git a/src/common.h b/src/common.h
@@ -82,7 +82,7 @@
 #endif
 
 // Stringify
-#define STR(X) #X
+#define STR(X) X
 
 // Math macros
 #ifndef MIN

diff --git a/src/gui/iupgui.c b/src/gui/iupgui.c
@@ -105,7 +105,9 @@ int gui_about(/*@unused@*/ Ihandle *ih){
 			"SCROLLBAR","VERTICAL",
 			"READONLY","YES",
 			"VALUE",
-			_("Homepage:\nhttp://www.mao-yu.com/projects/redshiftgui/\n\n"
+			_("Homepage:\n"
+				STR(PACKAGE_HOME)
+				"\n\n"
 				"Written by Mao Yu\n"
 				"Redshift GUI is based on Redshift by Jon Lund Steffensen\n"
 				"This program uses IUP and libcURL\n"

diff --git a/src/gui/iupgui_settings.c b/src/gui/iupgui_settings.c
@@ -431,7 +431,7 @@ static void _settings_create(void){
 	frame_day = _settings_create_day_temp();
 	frame_night = _settings_create_night_temp();
 	frame_startup = _settings_create_startup();
-	frame_icons = _settings_create_icons();
+	//frame_icons = _settings_create_icons();
 	frame_speed = _settings_create_tran();
 	frame_elev = _settings_create_elev();
 
@@ -442,7 +442,7 @@ static void _settings_create(void){
 				frame_day,
 				frame_night,
 				frame_startup,
-				frame_icons,
+				//frame_icons,
 				NULL),
 			IupVbox(
 				frame_speed,