Attachment #402346 for bug #481836

View | Details | Raw Unified | Return to bug 481836 | Differences between
Collapse All | Expand All




++ brackets-shell/appshell/client_app_gtk.cpp

/*
 * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
 * to deal in the Software without restriction, including without limitation
 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
 * and/or sell copies of the Software, and to permit persons to whom the
 * Software is furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 * DEALINGS IN THE SOFTWARE.
 *
 */

#include "client_app.h"
#include "resource.h"
#include "include/cef_base.h"
#include "config.h"

#include <gtk/gtk.h>
#include <pwd.h>
#include <algorithm>
//#include <MMSystem.h>

    return (time(NULL) - g_appStartupTime);
}

CefString ClientApp::AppGetSupportDirectory()
{
    gchar *supportDir = g_strdup_printf("%s/%s", g_get_user_config_dir(), APP_NAME);
    CefString result = CefString(supportDir);
    g_free(supportDir);

    return result;
}

CefString ClientApp::AppGetDocumentsDirectory()
{
    const char *dir = g_get_user_special_dir(G_USER_DIRECTORY_DOCUMENTS);
    if (dir == NULL)  {

Return to bug 481836

Line Link Here

(-)file_not_specified_in_diff (-17 / +18 lines)
0	-- brackets-shell/appshell/client_app_gtk.cpp	0	++ brackets-shell/appshell/client_app_gtk.cpp
Lines 1-31 Link Here
1	/*	1	/*
2	* Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.	2	* Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
3	*	3	*
4	* Permission is hereby granted, free of charge, to any person obtaining a	4	* Permission is hereby granted, free of charge, to any person obtaining a
5	* copy of this software and associated documentation files (the "Software"),	5	* copy of this software and associated documentation files (the "Software"),
6	* to deal in the Software without restriction, including without limitation	6	* to deal in the Software without restriction, including without limitation
7	* the rights to use, copy, modify, merge, publish, distribute, sublicense,	7	* the rights to use, copy, modify, merge, publish, distribute, sublicense,
8	* and/or sell copies of the Software, and to permit persons to whom the	8	* and/or sell copies of the Software, and to permit persons to whom the
9	* Software is furnished to do so, subject to the following conditions:	9	* Software is furnished to do so, subject to the following conditions:
10	*	10	*
11	* The above copyright notice and this permission notice shall be included in	11	* The above copyright notice and this permission notice shall be included in
12	* all copies or substantial portions of the Software.	12	* all copies or substantial portions of the Software.
13	*	13	*
14	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR	14	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15	* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,	15	* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16	* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE	16	* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17	* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER	17	* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18	* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING	18	* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19	* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	* DEALINGS IN THE SOFTWARE.	20	* DEALINGS IN THE SOFTWARE.
21	*	21	*
22	*/	22	*/
23		23
24	#include "client_app.h"	24	#include "client_app.h"
25	#include "resource.h"	25	#include "resource.h"
26	#include "include/cef_base.h"	26	#include "include/cef_base.h"
27	#include "config.h"	27	#include "config.h"
28		28
		29	#include <gtk/gtk.h>
29	#include <pwd.h>	30	#include <pwd.h>
30	#include <algorithm>	31	#include <algorithm>
31	//#include <MMSystem.h>	32	//#include <MMSystem.h>
Lines 79-94 Link Here
79	return (time(NULL) - g_appStartupTime);	80	return (time(NULL) - g_appStartupTime);
80	}	81	}
81		82
82	CefString ClientApp::AppGetSupportDirectory()	83	CefString ClientApp::AppGetSupportDirectory()
83	{	84	{
84	gchar *supportDir = g_strdup_printf("%s/%s", g_get_user_config_dir(), APP_NAME);	85	gchar *supportDir = g_strdup_printf("%s/%s", g_get_user_config_dir(), APP_NAME);
85	CefString result = CefString(supportDir);	86	CefString result = CefString(supportDir);
86	g_free(supportDir);	87	g_free(supportDir);
87		88
88	return result;	89	return result;
89	}	90	}
90		91
91	CefString ClientApp::AppGetDocumentsDirectory()	92	CefString ClientApp::AppGetDocumentsDirectory()
92	{	93	{
93	const char *dir = g_get_user_special_dir(G_USER_DIRECTORY_DOCUMENTS);	94	const char *dir = g_get_user_special_dir(G_USER_DIRECTORY_DOCUMENTS);
94	if (dir == NULL) {	95	if (dir == NULL) {