Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*fix* issue 175

Browse Source 
*fix* a bug I introduced with one of my previous checkins...



git-svn-id: http://tint2.googlecode.com/svn/trunk@313 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
Andreas.Fink85
2010-01-03 13:14:25 +00:00
parent a0cf313f08
commit fad21d3c1c
11 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tint.c
View File

@@ -73,7 +73,6 @@ void init (int argc, char *argv[])
snapshot_path = strdup(argv[i]);
}
}
// Set signal handler
struct sigaction sa = { .sa_handler = signal_handler };
sigaction(SIGUSR1, &sa, 0);
@@ -89,11 +88,13 @@ void init (int argc, char *argv[])
sigaddset(&block_mask, SIGUSR1);
sigprocmask(SIG_BLOCK, &block_mask, 0);
// set global data
memset(&server, 0, sizeof(Server_global));
// memset(&systray, 0, sizeof(Systraybar));
memset(&systray, 0, sizeof(Systraybar));
}
void init_X11()
{
server.dsp = XOpenDisplay (NULL);
if (!server.dsp) {
fprintf(stderr, "tint2 exit : could not open display.\n");
@@ -119,6 +120,7 @@ void init (int argc, char *argv[])
gchar *path;
const gchar * const *data_dirs;
data_dirs = g_get_system_data_dirs ();
int i;
for (i = 0; data_dirs[i] != NULL; i++) {
path = g_build_filename(data_dirs[i], "tint2", "default_icon.png", NULL);
if (g_file_test (path, G_FILE_TEST_EXISTS))
@@ -681,6 +683,7 @@ int main (int argc, char *argv[])
GSList *it;
const struct timespec* timeout;
init (argc, argv);
init_config();
i = 0;
if (config_path)
@@ -693,8 +696,7 @@ int main (int argc, char *argv[])
exit(1);
}
init (argc, argv);
init_X11();
init_panel();
cleanup_config();
if (snapshot_path) {