Merge branch 'release'

bchintx · bchintx · commit ba23710205c7 · 2014-03-18T00:39:33.000-05:00
diff --git a/appshell/client_app_gtk.cpp b/appshell/client_app_gtk.cpp
@@ -81,7 +81,7 @@ double ClientApp::GetElapsedMilliseconds()
 
 CefString ClientApp::AppGetSupportDirectory() 
 {
-    gchar *supportDir = g_strdup_printf("%s/%s", g_get_user_config_dir(), g_get_prgname());
+    gchar *supportDir = g_strdup_printf("%s/%s", g_get_user_config_dir(), APP_NAME);
     CefString result = CefString(supportDir);
     g_free(supportDir);
     
diff --git a/appshell/config.h b/appshell/config.h
@@ -55,7 +55,7 @@
 #ifdef OS_LINUX
 // TODO linux preferences
 //#define GROUP_NAME @""
-//#define APP_NAME @"Brackets"
+#define APP_NAME "Brackets"
 //#define WINDOW_TITLE APP_NAME
 
 // Path for node resources is in dependencies dir and relative to the location of the appshell executable

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ double ClientApp::GetElapsedMilliseconds()`
`81`	`81`
`82`	`82`	`CefString ClientApp::AppGetSupportDirectory()`
`83`	`83`	`{`
`84`		`- gchar *supportDir = g_strdup_printf("%s/%s", g_get_user_config_dir(), g_get_prgname());`
	`84`	`+ gchar *supportDir = g_strdup_printf("%s/%s", g_get_user_config_dir(), APP_NAME);`
`85`	`85`	`CefString result = CefString(supportDir);`
`86`	`86`	`g_free(supportDir);`
`87`	`87`