diff options
| author | James Bursa <james@netsurf-browser.org> | 2007-01-27 19:29:28 +0000 |
|---|---|---|
| committer | James Bursa <james@netsurf-browser.org> | 2007-01-27 19:29:28 +0000 |
| commit | cd98970628e9cfcea702df8038ed653a8d1ea6a2 (patch) | |
| tree | d36ef2b7a0e722b8fffd844fdaa9477047806f1a | |
| parent | 2928eeca28c4c9b809f624fc173f1b2869cd2bf1 (diff) | |
| download | netsurf-cd98970628e9cfcea702df8038ed653a8d1ea6a2.tar.gz netsurf-cd98970628e9cfcea702df8038ed653a8d1ea6a2.tar.bz2 | |
Fix mouse events. Fix some GTK warnings.
svn path=/trunk/netsurf/; revision=3150
| -rw-r--r-- | gtk/gtk_options.c | 12 | ||||
| -rw-r--r-- | gtk/gtk_window.c | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gtk/gtk_options.c b/gtk/gtk_options.c index b5ad9f0d9..f91c4d2ee 100644 --- a/gtk/gtk_options.c +++ b/gtk/gtk_options.c @@ -111,17 +111,21 @@ void nsgtk_options_init(void) { void nsgtk_options_load(void) { char b[20]; - SET_ENTRY(entryHomePageURL, option_homepage_url); + SET_ENTRY(entryHomePageURL, + option_homepage_url ? option_homepage_url : ""); SET_CHECK(checkHideAdverts, option_block_ads); SET_CHECK(checkDisplayRecentURLs, option_url_suggestion); SET_CHECK(checkSendReferer, option_send_referer); SET_COMBO(comboProxyType, option_http_proxy_auth); - SET_ENTRY(entryProxyHost, option_http_proxy_host); + SET_ENTRY(entryProxyHost, + option_http_proxy_host ? option_http_proxy_host : ""); snprintf(b, 20, "%d", option_http_proxy_port); SET_ENTRY(entryProxyPort, b); - SET_ENTRY(entryProxyUser, option_http_proxy_auth_user); - SET_ENTRY(entryProxyPassword, option_http_proxy_auth_pass); + SET_ENTRY(entryProxyUser, option_http_proxy_auth_user ? + option_http_proxy_auth_user : ""); + SET_ENTRY(entryProxyPassword, option_http_proxy_auth_pass ? + option_http_proxy_auth_pass : ""); SET_SPIN(spinMaxFetchers, option_max_fetchers); SET_SPIN(spinFetchesPerHost, option_max_fetchers_per_host); diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c index 618637f62..6b72932bd 100644 --- a/gtk/gtk_window.c +++ b/gtk/gtk_window.c @@ -194,7 +194,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, /* set the events we're interested in receiving from the browser's * drawing area. */ - gtk_widget_set_events(GTK_WIDGET(g->drawing_area), + gtk_widget_add_events(GTK_WIDGET(g->drawing_area), GDK_EXPOSURE_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_BUTTON_PRESS_MASK | |