diff options
29 files changed, 98 insertions, 35 deletions
@@ -1,3 +1,39 @@ +2006-12-15 Christian Persch <chpe@cvs.gnome.org> + + * embed/mozilla/ContentHandler.cpp: + * embed/mozilla/GeckoPrintService.cpp: + * embed/mozilla/GtkNSSClientAuthDialogs.cpp: + * embed/mozilla/GtkNSSDialogs.cpp: + * embed/mozilla/GtkNSSKeyPairDialogs.cpp: + * embed/mozilla/GtkNSSSecurityWarningDialogs.cpp: + * lib/ephy-file-chooser.c: (ephy_file_chooser_constructor): + * lib/ephy-gui.c: (ephy_gui_check_location_writable): + * lib/ephy-module.c: + * lib/ephy-password-dialog.c: (ephy_password_dialog_constructor): + * lib/ephy-spell-check.c: + * lib/ephy-stock-icons.h: + * lib/widgets/.cvsignore: + * lib/widgets/ephy-spinner-tool-item.c: + (ephy_spinner_tool_item_toolbar_reconfigured): + * lib/widgets/testspinner.c: + * plugins/desktop-file/plugin.cpp: + * src/bookmarks/ephy-bookmarks.c: (redirect_cb): + * src/ephy-history-window.c: (confirmation_dialog_construct): + * src/ephy-main.c: (main): + * src/ephy-session.c: (confirm_shutdown_cb), + (session_command_autoresume): + * src/ephy-shell.c: (ephy_shell_add_sidebar_cb): + * src/ephy-toolbar-editor.c: (ephy_toolbar_editor_constructor): + * src/ephy-window.c: (construct_confirm_close_dialog): + * src/pdm-dialog.c: (pdm_dialog_init): + * src/window-commands.c: (window_cmd_help_about): + + Use a define for the default window icon. Bug #385872. + + * lib/ephy-module.c: + + The symbol can be NULL even though the symbol lookup succeeded. + 2006-12-14 Chhristian Persch <chpe@cvs.gnome.org> * data/default-prefs-common.js: diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml index c272fdf26..5c6a8c225 100644 --- a/doc/reference/tmpl/ephy-embed.sgml +++ b/doc/reference/tmpl/ephy-embed.sgml @@ -268,7 +268,6 @@ be done by casting). @: @: @: -@: @: @Param2: @Param3: diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index 3e743c40c..4cc5d7f30 100644 --- a/embed/ephy-embed.c +++ b/embed/ephy-embed.c @@ -418,6 +418,7 @@ void ephy_embed_load_url (EphyEmbed *embed, const char *url) { + /* Remove that crap patch please */ EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); iface->load_url (embed, url); } diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index 2948514eb..7815b5da8 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -327,7 +327,7 @@ NS_METHOD GContentHandler::MIMEConfirmAction () gtk_dialog_add_button (GTK_DIALOG (dialog), action_label, mAction); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); int defaultResponse = mAction == CONTENT_ACTION_NONE ? (int) GTK_RESPONSE_CANCEL diff --git a/embed/mozilla/GeckoPrintService.cpp b/embed/mozilla/GeckoPrintService.cpp index 5a4ca358f..59a9c3734 100644 --- a/embed/mozilla/GeckoPrintService.cpp +++ b/embed/mozilla/GeckoPrintService.cpp @@ -44,6 +44,7 @@ #include "ephy-file-helpers.h" #include "ephy-gui.h" #include "ephy-prefs.h" +#include "ephy-stock-icons.h" #include "AutoJSContextStack.h" #include "AutoWindowModalState.h" @@ -174,7 +175,7 @@ GeckoPrintService::ShowPrintDialog (nsIDOMWindow *aParent, g_object_unref (custom_tab); g_object_unref (xml); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); int response = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_hide (dialog); @@ -422,7 +423,7 @@ GeckoPrintService::PrintUnattended (nsIDOMWindow *aParent, "%s", _("Preparing to print")); } gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); FindPrinterData *data = g_new0 (PrinterData, 1); diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp index 54590deea..285d8bdcc 100644 --- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp +++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp @@ -55,6 +55,7 @@ #include "ephy-debug.h" #include "ephy-gui.h" #include "ephy-state.h" +#include "ephy-stock-icons.h" #include "AutoJSContextStack.h" #include "AutoWindowModalState.h" @@ -170,7 +171,7 @@ GtkNSSClientAuthDialogs::ChooseCertificate (nsIInterfaceRequestor *ctx, GTK_WINDOW (dialog)); } - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp index ddf14848f..d7c5df20b 100644 --- a/embed/mozilla/GtkNSSDialogs.cpp +++ b/embed/mozilla/GtkNSSDialogs.cpp @@ -86,6 +86,7 @@ #include "ephy-file-helpers.h" #include "ephy-gui.h" #include "ephy-password-dialog.h" +#include "ephy-stock-icons.h" #include "AutoJSContextStack.h" #include "AutoWindowModalState.h" @@ -253,7 +254,7 @@ display_cert_warning_box (nsIInterfaceRequestor *ctx, } gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); higgy_setup_dialog (GTK_DIALOG (dialog), GTK_STOCK_DIALOG_WARNING, &label, &vbox); @@ -591,7 +592,7 @@ GtkNSSDialogs::NotifyCrlNextupdate (nsIInterfaceRequestor *ctx, "needs to be updated.\n\n" "Please ask your system administrator for assistance."), NS_ConvertUTF16toUTF8 (commonName).get ()); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); g_signal_connect (dialog, "response", (GCallback) gtk_widget_destroy, NULL); @@ -633,7 +634,7 @@ GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx, GTK_WINDOW (dialog)); } - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); higgy_setup_dialog (GTK_DIALOG (dialog), GTK_STOCK_DIALOG_WARNING, &label, NULL); @@ -714,7 +715,7 @@ GtkNSSDialogs::NotifyCACertExists (nsIInterfaceRequestor *ctx) GTK_WINDOW (dialog)); } - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); higgy_setup_dialog (GTK_DIALOG (dialog), GTK_STOCK_DIALOG_ERROR, &label, NULL); @@ -882,7 +883,7 @@ GtkNSSDialogs::CrlImportStatusDialog(nsIInterfaceRequestor *ctx, nsICRLInfo *crl GTK_STOCK_OK, GTK_RESPONSE_OK, (char *) NULL); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); gtk_window_set_title (GTK_WINDOW (dialog), _("Certificate Revocation List Imported")); /* Needed because gparent == NULL always because of mozilla sucks */ @@ -1229,7 +1230,7 @@ GtkNSSDialogs::ViewCert(nsIInterfaceRequestor *ctx, gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); } - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); gtk_window_set_title (GTK_WINDOW (dialog), _("Certificate Properties")); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); @@ -1580,7 +1581,7 @@ GtkNSSDialogs::ChooseToken (nsIInterfaceRequestor *aContext, GTK_BUTTONS_CANCEL, _("Please select a token:")); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); GtkWidget *combo = gtk_combo_box_new_text (); for (PRUint32 i = 0; i < count; ++i) { @@ -1667,7 +1668,7 @@ GtkNSSDialogs::ConfirmKeyEscrow (nsIX509Cert *aEscrowAuthority, "It is strongly recommended not to allow it."), NS_ConvertUTF16toUTF8 (commonName).get ()); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); GtkWidget *button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Reject"), diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp index 2d4b63135..29d6c5511 100644 --- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp +++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp @@ -47,6 +47,7 @@ #include "ephy-debug.h" #include "ephy-gui.h" +#include "ephy-stock-icons.h" #include "AutoJSContextStack.h" #include "AutoWindowModalState.h" @@ -160,7 +161,7 @@ GtkNSSKeyPairDialogs::DisplayGeneratingKeypairInfo (nsIInterfaceRequestor *ctx, GTK_WINDOW (dialog)); } - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); diff --git a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp index c5091046b..3d9ee5962 100644 --- a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp +++ b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp @@ -51,6 +51,8 @@ #include <gtk/gtklabel.h> #include <gtk/gtkvbox.h> +#include "ephy-stock-icons.h" + #include <nsCOMPtr.h> #include <nsIDOMWindow.h> #include <nsIInterfaceRequestor.h> @@ -264,7 +266,7 @@ GtkNSSSecurityWarningDialogs::DoDialog (nsIInterfaceRequestor *aContext, gtk_dialog_set_default_response (GTK_DIALOG (dialog), aDefaultResponse); gtk_window_set_title (GTK_WINDOW (dialog), aTitle); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); int response = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c index 5988c92d4..49077456b 100644 --- a/lib/ephy-file-chooser.c +++ b/lib/ephy-file-chooser.c @@ -27,6 +27,7 @@ #include "ephy-state.h" #include "ephy-gui.h" #include "ephy-debug.h" +#include "ephy-stock-icons.h" #include <gtk/gtkstock.h> #include <libgnomevfs/gnome-vfs-utils.h> @@ -116,7 +117,7 @@ ephy_file_chooser_constructor (GType type, (GTK_FILE_CHOOSER (object), downloads_dir, NULL); g_free (downloads_dir); - gtk_window_set_icon_name (GTK_WINDOW (object), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (object), EPHY_STOCK_EPHY); return object; } diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c index 0b3fc7794..28fd6fcc9 100644 --- a/lib/ephy-gui.c +++ b/lib/ephy-gui.c @@ -22,6 +22,7 @@ #include "ephy-gui.h" #include "eel-gconf-extensions.h" +#include "ephy-stock-icons.h" #include "ephy-debug.h" #include <ctype.h> @@ -297,7 +298,7 @@ ephy_gui_check_location_writable (GtkWidget *parent, "create files in this directory.")); gtk_window_set_title (GTK_WINDOW (dialog), _("Directory not Writable")); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); if (parent != NULL) { @@ -334,7 +335,7 @@ ephy_gui_check_location_writable (GtkWidget *parent, "you don't have permission to overwrite it.")); gtk_window_set_title (GTK_WINDOW (dialog), _("Cannot Overwrite File")); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); if (parent != NULL) { diff --git a/lib/ephy-module.c b/lib/ephy-module.c index 848a77413..97710fc08 100644 --- a/lib/ephy-module.c +++ b/lib/ephy-module.c @@ -139,7 +139,14 @@ ephy_module_load (GTypeModule *gmodule) return FALSE; } - g_assert (register_func); + /* symbol can still be NULL even though g_module_symbol returned TRUE */ + if (!register_func) + { + g_warning ("Symbol 'register_module' is NULL!"); + g_module_close (module->library); + + return FALSE; + } module->type = register_func (gmodule); diff --git a/lib/ephy-password-dialog.c b/lib/ephy-password-dialog.c index b1a6094f9..12ac55cfb 100644 --- a/lib/ephy-password-dialog.c +++ b/lib/ephy-password-dialog.c @@ -35,6 +35,7 @@ #include "ephy-gui.h" #include "ephy-lib-type-builtins.h" #include "ephy-state.h" +#include "ephy-stock-icons.h" #include "ephy-password-dialog.h" @@ -375,7 +376,7 @@ ephy_password_dialog_constructor (GType type, gtk_box_set_spacing (GTK_BOX (dialog->vbox), 2); /* Message has 24, we want 12 = 2 + 2 * 5 */ // gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); - gtk_window_set_icon_name (window, "web-browser"); + gtk_window_set_icon_name (window, EPHY_STOCK_EPHY); gtk_image_set_from_icon_name (GTK_IMAGE (message_dialog->image), GTK_STOCK_DIALOG_AUTHENTICATION, diff --git a/lib/ephy-spell-check.c b/lib/ephy-spell-check.c index 9d8059461..6e23dca65 100755 --- a/lib/ephy-spell-check.c +++ b/lib/ephy-spell-check.c @@ -43,7 +43,7 @@ enum LAST_SIGNAL }; -static guint signals[LAST_SIGNAL]; +/* static guint signals[LAST_SIGNAL]; */ static GObjectClass *parent_class; /* Helper functions */ diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h index b50d3ed20..220048ca8 100644 --- a/lib/ephy-stock-icons.h +++ b/lib/ephy-stock-icons.h @@ -23,6 +23,8 @@ G_BEGIN_DECLS +#define EPHY_STOCK_EPHY "web-browser" + #define EPHY_STOCK_POPUPS "popup-hidden" #define EPHY_STOCK_HISTORY "history-view" #define EPHY_STOCK_BOOKMARKS "bookmark-view" diff --git a/lib/widgets/.cvsignore b/lib/widgets/.cvsignore index 20e4cb0c8..ebb9363e5 100644 --- a/lib/widgets/.cvsignore +++ b/lib/widgets/.cvsignore @@ -4,3 +4,4 @@ Makefile.in .deps .libs *.la +testspinner diff --git a/lib/widgets/ephy-spinner-tool-item.c b/lib/widgets/ephy-spinner-tool-item.c index d92e7f9ed..2d72d133e 100644 --- a/lib/widgets/ephy-spinner-tool-item.c +++ b/lib/widgets/ephy-spinner-tool-item.c @@ -54,7 +54,7 @@ ephy_spinner_tool_item_toolbar_reconfigured (GtkToolItem *tool_item) if (style == GTK_TOOLBAR_BOTH) { - spinner_size = GTK_ICON_SIZE_INVALID; + spinner_size = GTK_ICON_SIZE_DIALOG; } else { diff --git a/lib/widgets/testspinner.c b/lib/widgets/testspinner.c index f986d752f..50d9c6b62 100644 --- a/lib/widgets/testspinner.c +++ b/lib/widgets/testspinner.c @@ -1,5 +1,5 @@ /* - * Copyright © 2005 Christian Persch + * Copyright © 2005, 2006 Christian Persch * * 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 diff --git a/plugins/desktop-file/plugin.cpp b/plugins/desktop-file/plugin.cpp index d8ac80f38..d9c6bb531 100644 --- a/plugins/desktop-file/plugin.cpp +++ b/plugins/desktop-file/plugin.cpp @@ -34,6 +34,8 @@ #include <gtk/gtkwindow.h> #include <gtk/gtkmessagedialog.h> +#include "ephy-stock-icons.h" + #include <npupp.h> #include <nsCOMPtr.h> #include <nsIDOMWindow.h> @@ -206,7 +208,7 @@ show_error_dialog (NPP instance, gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), secondary_text); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index 89341ae70..9196a271c 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -36,6 +36,7 @@ #include "ephy-prefs.h" #include "ephy-marshal.h" #include "ephy-signal-accumulator.h" +#include "ephy-stock-icons.h" #include "eel-gconf-extensions.h" @@ -496,7 +497,7 @@ redirect_cb (EphyHistory *history, gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_REJECT); gtk_window_set_title (GTK_WINDOW (dialog), _("Update Bookmark?")); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); g_object_set_data_full (G_OBJECT (dialog), UPDATE_URI_DATA_KEY, g_strdup (to_uri), (GDestroyNotify) g_free); diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c index 3f3c1d9af..88fe946fe 100644 --- a/src/ephy-history-window.c +++ b/src/ephy-history-window.c @@ -272,7 +272,7 @@ confirmation_dialog_construct (EphyHistoryWindow *editor) gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); gtk_window_set_title (GTK_WINDOW (dialog), _("Clear History")); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); g_signal_connect (dialog, "response", G_CALLBACK (confirmation_dialog_response_cb), diff --git a/src/ephy-main.c b/src/ephy-main.c index 396942b8f..3ad0b84ed 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -611,7 +611,7 @@ main (int argc, g_set_application_name (_("Web Browser")); /* Set default window icon */ - gtk_window_set_default_icon_name ("web-browser"); + gtk_window_set_default_icon_name (EPHY_STOCK_EPHY); startup_error_quark = g_quark_from_static_string ("epiphany-startup-error"); diff --git a/src/ephy-session.c b/src/ephy-session.c index ef46e02a2..1214d9e07 100644 --- a/src/ephy-session.c +++ b/src/ephy-session.c @@ -34,6 +34,7 @@ #include "ephy-prefs.h" #include "ephy-gui.h" #include "ephy-debug.h" +#include "ephy-stock-icons.h" #include <glib/gi18n.h> #include <gtk/gtkmain.h> @@ -282,7 +283,7 @@ confirm_shutdown_cb (GnomeClient *client, _("_Abort Downloads"), GTK_RESPONSE_ACCEPT); gtk_window_set_title (GTK_WINDOW (dialog), ""); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_REJECT); @@ -617,7 +618,7 @@ session_command_autoresume (EphySession *session, _("_Recover"), GTK_RESPONSE_ACCEPT); gtk_window_set_title (GTK_WINDOW (dialog), _("Crash Recovery")); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); diff --git a/src/ephy-shell.c b/src/ephy-shell.c index e6a3ecf8a..1d87daedb 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -52,6 +52,7 @@ #include "ephy-toolbar.h" #include "ephy-prefs.h" #include "ephy-gui.h" +#include "ephy-stock-icons.h" #ifdef ENABLE_NETWORK_MANAGER #include "ephy-net-monitor.h" @@ -199,7 +200,7 @@ ephy_shell_add_sidebar_cb (EphyEmbedSingle *embed_single, _("Sidebar extension required")); gtk_window_set_title (GTK_WINDOW (dialog), _("Sidebar Extension Required")); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("The link you clicked needs the sidebar extension to be " diff --git a/src/ephy-toolbar-editor.c b/src/ephy-toolbar-editor.c index c95cfb836..db3dc3031 100644 --- a/src/ephy-toolbar-editor.c +++ b/src/ephy-toolbar-editor.c @@ -32,6 +32,7 @@ #include "egg-editable-toolbar.h" #include "egg-toolbar-editor.h" #include "eel-gconf-extensions.h" +#include "ephy-stock-icons.h" #include "ephy-debug.h" #include <glib/gi18n.h> @@ -199,7 +200,7 @@ ephy_toolbar_editor_constructor (GType type, gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2); gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_window_set_title (GTK_WINDOW (dialog), _("Toolbar Editor")); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (priv->window)); gtk_window_group_add_window (ephy_gui_ensure_window_group (GTK_WINDOW (priv->window)), diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c index a4c4bd8b7..fb189e774 100755 --- a/src/ephy-toolbar.c +++ b/src/ephy-toolbar.c @@ -560,7 +560,7 @@ ephy_toolbar_constructor (GType type, gtoolbar = GTK_TOOLBAR (priv->fixed_toolbar); gtk_toolbar_set_show_arrow (gtoolbar, FALSE); - priv->spinner = ephy_spinner_tool_item_new (); + priv->spinner = EPHY_SPINNER_TOOL_ITEM (ephy_spinner_tool_item_new ()); gtk_toolbar_insert (gtoolbar, GTK_TOOL_ITEM (priv->spinner), -1); gtk_widget_show (GTK_WIDGET (priv->spinner)); diff --git a/src/ephy-window.c b/src/ephy-window.c index 4d7709688..9d626cb1a 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -756,7 +756,7 @@ construct_confirm_close_dialog (EphyWindow *window) gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); /* FIXME gtk_window_set_title (GTK_WINDOW (dialog), _("Close Document?")); */ - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); gtk_window_group_add_window (GTK_WINDOW (window)->group, GTK_WINDOW (dialog)); diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c index b3052f8d2..006d252be 100755 --- a/src/pdm-dialog.c +++ b/src/pdm-dialog.c @@ -30,6 +30,7 @@ #include "ephy-gui.h" #include "ephy-state.h" #include "ephy-string.h" +#include "ephy-stock-icons.h" #include "ephy-debug.h" #include <gtk/gtklabel.h> @@ -1205,7 +1206,7 @@ pdm_dialog_init (PdmDialog *dialog) ephy_gui_ensure_window_group (GTK_WINDOW (window)); - gtk_window_set_icon_name (GTK_WINDOW (window), "web-browser"); + gtk_window_set_icon_name (GTK_WINDOW (window), EPHY_STOCK_EPHY); g_signal_connect (window, "response", G_CALLBACK (pdm_dialog_response_cb), dialog); diff --git a/src/window-commands.c b/src/window-commands.c index 97f15d709..318f584f3 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -46,6 +46,7 @@ #include "ephy-location-entry.h" #include "ephy-bookmarks-ui.h" #include "ephy-link.h" +#include "ephy-stock-icons.h" #include "pdm-dialog.h" #include <string.h> @@ -801,7 +802,7 @@ window_cmd_help_about (GtkAction *action, * line seperated by newlines (\n). */ "translator-credits", _("translator-credits"), - "logo-icon-name", "web-browser", + "logo-icon-name", EPHY_STOCK_EPHY, "website", "http://www.gnome.org/projects/epiphany", "website-label", _("GNOME Web Browser Website"), "license", licence, |