You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
70 lines
1.6 KiB
70 lines
1.6 KiB
--- src/main.c.orig 2013-01-16 09:06:19 UTC
|
|
+++ src/main.c
|
|
@@ -31,10 +31,26 @@
|
|
#include "actions.h"
|
|
#include "messages.h"
|
|
|
|
+GtkWidget *hboxButtonWidget = NULL;
|
|
+GtkWidget *winWidget = NULL;
|
|
+
|
|
+/* Configuration files */
|
|
+GKeyFile *myConfigFile = NULL;
|
|
+GKeyFile *myThemeConfigFile = NULL;
|
|
+
|
|
+/* Other */
|
|
+gboolean isFullscreen = FALSE;
|
|
+
|
|
+GFile *myLockFile = NULL;
|
|
+
|
|
+gboolean exitCode = 0;
|
|
+
|
|
+Options myOptions = {};
|
|
+CommandlineOptions myCmdOptions = {};
|
|
+Theme myTheme = {};
|
|
+
|
|
int main(int argc, char **argv)
|
|
{
|
|
- exitCode = 0;
|
|
-
|
|
initGtk(&argc, &argv);
|
|
|
|
migrateConfigToXdgDir();
|
|
@@ -71,8 +87,6 @@ gboolean initLockFile(void)
|
|
GFileOutputStream *stream = NULL;
|
|
gchar *tmpfile = NULL;
|
|
|
|
- myLockFile = NULL;
|
|
-
|
|
tmpfile = g_build_filename(g_get_tmp_dir(), "obshutdown.lock", NULL);
|
|
|
|
if(g_file_test(tmpfile, G_FILE_TEST_EXISTS)) {
|
|
@@ -112,7 +126,6 @@ void migrateConfigToXdgDir(void)
|
|
gchar *oldFilename, *newFilename, *xdgPath;
|
|
GFile *oldFile, *newFile;
|
|
|
|
-
|
|
xdgPath = g_build_filename(g_get_user_config_dir(), OBS_NAME, NULL);
|
|
if (g_file_test(xdgPath, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
|
|
g_free(xdgPath);
|
|
@@ -288,13 +301,6 @@ void initDataDefault(void)
|
|
/* Configs paths */
|
|
myOptions.rcfile = getRcPath();
|
|
myOptions.trcfile = NULL;
|
|
-
|
|
- /* Configuration files */
|
|
- myConfigFile = NULL;
|
|
- myThemeConfigFile = NULL;
|
|
-
|
|
- /* Other */
|
|
- isFullscreen = FALSE;
|
|
}
|
|
|
|
void freeData(void)
|
|
@@ -336,7 +342,6 @@ void freeData(void)
|
|
g_free(myOptions.rcfile);
|
|
if (myOptions.theme)
|
|
g_free(myOptions.trcfile);
|
|
-
|
|
}
|
|
|
|
inline void initGtk(int *argc, char ***argv)
|
|
|