Attachment #46266 for bug #72389

View | Details | Raw Unified | Return to bug 72389
Collapse All | Expand All

Lines 1-4 Link Here

(-)firestarter-1.0.1/firestarter.console (-1 / +1 lines)
1	USER=root	1	USER=root
2	FALLBACK=true	2	FALLBACK=true
3	PROGRAM=%{_sbindir}/firestarter	3	PROGRAM=/usr/bin/firestarter
4	SESSION=true	4	SESSION=true




#include <dirent.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>

#include "globals.h"
#include "firestarter.h"

	return TRUE;
}

static void
sig_usr1_handler (int signo G_GNUC_UNUSED)
{
	/* reestablish handler */
	signal(SIGUSR1, sig_usr1_handler);
	
	/* add an idle call to the sync function */
	g_idle_add(status_sync_idle_oneshot, NULL);
	
	return;
}

/* [ main ]
 * The main function, this is where it all begins and ends
 */

	gui_construct ();
	/* Attach a timeout that keeps the GUI fw status in sync with userland changes */
	status_sync_timeout (NULL); /* Do one immediate refresh */
	g_timeout_add (30000, status_sync_timeout, NULL);
	/* connect a signal to allow for external sync requests */
	signal (SIGUSR1, sig_usr1_handler);

	/* Initialize the system log file polling function */
	open_logfile ((gchar *)get_system_log_path ());




	current_status = status;
}

/* [ status_sync_idle_oneshot ]
 * Correct the GUI state in case outside factors change the firewall state
 */
gint
status_sync_idle_oneshot (gpointer data)
{
	/* pass on the call */
	status_sync_timeout(data);
	
	return FALSE;
}

/* [ status_sync_timeout ]
 * Correct the GUI state in case outside factors change the firewall state
 */

Lines 37-42 Link Here

(-)firestarter-1.0.1/src/statusview.h (+1 lines)
37	void status_event_out_inc (void);	37	void status_event_out_inc (void);
38	void status_serious_event_out_inc (void);	38	void status_serious_event_out_inc (void);
39		39
		40	gint status_sync_idle_oneshot (gpointer data);
40	gint status_sync_timeout (gpointer data);	41	gint status_sync_timeout (gpointer data);
41		42
42	void status_lookup_selected_connection (void);	43	void status_lookup_selected_connection (void);

Return to bug 72389

Lines 20-25 Link Here

(-)firestarter-1.0.1/src/firestarter.c (-1 / +16 lines)
20	#include <dirent.h>	20	#include <dirent.h>
21	#include <sys/types.h>	21	#include <sys/types.h>
22	#include <sys/wait.h>	22	#include <sys/wait.h>
		23	#include <signal.h>
23		24
24	#include "globals.h"	25	#include "globals.h"
25	#include "firestarter.h"	26	#include "firestarter.h"
Lines 326-331 Link Here
326	return TRUE;	327	return TRUE;
327	}	328	}
328		329
		330	static void
		331	sig_usr1_handler (int signo G_GNUC_UNUSED)
		332	{
		333	/* reestablish handler */
		334	signal(SIGUSR1, sig_usr1_handler);
		335
		336	/* add an idle call to the sync function */
		337	g_idle_add(status_sync_idle_oneshot, NULL);
		338
		339	return;
		340	}
		341
329	/* [ main ]	342	/* [ main ]
330	* The main function, this is where it all begins and ends	343	* The main function, this is where it all begins and ends
331	*/	344	*/
Lines 406-412 Link Here
406	gui_construct ();	419	gui_construct ();
407	/* Attach a timeout that keeps the GUI fw status in sync with userland changes */	420	/* Attach a timeout that keeps the GUI fw status in sync with userland changes */
408	status_sync_timeout (NULL); /* Do one immediate refresh */	421	status_sync_timeout (NULL); /* Do one immediate refresh */
409	g_timeout_add (5000, status_sync_timeout, NULL);	422	g_timeout_add (30000, status_sync_timeout, NULL);
		423	/* connect a signal to allow for external sync requests */
		424	signal (SIGUSR1, sig_usr1_handler);
410		425
411	/* Initialize the system log file polling function */	426	/* Initialize the system log file polling function */
412	open_logfile ((gchar *)get_system_log_path ());	427	open_logfile ((gchar *)get_system_log_path ());

Lines 518-523 Link Here

(-)firestarter-1.0.1/src/statusview.c (+12 lines)
518	current_status = status;	518	current_status = status;
519	}	519	}
520		520
		521	/* [ status_sync_idle_oneshot ]
		522	* Correct the GUI state in case outside factors change the firewall state
		523	*/
		524	gint
		525	status_sync_idle_oneshot (gpointer data)
		526	{
		527	/* pass on the call */
		528	status_sync_timeout(data);
		529
		530	return FALSE;
		531	}
		532
521	/* [ status_sync_timeout ]	533	/* [ status_sync_timeout ]
522	* Correct the GUI state in case outside factors change the firewall state	534	* Correct the GUI state in case outside factors change the firewall state
523	*/	535	*/