aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-01-05 21:51:43 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-01-05 21:51:43 +0800
commitae767a6174e353acb3b1a850fdefdffebeec9817 (patch)
tree6a6cbf8bce7af4c04fabaae2ef4123c4a0fde7f3 /data
parenta3f1d414e8ae27d380fe224bdf4f0a9e9740285c (diff)
downloadgsoc2013-epiphany-ae767a6174e353acb3b1a850fdefdffebeec9817.tar
gsoc2013-epiphany-ae767a6174e353acb3b1a850fdefdffebeec9817.tar.gz
gsoc2013-epiphany-ae767a6174e353acb3b1a850fdefdffebeec9817.tar.bz2
gsoc2013-epiphany-ae767a6174e353acb3b1a850fdefdffebeec9817.tar.lz
gsoc2013-epiphany-ae767a6174e353acb3b1a850fdefdffebeec9817.tar.xz
gsoc2013-epiphany-ae767a6174e353acb3b1a850fdefdffebeec9817.tar.zst
gsoc2013-epiphany-ae767a6174e353acb3b1a850fdefdffebeec9817.zip
Make GaleonShell inherit from GaleonEmbedShell. Ref the shell when using
2003-01-05 Marco Pesenti Gritti <marco@it.gnome.org> * data/art/Makefile.am: * data/art/epiphany.png: * data/epiphany.schemas.in: * data/glade/epiphany.glade: * embed/downloader-view.c: (downloader_view_init), (downloader_view_finalize): * embed/ephy-embed-favicon.c: (ephy_embed_favicon_set_property): * embed/ephy-embed-shell.c: (ephy_embed_shell_get_impl), (ephy_embed_shell_get_type), (ephy_embed_shell_new): * embed/ephy-embed-shell.h: * embed/ephy-embed-utils.c: (ephy_embed_utils_build_charsets_submenu): * embed/mozilla/mozilla-embed-persist.cpp: * embed/mozilla/mozilla-embed.cpp: * src/appearance-prefs.c: (setup_font_menu): * src/bookmarks/ephy-bookmarks.c: (compute_lower_fav), (ephy_setup_history_notifiers): * src/ephy-main.c: (main): * src/ephy-nautilus-view.c: (ephy_nautilus_view_instance_init): * src/ephy-shell.c: (ephy_shell_get_type), (ephy_shell_init), (ephy_shell_finalize), (build_homepage_url), (ephy_shell_get_autocompletion): * src/ephy-shell.h: * src/ephy-tab.c: (ephy_tab_init), (ephy_tab_location_cb), (ephy_tab_visibility_cb): * src/ephy-window.c: (favicon_cache_changed_cb), (ephy_window_init), (update_favicon_control): * src/general-prefs.c: (create_default_charset_menu): * src/history-dialog.c: (history_dialog_init): * src/pdm-dialog.c: (pdm_dialog_cookie_remove), (pdm_dialog_password_remove), (pdm_dialog_cookies_free), (pdm_dialog_passwords_free), (pdm_dialog_init): * src/prefs-dialog.c: (prefs_clear_memory_cache_button_clicked_cb), (prefs_clear_disk_cache_button_clicked_cb): * src/window-commands.c: (window_cmd_file_open): Make GaleonShell inherit from GaleonEmbedShell. Ref the shell when using the downloader. Use favicons for the window icon when possible. This required to use jimmac icon as default, we still dont have his permission, I'll remove it later if necessary.
Diffstat (limited to 'data')
-rw-r--r--data/art/Makefile.am3
-rw-r--r--data/art/epiphany.pngbin0 -> 3539 bytes
-rw-r--r--data/epiphany.schemas.in11
-rw-r--r--data/glade/epiphany.glade1
4 files changed, 13 insertions, 2 deletions
diff --git a/data/art/Makefile.am b/data/art/Makefile.am
index f4f5c3b5f..302d5eb3b 100644
--- a/data/art/Makefile.am
+++ b/data/art/Makefile.am
@@ -1,6 +1,7 @@
art_DATA = \
epiphany-secure.png \
- epiphany-unsecure.png
+ epiphany-unsecure.png \
+ epiphany.png
artdir = $(pkgdatadir)/art
diff --git a/data/art/epiphany.png b/data/art/epiphany.png
new file mode 100644
index 000000000..82869dc80
--- /dev/null
+++ b/data/art/epiphany.png
Binary files differ
diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in
index f45104907..c7a17edfa 100644
--- a/data/epiphany.schemas.in
+++ b/data/epiphany.schemas.in
@@ -341,6 +341,17 @@
</locale>
</schema>
<schema>
+ <key>/schemas/apps/epiphany/downloader/show_details</key>
+ <applyto>/apps/epiphany/downloader/show_details</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Show download details</short>
+ <long>Show download details</long>
+ </locale>
+ </schema>
+ <schema>
<key>/schemas/apps/epiphany/filtering/java_enabled</key>
<applyto>/apps/epiphany/filtering/java_enabled</applyto>
<owner>epiphany</owner>
diff --git a/data/glade/epiphany.glade b/data/glade/epiphany.glade
index c9d30cb91..773bc0334 100644
--- a/data/glade/epiphany.glade
+++ b/data/glade/epiphany.glade
@@ -844,7 +844,6 @@
<child>
<widget class="GtkVBox" id="details_frame">
- <property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>