diff options
author | Luca Ferretti <elle.uca@libero.it> | 2007-07-10 10:41:25 +0800 |
---|---|---|
committer | Luca Ferretti <lferrett@src.gnome.org> | 2007-07-10 10:41:25 +0800 |
commit | b9c8581d793e52e73c99d41e83f5b33bd20b1af5 (patch) | |
tree | fd378044b93658f382f7ea10e8fac2d31e339308 | |
parent | f0b96d2a26d92216e84dcf21f2875b5d567f1843 (diff) | |
download | gsoc2013-epiphany-b9c8581d793e52e73c99d41e83f5b33bd20b1af5.tar.gz gsoc2013-epiphany-b9c8581d793e52e73c99d41e83f5b33bd20b1af5.tar.zst gsoc2013-epiphany-b9c8581d793e52e73c99d41e83f5b33bd20b1af5.zip |
Kill EPHY_STOCK_DOWNLOAD and add STOCK_DOWNLOAD, using "emblem-download"
2007-07-10 Luca Ferretti <elle.uca@libero.it>
* embed/downloader-view.c: (show_status_icon),
(downloader_view_build_ui):
* embed/mozilla/ContentHandler.cpp:
* lib/ephy-stock-icons.c: (ephy_stock_icons_init):
* lib/ephy-stock-icons.h:
* src/ephy-window.c:
Kill EPHY_STOCK_DOWNLOAD and add STOCK_DOWNLOAD, using
"emblem-download" named icon. Partially fix 450904.
Note: you need latest svn version of gnome-icon-theme
to have the download icon @ 16x16 pixels
svn path=/trunk/; revision=7126
-rw-r--r-- | ChangeLog | 15 | ||||
-rw-r--r-- | embed/downloader-view.c | 4 | ||||
-rw-r--r-- | embed/mozilla/ContentHandler.cpp | 2 | ||||
-rw-r--r-- | lib/ephy-stock-icons.c | 2 | ||||
-rw-r--r-- | lib/ephy-stock-icons.h | 2 | ||||
-rw-r--r-- | src/ephy-window.c | 2 |
6 files changed, 21 insertions, 6 deletions
@@ -1,3 +1,18 @@ +2007-07-10 Luca Ferretti <elle.uca@libero.it> + + * embed/downloader-view.c: (show_status_icon), + (downloader_view_build_ui): + * embed/mozilla/ContentHandler.cpp: + * lib/ephy-stock-icons.c: (ephy_stock_icons_init): + * lib/ephy-stock-icons.h: + * src/ephy-window.c: + + Kill EPHY_STOCK_DOWNLOAD and add STOCK_DOWNLOAD, using + "emblem-download" named icon. Partially fix 450904. + + Note: you need latest svn version of gnome-icon-theme + to have the download icon @ 16x16 pixels + 2007-07-09 Christian Persch <chpe@gnome.org> === Release 2.19.5 === diff --git a/embed/downloader-view.c b/embed/downloader-view.c index 0486b6721..0b482f4cb 100644 --- a/embed/downloader-view.c +++ b/embed/downloader-view.c @@ -205,7 +205,7 @@ show_status_icon (DownloaderView *dv) { DownloaderViewPrivate *priv = dv->priv; - priv->status_icon = gtk_status_icon_new_from_stock (EPHY_STOCK_DOWNLOAD); + priv->status_icon = gtk_status_icon_new_from_stock (STOCK_DOWNLOAD); g_signal_connect_swapped (priv->status_icon, "activate", G_CALLBACK (show_downloader_cb), dv); @@ -705,7 +705,7 @@ downloader_view_build_ui (DownloaderView *dv) priv->model = GTK_TREE_MODEL (liststore); - gtk_window_set_icon_name (GTK_WINDOW (priv->window), EPHY_STOCK_DOWNLOAD); + gtk_window_set_icon_name (GTK_WINDOW (priv->window), STOCK_DOWNLOAD); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview)); g_signal_connect (selection, "changed", G_CALLBACK (selection_changed), dv); diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index 3107e5154..248db6056 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -262,7 +262,7 @@ NS_METHOD GContentHandler::MIMEConfirmAction () action_label = (mAction == CONTENT_ACTION_OPEN) || (mAction == CONTENT_ACTION_OPEN_TMP) ? - GTK_STOCK_OPEN : EPHY_STOCK_DOWNLOAD; + GTK_STOCK_OPEN : STOCK_DOWNLOAD; mime_description = gnome_vfs_mime_get_description (mMimeType.get()); if (mime_description == NULL) diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c index 481d8ab39..d509b248e 100644 --- a/lib/ephy-stock-icons.c +++ b/lib/ephy-stock-icons.c @@ -53,7 +53,7 @@ ephy_stock_icons_init (void) { EPHY_STOCK_BOOKMARK, N_("Bookmark"), 0, 0, NULL }, { EPHY_STOCK_BOOKMARKS, N_("Bookmarks"), 0, 0, NULL }, { EPHY_STOCK_ENTRY, N_("Address Entry"), 0, 0, NULL }, - { EPHY_STOCK_DOWNLOAD, N_("_Download"), 0, 0, NULL }, + { STOCK_DOWNLOAD, N_("_Download"), 0, 0, NULL }, { STOCK_LOCK_INSECURE }, { STOCK_LOCK_SECURE }, { STOCK_LOCK_BROKEN } diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h index 4dc3daa89..5ffbb255f 100644 --- a/lib/ephy-stock-icons.h +++ b/lib/ephy-stock-icons.h @@ -31,7 +31,6 @@ G_BEGIN_DECLS #define EPHY_STOCK_BOOKMARK "bookmark-web" #define EPHY_STOCK_BOOKMARKS "bookmark-view" #define EPHY_STOCK_ENTRY "location-entry" -#define EPHY_STOCK_DOWNLOAD "download" #define STOCK_LOCK_INSECURE "lock-insecure" #define STOCK_LOCK_SECURE "lock-secure" #define STOCK_LOCK_BROKEN "lock-broken" @@ -42,6 +41,7 @@ G_BEGIN_DECLS #define STOCK_SEND_MAIL "mail-forward" #define STOCK_ADD_BOOKMARK "bookmark-new" #define STOCK_PRINT_SETUP "document-page-setup" +#define STOCK_DOWNLOAD "emblem-downloads" void ephy_stock_icons_init (void); diff --git a/src/ephy-window.c b/src/ephy-window.c index 162a4dccc..d7f7ac9fc 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -318,7 +318,7 @@ static const GtkActionEntry ephy_popups_entries [] = { { "OpenLinkInNewTab", NULL, N_("Open Link in New _Tab"), NULL, N_("Open link in a new tab"), G_CALLBACK (popup_cmd_link_in_new_tab) }, - { "DownloadLink", EPHY_STOCK_DOWNLOAD, N_("_Download Link"), NULL, + { "DownloadLink", STOCK_DOWNLOAD, N_("_Download Link"), NULL, NULL, G_CALLBACK (popup_cmd_download_link) }, { "DownloadLinkAs", GTK_STOCK_SAVE_AS, N_("_Save Link As…"), NULL, N_("Save link with a different name"), |