diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rwxr-xr-x | data/mime-types-permissions.xml | 1 | ||||
| -rw-r--r-- | src/ephy-notebook.c | 2 |
3 files changed, 12 insertions, 1 deletions
@@ -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)) |