DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Tracking the first idle callback

Browse Source
This commit is contained in:
Pierre Pronchery 2013-07-01 21:54:00 -04:00
parent c2fa286ec3
commit c6d0f26bdd
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/browser.c
View File

@ -278,6 +278,7 @@ Browser * browser_new(char const * directory)
browser_error(NULL, (directory != NULL) ? directory : ".", 1); browser_error(NULL, (directory != NULL) ? directory : ".", 1);
return NULL; return NULL;
} }
browser->source = 0;
browser->window = NULL; browser->window = NULL;
browser->theme = gtk_icon_theme_get_default(); browser->theme = gtk_icon_theme_get_default();
#if GTK_CHECK_VERSION(2, 6, 0) #if GTK_CHECK_VERSION(2, 6, 0)
@ -509,7 +510,7 @@ Browser * browser_new(char const * directory)
browser->history = g_list_append(browser->history, p); browser->history = g_list_append(browser->history, p);
browser->current = browser->history; browser->current = browser->history;
} }
g_idle_add(_new_idle, browser); browser->source = g_idle_add(_new_idle, browser);
gtk_container_add(GTK_CONTAINER(browser->window), vbox); gtk_container_add(GTK_CONTAINER(browser->window), vbox);
gtk_widget_show_all(browser->window); gtk_widget_show_all(browser->window);
@ -522,6 +523,7 @@ static gboolean _new_idle(gpointer data)
Browser * browser = data; Browser * browser = data;
char const * location; char const * location;
browser->source = 0;
_idle_load_plugins(browser); _idle_load_plugins(browser);
if((location = browser_get_location(browser)) == NULL) if((location = browser_get_location(browser)) == NULL)
browser_go_home(browser); browser_go_home(browser);
@ -626,6 +628,8 @@ static void _delete_plugins(Browser * browser);
void browser_delete(Browser * browser) void browser_delete(Browser * browser)
{ {
if(browser->source != 0)
g_source_remove(browser->source);
_delete_plugins(browser); _delete_plugins(browser);
if(browser->config != NULL) if(browser->config != NULL)
config_delete(browser->config); config_delete(browser->config);

4
src/browser.h
View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2006-2012 Pierre Pronchery <khorben@defora.org> */ /* Copyright (c) 2006-2013 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS Desktop Browser */ /* This file is part of DeforaOS Desktop Browser */
/* This program is free software: you can redistribute it and/or modify /* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -89,6 +89,8 @@ typedef struct _BrowserPrefs
struct _Browser struct _Browser
{ {
guint source;
/* config */ /* config */
Config * config; Config * config;
BrowserPrefs prefs; BrowserPrefs prefs;