aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-10-23 05:24:00 +0800
committerChristian Persch <chpe@src.gnome.org>2005-10-23 05:24:00 +0800
commit53c9df2f5c6a6337693602bc02554a21bf809c58 (patch)
tree3e507e7e61d1c991d25adbac5ebedb497d2cc3b1
parent69fc1379a09f968f25df830a44a21e33eac4ae65 (diff)
downloadgsoc2013-epiphany-53c9df2f5c6a6337693602bc02554a21bf809c58.tar
gsoc2013-epiphany-53c9df2f5c6a6337693602bc02554a21bf809c58.tar.gz
gsoc2013-epiphany-53c9df2f5c6a6337693602bc02554a21bf809c58.tar.bz2
gsoc2013-epiphany-53c9df2f5c6a6337693602bc02554a21bf809c58.tar.lz
gsoc2013-epiphany-53c9df2f5c6a6337693602bc02554a21bf809c58.tar.xz
gsoc2013-epiphany-53c9df2f5c6a6337693602bc02554a21bf809c58.tar.zst
gsoc2013-epiphany-53c9df2f5c6a6337693602bc02554a21bf809c58.zip
Add another mime type.
2005-10-22 Christian Persch <chpe@cvs.gnome.org> * data/mime-types-permissions.xml: Add another mime type. * src/ephy-notebook.c: Remove the accidental commit from the H18 patch.
-rw-r--r--ChangeLog10
-rwxr-xr-xdata/mime-types-permissions.xml1
-rw-r--r--src/ephy-notebook.c2
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dfce19125..fc38a60e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-22 Christian Persch <chpe@cvs.gnome.org>
+
+ * data/mime-types-permissions.xml:
+
+ Add another mime type.
+
+ * src/ephy-notebook.c:
+
+ Remove the accidental commit from the H18 patch.
+
2005-10-21 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-extensions-manager.c:
diff --git a/data/mime-types-permissions.xml b/data/mime-types-permissions.xml
index 6f49e9975..f0f56517b 100755
--- a/data/mime-types-permissions.xml
+++ b/data/mime-types-permissions.xml
@@ -385,6 +385,7 @@
<mime-type type="video/x-anim"/>
<mime-type type="video/x-avi"/>
<mime-type type="video/x-flic"/>
+<mime-type type="video/x-m4v"/>
<mime-type type="video/x-mng"/>
<mime-type type="video/x-ms-asf"/>
<mime-type type="video/x-ms-asf-plugin"/>
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index ae572da81..8203dccf1 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -59,7 +59,7 @@
#define INSANE_NUMBER_OF_URLS 20
/* Until https://bugzilla.mozilla.org/show_bug.cgi?id=296002 is fixed */
-//#define KEEP_TAB_IN_SAME_TOPLEVEL
+#define KEEP_TAB_IN_SAME_TOPLEVEL
#define EPHY_NOTEBOOK_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_NOTEBOOK, EphyNotebookPrivate))