debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'upstream-unstable'

Browse source
This commit is contained in:
Yves-Alexis Perez 2011-02-20 00:03:14 +01:00
commit c1fad44a43
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,6 +1,7 @@
This file is licensed under the terms of the expat license, see the file EXPAT. This file is licensed under the terms of the expat license, see the file EXPAT.
v0.3.1 v0.3.2
+ Fix opening address with Go button
+ Fix automigration of existing bookmarks + Fix automigration of existing bookmarks
+ Fix crash on opening autocompletion + Fix crash on opening autocompletion
+ Fix adblock handling of frames + Fix adblock handling of frames

5
midori/midori-browser.c
View file

@ -3597,7 +3597,10 @@ _action_location_secondary_icon_released (GtkAction* action,
} }
} }
else if (gtk_window_get_focus (GTK_WINDOW (browser)) == widget) else if (gtk_window_get_focus (GTK_WINDOW (browser)) == widget)
_action_location_submit_uri (action, uri, FALSE, browser); {
const gchar* text = gtk_entry_get_text (GTK_ENTRY (widget));
_action_location_submit_uri (action, text, FALSE, browser);
}
else if ((feed = g_object_get_data (G_OBJECT (view), "news-feeds"))) else if ((feed = g_object_get_data (G_OBJECT (view), "news-feeds")))
{ {
KatzeArray* news_feeds; KatzeArray* news_feeds;

2
wscript
View file

@ -29,7 +29,7 @@ from Configure import find_program_impl
major = 0 major = 0
minor = 3 minor = 3
micro = 1 micro = 2
APPNAME = 'midori' APPNAME = 'midori'
VERSION = str (major) + '.' + str (minor) + '.' + str (micro) VERSION = str (major) + '.' + str (minor) + '.' + str (micro)