From ba23e4b69341e5f3f2dbcd824663e75ebe2a581f Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 27 Nov 2006 15:35:18 +0000 Subject: Update project URL. svn path=/trunk/netsurf/; revision=3073 --- gtk/font_pango.c | 24 ++++++++++++------------ gtk/font_pango.h | 2 +- gtk/gtk_bitmap.c | 12 ++++++------ gtk/gtk_bitmap.h | 2 +- gtk/gtk_completion.c | 8 ++++---- gtk/gtk_completion.h | 2 +- gtk/gtk_gui.c | 28 ++++++++++++++-------------- gtk/gtk_gui.h | 2 +- gtk/gtk_history.c | 36 ++++++++++++++++++------------------ gtk/gtk_history.h | 2 +- gtk/gtk_login.c | 8 ++++---- gtk/gtk_options.c | 22 +++++++++++----------- gtk/gtk_options.h | 2 +- gtk/gtk_plotters.c | 2 +- gtk/gtk_plotters.h | 2 +- gtk/gtk_schedule.c | 8 ++++---- gtk/gtk_throbber.c | 42 +++++++++++++++++++++--------------------- gtk/gtk_throbber.h | 2 +- gtk/gtk_thumbnail.c | 2 +- gtk/gtk_treeview.c | 2 +- gtk/gtk_window.c | 16 ++++++++-------- gtk/gtk_window.h | 2 +- gtk/options.h | 2 +- gtk/res/netsurf.glade | 2 +- 24 files changed, 116 insertions(+), 116 deletions(-) (limited to 'gtk') diff --git a/gtk/font_pango.c b/gtk/font_pango.c index 90d1a150c..c0d107988 100644 --- a/gtk/font_pango.c +++ b/gtk/font_pango.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 James Bursa @@ -164,7 +164,7 @@ bool nsfont_split(const struct css_style *style, *char_offset = index; *actual_x = PANGO_PIXELS(rect.width); - + return true; } @@ -216,10 +216,10 @@ bool nsfont_paint(const struct css_style *style, context = gdk_pango_context_get(); layout = pango_layout_new(context); #endif - + pango_layout_set_font_description(layout, desc); pango_layout_set_text(layout, string, length); - + #ifdef CAIRO_VERSION pango_layout_get_pixel_size(layout, &width, &height); cairo_move_to(current_cr, x, y - height); @@ -256,7 +256,7 @@ PangoFontDescription *nsfont_style_to_description( PangoStyle styl = PANGO_STYLE_NORMAL; assert(style->font_size.size == CSS_FONT_SIZE_LENGTH); - + switch (style->font_family) { case CSS_FONT_FAMILY_SERIF: desc = pango_font_description_from_string(option_font_serif); @@ -275,16 +275,16 @@ PangoFontDescription *nsfont_style_to_description( desc = pango_font_description_from_string(option_font_sans); break; } - - + + if (style->font_size.value.length.unit == CSS_UNIT_PX) size = style->font_size.value.length.value; else size = css_len2pt(&style->font_size.value.length, style); - + if (size < abs(option_font_min_size / 10)) size = option_font_min_size / 10; - + size *= PANGO_SCALE; switch (style->font_style) { @@ -299,7 +299,7 @@ PangoFontDescription *nsfont_style_to_description( } pango_font_description_set_style(desc, styl); - + switch (style->font_weight) { case CSS_FONT_WEIGHT_NORMAL: weight = PANGO_WEIGHT_NORMAL; break; @@ -323,7 +323,7 @@ PangoFontDescription *nsfont_style_to_description( pango_font_description_set_absolute_size(desc, size); else pango_font_description_set_size(desc, size); - + switch (style->font_variant) { case CSS_FONT_VARIANT_SMALL_CAPS: pango_font_description_set_variant(desc, PANGO_VARIANT_SMALL_CAPS); @@ -332,6 +332,6 @@ PangoFontDescription *nsfont_style_to_description( default: pango_font_description_set_variant(desc, PANGO_VARIANT_NORMAL); } - + return desc; } diff --git a/gtk/font_pango.h b/gtk/font_pango.h index 758b8273b..b99629834 100644 --- a/gtk/font_pango.h +++ b/gtk/font_pango.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 James Bursa diff --git a/gtk/gtk_bitmap.c b/gtk/gtk_bitmap.c index e33b436d0..a587a0768 100644 --- a/gtk/gtk_bitmap.c +++ b/gtk/gtk_bitmap.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 James Bursa @@ -182,7 +182,7 @@ void bitmap_modified(struct bitmap *bitmap) { */ void bitmap_set_suspendable(struct bitmap *bitmap, void *private_word, void (*invalidate)(struct bitmap *bitmap, void *private_word)) { -} +} static GdkPixbuf * gtk_bitmap_generate_pretile(GdkPixbuf *primary, int repeat_x, int repeat_y) @@ -197,18 +197,18 @@ gtk_bitmap_generate_pretile(GdkPixbuf *primary, int repeat_x, int repeat_y) int x,y,row; /* This algorithm won't work if the strides are not multiples */ assert(target_stride == (primary_stride * repeat_x)); - + if (repeat_x == 1 && repeat_y == 1) { g_object_ref(primary); g_object_unref(result); return primary; } - + for (y = 0; y < repeat_y; ++y) { char *primary_buffer = (char *)gdk_pixbuf_get_pixels(primary); for (row = 0; row < height; ++row) { for (x = 0; x < repeat_x; ++x) { - memcpy(target_buffer, + memcpy(target_buffer, primary_buffer, primary_stride); target_buffer += primary_stride; } @@ -245,7 +245,7 @@ gtk_bitmap_get_pretile_x(struct bitmap* bitmap) bitmap->pretile_x = gtk_bitmap_generate_pretile(bitmap->primary, xmult, 1); } return bitmap->pretile_x; - + } /** diff --git a/gtk/gtk_bitmap.h b/gtk/gtk_bitmap.h index 719bb0ab5..61a800b5d 100644 --- a/gtk/gtk_bitmap.h +++ b/gtk/gtk_bitmap.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Daniel Silverstone diff --git a/gtk/gtk_completion.c b/gtk/gtk_completion.c index 7ad9897d2..dd6aa086f 100644 --- a/gtk/gtk_completion.c +++ b/gtk/gtk_completion.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Rob Kendrick @@ -20,7 +20,7 @@ static bool nsgtk_completion_udb_callback(const char *url, void nsgtk_completion_init(void) { nsgtk_completion_list = gtk_list_store_new(1, G_TYPE_STRING); - + } gboolean nsgtk_completion_match(GtkEntryCompletion *completion, @@ -34,7 +34,7 @@ gboolean nsgtk_completion_match(GtkEntryCompletion *completion, /* TODO: work out why this works, when there's no code to implement * it. I boggle. */ - + return TRUE; } @@ -47,7 +47,7 @@ void nsgtk_completion_empty(void) bool nsgtk_completion_udb_callback(const char *url, const struct url_data *data) { GtkTreeIter iter; - + if (data->visits != 0) { gtk_list_store_append(nsgtk_completion_list, &iter); gtk_list_store_set(nsgtk_completion_list, &iter, 0, url, -1); diff --git a/gtk/gtk_completion.h b/gtk/gtk_completion.h index 73cda1eae..bccf4084f 100644 --- a/gtk/gtk_completion.h +++ b/gtk/gtk_completion.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Rob Kendrick diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index 413d3320a..d38a0fa17 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_gui.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 James Bursa @@ -110,7 +110,7 @@ static char *find_resource(char *buf, const char *filename, const char *def) } else { realpath(def, buf); } - + return buf; } @@ -121,14 +121,14 @@ static void check_homedir(void) { char *hdir = getenv("HOME"); char buf[BUFSIZ]; - + if (hdir == NULL) { /* we really can't continue without a home directory. */ LOG(("HOME is not set - nowhere to store state!")); die("NetSurf requires HOME to be set in order to run.\n"); - + } - + snprintf(buf, BUFSIZ, "%s/.netsurf", hdir); if (access(buf, F_OK) != 0) { LOG(("You don't have a ~/.netsurf - creating one for you.")); @@ -144,23 +144,23 @@ void gui_init(int argc, char** argv) char buf[PATH_MAX]; gtk_init(&argc, &argv); - + check_homedir(); - + find_resource(buf, "netsurf.glade", "./gtk/netsurf.glade"); LOG(("Using '%s' as Glade template file", buf)); glade_file_location = strdup(buf); - + glade_init(); gladeWindows = glade_xml_new(glade_file_location, NULL, NULL); if (gladeWindows == NULL) die("Unable to load Glade window definitions.\n"); glade_xml_signal_autoconnect(gladeWindows); - + wndTooltip = glade_xml_get_widget(gladeWindows, "wndTooltip"); labelTooltip = glade_xml_get_widget(gladeWindows, "tooltip"); - nsgtk_completion_init(); + nsgtk_completion_init(); find_resource(buf, "throbber.gif", "./gtk/throbber.gif"); nsgtk_throbber_initialise(buf); @@ -218,7 +218,7 @@ void gui_init(int argc, char** argv) urldb_load(option_url_file); urldb_load_cookies(option_cookie_file); - + wndAbout = GTK_WINDOW(glade_xml_get_widget(gladeWindows, "wndAbout")); gtk_label_set_text(GTK_LABEL( glade_xml_get_widget(gladeWindows, "labelVersion")), @@ -232,7 +232,7 @@ void gui_init(int argc, char** argv) void gui_init2(int argc, char** argv) { - const char *addr = "http://netsurf.sourceforge.net/"; + const char *addr = "http://netsurf-browser.org/"; if (option_homepage_url != NULL) addr = option_homepage_url; @@ -347,10 +347,10 @@ void gui_create_form_select_menu(struct browser_window *bw, struct form_option *option; LOG(("Trying to open select menu...")); - + for (i = 0, option = control->data.select.items; option; i++, option = option->next) { - LOG(("Option: %s", option->text)); + LOG(("Option: %s", option->text)); } } diff --git a/gtk/gtk_gui.h b/gtk/gtk_gui.h index 30e0cb06f..448448425 100644 --- a/gtk/gtk_gui.h +++ b/gtk/gtk_gui.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 James Bursa diff --git a/gtk/gtk_history.c b/gtk/gtk_history.c index a93192408..424ce333e 100644 --- a/gtk/gtk_history.c +++ b/gtk/gtk_history.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Rob Kendrick @@ -33,7 +33,7 @@ static void nsgtk_history_selection_changed(GtkTreeSelection *, gpointer); void nsgtk_history_init(void) { GtkCellRenderer *renderer; - + wndHistory = GTK_WINDOW(glade_xml_get_widget(gladeWindows, "wndHistory")); treeview = GTK_TREE_VIEW(glade_xml_get_widget(gladeWindows, @@ -44,21 +44,21 @@ void nsgtk_history_init(void) G_TYPE_STRING, /* last visit */ G_TYPE_INT, /* nr. visits */ GDK_TYPE_PIXBUF); /* thumbnail */ - + selection = gtk_tree_view_get_selection(treeview); gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(nsgtk_history_selection_changed), NULL); - + renderer = gtk_cell_renderer_text_new(); gtk_tree_view_insert_column_with_attributes(treeview, -1, "Title", renderer, "text", COL_TITLE, NULL); - + gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(history_tree)); - + nsgtk_history_update(); } @@ -82,40 +82,40 @@ bool nsgtk_history_add_internal(const char *url, const struct url_data *data) COL_TOTALVISITS, data->visits, -1); } - + return true; } void nsgtk_history_selection_changed(GtkTreeSelection *treesel, gpointer g) { GtkTreeIter iter; - + if (gtk_tree_selection_get_selected(treesel, &history_tree, &iter)) { gchar *b; gint i; char buf[20]; - + gtk_tree_model_get(history_tree, &iter, COL_ADDRESS, &b, -1); gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(gladeWindows, "labelHistoryAddress")), b); - + gtk_tree_model_get(history_tree, &iter, COL_LASTVISIT, &b, -1); gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(gladeWindows, "labelHistoryLastVisit")), b); - + gtk_tree_model_get(history_tree, &iter, COL_TOTALVISITS, &i, -1); snprintf(buf, 20, "%d", i); gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(gladeWindows, "labelHistoryVisits")), buf); - - - + + + } else { - + } } @@ -124,14 +124,14 @@ void nsgtk_history_row_activated(GtkTreeView *tv, GtkTreePath *path, { GtkTreeModel *model; GtkTreeIter iter; - + model = gtk_tree_view_get_model(tv); if (gtk_tree_model_get_iter(model, &iter, path)) { gchar *b; - + gtk_tree_model_get(model, &iter, COL_ADDRESS, &b, -1); - + browser_window_create((const char *)b, NULL, NULL, true); } } diff --git a/gtk/gtk_history.h b/gtk/gtk_history.h index 230279b0b..8648e5ddd 100644 --- a/gtk/gtk_history.h +++ b/gtk/gtk_history.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Rob Kendrick diff --git a/gtk/gtk_login.c b/gtk/gtk_login.c index 9400a0699..176fc1339 100644 --- a/gtk/gtk_login.c +++ b/gtk/gtk_login.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Rob Kendrick @@ -65,8 +65,8 @@ void create_login_window(struct browser_window *bw, const char *host, GladeXML *x = glade_xml_new(glade_file_location, NULL, NULL); GtkWindow *wnd = GTK_WINDOW(glade_xml_get_widget(x, "wndLogin")); - GtkLabel *lhost, *lrealm; - GtkEntry *euser, *epass; + GtkLabel *lhost, *lrealm; + GtkEntry *euser, *epass; GtkButton *bok, *bcan; lhost = GTK_LABEL(glade_xml_get_widget(x, "labelLoginHost")); @@ -115,7 +115,7 @@ void create_login_window(struct browser_window *bw, const char *host, /* make sure the username entry box currently has the focus */ gtk_widget_grab_focus(GTK_WIDGET(euser)); - + /* finally, show the window */ gtk_widget_show(GTK_WIDGET(wnd)); } diff --git a/gtk/gtk_options.c b/gtk/gtk_options.c index 9a2f7b8e5..59a00927c 100644 --- a/gtk/gtk_options.c +++ b/gtk/gtk_options.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Rob Kendrick @@ -28,7 +28,7 @@ static GtkWidget *entryHomePageURL, *checkRequestOverwrite, *checkDisplayRecentURLs, *checkSendReferer, - + *comboProxyType, *entryProxyHost, *entryProxyPort, @@ -37,7 +37,7 @@ static GtkWidget *entryHomePageURL, *spinMaxFetchers, *spinFetchesPerHost, *spinCachedConnections, - + *checkUseCairo, *checkResampleImages, *spinAnimationSpeed, @@ -110,7 +110,7 @@ void nsgtk_options_init(void) { void nsgtk_options_load(void) { char b[20]; - + SET_ENTRY(entryHomePageURL, option_homepage_url); SET_CHECK(checkHideAdverts, option_block_ads); SET_CHECK(checkDisplayRecentURLs, option_url_suggestion); @@ -122,7 +122,7 @@ void nsgtk_options_load(void) { SET_ENTRY(entryProxyPort, b); SET_ENTRY(entryProxyUser, option_http_proxy_auth_user); SET_ENTRY(entryProxyPassword, option_http_proxy_auth_pass); - + SET_SPIN(spinMaxFetchers, option_max_fetchers); SET_SPIN(spinFetchesPerHost, option_max_fetchers_per_host); SET_SPIN(spinCachedConnections, option_max_cached_fetch_handles); @@ -156,7 +156,7 @@ void nsgtk_options_load(void) { void nsgtk_options_save(void) { char *b = NULL; int i; - + GET_ENTRY(entryHomePageURL, option_homepage_url); GET_CHECK(checkDisplayRecentURLs, option_url_suggestion); @@ -178,23 +178,23 @@ void nsgtk_options_save(void) { option_http_proxy_auth = OPTION_HTTP_PROXY_AUTH_NONE; break; } - + GET_ENTRY(entryProxyHost, option_http_proxy_host); GET_ENTRY(entryProxyPort, b); option_http_proxy_port = atoi(b); free(b); GET_ENTRY(entryProxyUser, option_http_proxy_auth_user); GET_ENTRY(entryProxyPassword, option_http_proxy_auth_pass); - + GET_SPIN(spinMaxFetchers, option_max_fetchers); GET_SPIN(spinFetchesPerHost, option_max_fetchers_per_host); - GET_SPIN(spinCachedConnections, option_max_cached_fetch_handles); + GET_SPIN(spinCachedConnections, option_max_cached_fetch_handles); GET_CHECK(checkUseCairo, option_render_cairo); GET_CHECK(checkResampleImages, option_render_resample); GET_SPIN(spinAnimationSpeed, option_minimum_gif_delay); option_minimum_gif_delay *= 10; - + GET_FONT(fontSansSerif, option_font_sans); GET_FONT(fontSerif, option_font_serif); GET_FONT(fontMonospace, option_font_mono); @@ -202,7 +202,7 @@ void nsgtk_options_save(void) { GET_FONT(fontFantasy, option_font_fantasy); GET_COMBO(comboDefault, option_font_default); option_font_default++; - + GET_SPIN(spinDefaultSize, option_font_size); option_font_size *= 10; GET_SPIN(spinMinimumSize, option_font_min_size); diff --git a/gtk/gtk_options.h b/gtk/gtk_options.h index 379b32c4b..15a7e934d 100644 --- a/gtk/gtk_options.h +++ b/gtk/gtk_options.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Rob Kendrick diff --git a/gtk/gtk_plotters.c b/gtk/gtk_plotters.c index b04c394d2..d782d6d13 100644 --- a/gtk/gtk_plotters.c +++ b/gtk/gtk_plotters.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Rob Kendrick diff --git a/gtk/gtk_plotters.h b/gtk/gtk_plotters.h index e758b417b..85ab4b9b0 100644 --- a/gtk/gtk_plotters.h +++ b/gtk/gtk_plotters.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 James Bursa diff --git a/gtk/gtk_schedule.c b/gtk/gtk_schedule.c index 071b6b95f..73568fa93 100644 --- a/gtk/gtk_schedule.c +++ b/gtk/gtk_schedule.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Daniel Silverstone @@ -32,7 +32,7 @@ static gboolean ns_generic_gtk_callback(gpointer data) return FALSE; } -void schedule_remove(void (*callback)(void *p), void *p) +void schedule_remove(void (*callback)(void *p), void *p) { _nsgtkcallback *cb; GList *l; @@ -47,7 +47,7 @@ void schedule_remove(void (*callback)(void *p), void *p) } } -void schedule(int t, void (*callback)(void *p), void *p) +void schedule(int t, void (*callback)(void *p), void *p) { _nsgtkcallback *cb = (_nsgtkcallback*)malloc(sizeof(_nsgtkcallback)); schedule_remove(callback, p); @@ -58,7 +58,7 @@ void schedule(int t, void (*callback)(void *p), void *p) g_timeout_add(t * 10, ns_generic_gtk_callback, cb); } -void schedule_run(void) +void schedule_run(void) { /* Nothing to do, the running is done via the gtk mainloop of joy */ } diff --git a/gtk/gtk_throbber.c b/gtk/gtk_throbber.c index a0b76b14d..a95cf1609 100644 --- a/gtk/gtk_throbber.c +++ b/gtk/gtk_throbber.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Rob Kendrick @@ -22,32 +22,32 @@ bool nsgtk_throbber_initialise(const char *fn) struct gif_animation *gif; /**< structure for gifread.c */ struct nsgtk_throbber *throb; /**< structure we generate */ int i; - + FILE *fh = fopen(fn, "rb"); - + if (fh == NULL) { LOG(("Unable to open throbber image '%s' for reading!", fn)); return false; } - + gif = (struct gif_animation *)malloc(sizeof(struct gif_animation)); throb = (struct nsgtk_throbber *)malloc(sizeof(struct nsgtk_throbber)); - + /* discover the size of the data file. */ fseek(fh, 0, SEEK_END); gif->buffer_size = ftell(fh); fseek(fh, 0, SEEK_SET); - + /* allocate a block of sufficient size, and load the data in. */ gif->gif_data = (unsigned char *)malloc(gif->buffer_size); fread(gif->gif_data, gif->buffer_size, 1, fh); fclose(fh); - + /* set current position within GIF file to beginning, in order to * signal to gifread that we're brand new. */ gif->buffer_position = 0; - + /* initialise the gif_animation structure. */ switch (gif_initialise(gif)) { @@ -69,9 +69,9 @@ bool nsgtk_throbber_initialise(const char *fn) return false; break; } - + throb->nframes = gif->frame_count; - + if (throb->nframes < 2) { /* we need at least two frames - one for idle, one for active */ @@ -97,35 +97,35 @@ bool nsgtk_throbber_initialise(const char *fn) throb->framedata[i] = gdk_pixbuf_copy( gtk_bitmap_get_primary(gif->frame_image)); } - + gif_finalise(gif); free(gif->gif_data); free(gif); - + /* debug code: save out each frame as a PNG to make sure decoding is - * working correctly. - + * working correctly. + for (i = 0; i < throb->nframes; i++) { char fname[20]; sprintf(fname, "frame%d.png", i); gdk_pixbuf_save(throb->framedata[i], fname, "png", NULL, NULL); } - */ - + */ + nsgtk_throbber = throb; - - return true; + + return true; } void nsgtk_throbber_finalise(void) { int i; - + for (i = 0; i < nsgtk_throbber->nframes; i++) gdk_pixbuf_unref(nsgtk_throbber->framedata[i]); - + free(nsgtk_throbber->framedata); free(nsgtk_throbber); - + nsgtk_throbber = NULL; } diff --git a/gtk/gtk_throbber.h b/gtk/gtk_throbber.h index 4c04a6904..04fb912c9 100644 --- a/gtk/gtk_throbber.h +++ b/gtk/gtk_throbber.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Rob Kendrick diff --git a/gtk/gtk_thumbnail.c b/gtk/gtk_thumbnail.c index c5e03c479..60c7b9752 100644 --- a/gtk/gtk_thumbnail.c +++ b/gtk/gtk_thumbnail.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Rob Kendrick diff --git a/gtk/gtk_treeview.c b/gtk/gtk_treeview.c index f62602c4d..9b5f2c2c0 100644 --- a/gtk/gtk_treeview.c +++ b/gtk/gtk_treeview.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 Richard Wilson diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c index cd952b220..636880bd5 100644 --- a/gtk/gtk_window.c +++ b/gtk/gtk_window.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Rob Kendrick @@ -494,7 +494,7 @@ gboolean nsgtk_window_reload_button_clicked(GtkWidget *widget, gpointer data) gboolean nsgtk_window_home_button_clicked(GtkWidget *widget, gpointer data) { struct gui_window *g = data; - static const char *addr = "http://netsurf.sourceforge.net/"; + static const char *addr = "http://netsurf-browser.org/"; if (option_homepage_url != NULL) addr = option_homepage_url; @@ -695,25 +695,25 @@ gboolean nsgtk_history_motion_notify_event(GtkWidget *widget, struct gtk_history_window *gw = g; const char *url; int winx, winy; - + // if (!option_history_tooltip) // return TRUE; - + url = history_position_url(gw->g->bw->history, event->x, event->y); if (url == NULL) { gtk_widget_hide(wndTooltip); return TRUE; } - + gtk_label_set_text(labelTooltip, url); gtk_window_get_position(gw->g->window, &winx, &winy); - + LOG(("winx = %d, winy = %d, event->x = %d, event->y = %d", winx, winy, event->x, event->y)); - + gtk_widget_show(GTK_WIDGET(wndTooltip)); gtk_window_move(wndTooltip, event->x + winx, event->y + winy); - + return TRUE; } diff --git a/gtk/gtk_window.h b/gtk/gtk_window.h index 6b446fc15..3da9d56f8 100644 --- a/gtk/gtk_window.h +++ b/gtk/gtk_window.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 James Bursa diff --git a/gtk/options.h b/gtk/options.h index f1763a66f..3796a1c43 100644 --- a/gtk/options.h +++ b/gtk/options.h @@ -1,4 +1,4 @@ -/* This s file is part of NetSurf, http://netsurf.sourceforge.net/ +/* This s file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Rob Kendrick diff --git a/gtk/res/netsurf.glade b/gtk/res/netsurf.glade index 1502408c8..42ab4f97d 100644 --- a/gtk/res/netsurf.glade +++ b/gtk/res/netsurf.glade @@ -1932,7 +1932,7 @@ True True 0 - http://netsurf.sourceforge.net/ + http://netsurf-browser.org/ True ● False -- cgit v1.2.3