Merge lp:~dannote/midori/luaplugin into lp:midori

[Danila Poyarkov]

[Danila Poyarkov (dannote)]

Lua plugin is stub but if there is any interest in such thing, I can continue the development. I can also rearrange this branch in two separate commits.

[lp:~dannote/midori/luaplugin]

6959. By Danila Poyarkov <email address hidden> on 2015-05-24

Uncommented IE user-agent

[Cris Dywan (kalikiana)]

I think it'd be best to have the build fixes only in this first iteration.

The enum changes won't do as-is because they're used by katze_property_proxy and you'll notice how the preferences dialog and statusbar features look a bit odd.
Maybe it just makes sense to start replacing that code right now, by building the combo boxes by hand - we can look into a new dedicated API to register preferences in a separate branch.

I notice there's gtk2/3 changes in GI. If this will break without having gtk3 installed I'm afraid it needs to become conditional.

review: Needs Fixing

[lp:~dannote/midori/luaplugin]

6960. By Danila Poyarkov <email address hidden> on 2015-05-24

Stripped off "hide titlebar when maximized"

[Cris Dywan (kalikiana)]

Whilst I'm trying to get WebKit2 extension API into trunk, on a spontaneous thought of making ibpeas a requirement for that to save the cost of porting existing code, somebody pointed out that there's lua support as of recently. So it's probably better to take advantage of that rather than our own ad-hoc solution.

https://git.gnome.org/browse/libpeas/commit/?id=84a159374c7032f0bc536321df66d4ffac97d9fe

[Danila Poyarkov (dannote)]

> If this will break without having gtk3 installed I'm afraid it needs to become conditional.
Yes, it will as it would be impossible to run a mixed GTK2/3 environment.

> https://git.gnome.org/browse/libpeas/commit/?id=84a159374c7032f0bc536321df66d4ffac97d9fe
Looks great, I'll check it out soon.

Unmerged revisions

6960. By Danila Poyarkov <email address hidden> on 2015-05-24

Stripped off "hide titlebar when maximized"

6959. By Danila Poyarkov <email address hidden> on 2015-05-24

Uncommented IE user-agent

6958. By Danila Poyarkov <email address hidden> on 2015-05-23

Fixed GObject-introspection and created new plugin

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-28 22:01:05 +0000
+++ CMakeLists.txt	2015-05-24 17:14:37 +0000
@@ -160,6 +160,7 @@
 option(USE_GRANITE "Fancy notebook and pop-overs" OFF)
 option(USE_APIDOCS "API documentation" OFF)
 option(USE_GIR "Generate GObject Introspection bindings" OFF)
+option(USE_LUA "Create Lua plugin bindings" OFF)
 option(EXTRA_WARNINGS "Additional compiler warnings" OFF)
 
 # GTK+3 is implied here, whether set or not
@@ -187,6 +188,14 @@
     set(PKGS ${PKGS} zeitgeist-2.0)
 endif()
 
+if (USE_LUA)
+    pkg_check_modules(LUA lua>=5.1)
+    set(OPTS_INCLUDE_DIRS "${OPTS_INCLUDE_DIRS};${LUA_INCLUDE_DIRS}")
+    set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${LUA_LIBRARIES}")
+    add_definitions("-DHAVE_LUA")
+    set(PKGS ${PKGS} lua)
+endif()
+
 if (WIN32)
     add_definitions("-DGCR_VERSION=\"No\"")
 elseif (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.34.0")

=== modified file 'cmake/GIR.cmake'
--- cmake/GIR.cmake	2014-03-04 14:41:28 +0000
+++ cmake/GIR.cmake	2015-05-24 17:14:37 +0000
@@ -5,20 +5,24 @@
 find_program (GIR_COMPILER_BIN g-ir-compiler)
 
 if (GIR_SCANNER_BIN AND GIR_COMPILER_BIN)
-
     set (GIR_FOUND TRUE)
     set (GIR_VERSION "${MIDORI_MAJOR_VERSION}.${MIDORI_MINOR_VERSION}")
     macro (gir_build module namespace)
         add_custom_target ("g-ir-scanner_${module}" ALL
             ${GIR_SCANNER_BIN} -Imidori -I${CMAKE_SOURCE_DIR}/ -I${CMAKE_BINARY_DIR}/midori -I${CMAKE_SOURCE_DIR}/${module} -I${CMAKE_SOURCE_DIR}/toolbars -I.
-                --header-only -n ${namespace} --identifier-prefix ${namespace}
+                -l${LIBMIDORI} -L${CMAKE_BINARY_DIR}/midori --no-libtool -n ${namespace} --identifier-prefix ${namespace}
                 ${CMAKE_SOURCE_DIR}/${module}/${module}-*.c ${CMAKE_SOURCE_DIR}/${module}/${module}-*.h
-                --pkg gtk+-2.0 --pkg webkit-1.0 --pkg gio-2.0 --pkg gobject-2.0
-                --warn-all -iGObject-2.0 -iGLib-2.0 -iGtk-2.0
+                --pkg gtk+-3.0 --pkg webkit-1.0 --pkg gio-2.0 --pkg gobject-2.0
+                --warn-all -iGObject-2.0 -iGLib-2.0 -iGtk-3.0
                 --nsversion ${GIR_VERSION}
                 -o ${CMAKE_CURRENT_BINARY_DIR}/${namespace}-${GIR_VERSION}.gir
                 WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
                 DEPENDS ${CMAKE_PROJECT_NAME})
+        add_custom_target ("g-ir-compiler_${module}" ALL
+            ${GIR_COMPILER_BIN} ${CMAKE_CURRENT_BINARY_DIR}/${namespace}-${GIR_VERSION}.gir
+                --output ${CMAKE_CURRENT_BINARY_DIR}/${namespace}-${GIR_VERSION}.typelib
+                WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+                DEPENDS g-ir-scanner_${module})
 
     endmacro (gir_build module namespace)
 
@@ -27,5 +31,7 @@
 
         install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${namespace}-${GIR_VERSION}.gir"
             DESTINATION "${CMAKE_INSTALL_DATADIR}/gir-1.0/")
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${namespace}-${GIR_VERSION}.typelib"
+            DESTINATION "${CMAKE_INSTALL_LIBDIR}/girepository-1.0/")
     endmacro (gir module)
 endif ()

=== modified file 'extensions/CMakeLists.txt'
--- extensions/CMakeLists.txt	2015-04-19 14:06:12 +0000
+++ extensions/CMakeLists.txt	2015-05-24 17:14:37 +0000
@@ -25,6 +25,12 @@
          )
 endif ()
 
+if (NOT USE_LUA)
+    list(REMOVE_ITEM EXTENSIONS
+         "luaplugin.vala"
+         )
+endif ()
+
 # FIXME: re-enable webmedia extension
 # once we have working notifications on win
 if (WIN32)

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2015-04-28 22:01:05 +0000
+++ midori/midori-browser.c	2015-05-24 17:14:37 +0000
@@ -5984,11 +5984,6 @@
                       G_CALLBACK (midori_browser_destroy_cb), NULL);
     gtk_window_set_role (GTK_WINDOW (browser), "browser");
     gtk_window_set_icon_name (GTK_WINDOW (browser), MIDORI_STOCK_WEB_BROWSER);
-    #if GTK_CHECK_VERSION (3, 4, 0)
-    #ifndef HAVE_GRANITE
-    gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (browser), TRUE);
-    #endif
-    #endif
     vbox = gtk_vbox_new (FALSE, 0);
     gtk_container_add (GTK_CONTAINER (browser), vbox);
     gtk_widget_show (vbox);

=== modified file 'midori/midori-privatedata.c'
--- midori/midori-privatedata.c	2015-04-21 02:00:38 +0000
+++ midori/midori-privatedata.c	2015-05-24 17:14:37 +0000
@@ -99,6 +99,7 @@
  * The dialog is "empty" when none of the relevant checkboxes are activated.
  * This function returns true if the dialog is empty.
  **/
+
 static bool
 midori_private_data_dialog_is_empty (GtkDialog* dialog)
 {
@@ -134,6 +135,7 @@
  * When called, sets the sensitivity of the clear private data button depending
  * on whether the dialog is empty (see: midori_private_data_dialog_is_empty)
  **/
+
 static void
 midori_private_data_clear_button_check_sensitive (GtkDialog* dialog)
 {

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2015-05-21 20:41:32 +0000
+++ midori/midori-view.c	2015-05-24 17:14:37 +0000
@@ -3499,9 +3499,6 @@
     }
     else
         gtk_window_set_icon_name (GTK_WINDOW (window), icon_name);
-    #if GTK_CHECK_VERSION (3, 4, 0)
-    gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window), TRUE);
-    #endif
     gtk_widget_set_size_request (GTK_WIDGET (inspector_view), 700, 100);
     #if GTK_CHECK_VERSION (3, 0, 0)
     scrolled = gtk_scrolled_window_new (NULL, NULL);

=== modified file 'midori/midori-websettings.c'
--- midori/midori-websettings.c	2014-03-19 20:03:50 +0000
+++ midori/midori-websettings.c	2015-05-24 17:14:37 +0000
@@ -114,10 +114,10 @@
     if (!type)
     {
         static const GEnumValue values[] = {
-         { MIDORI_STARTUP_BLANK_PAGE, "MIDORI_STARTUP_BLANK_PAGE", N_("Show Speed Dial") },
-         { MIDORI_STARTUP_HOMEPAGE, "MIDORI_STARTUP_HOMEPAGE", N_("Show Homepage") },
-         { MIDORI_STARTUP_LAST_OPEN_PAGES, "MIDORI_STARTUP_LAST_OPEN_PAGES", N_("Show last open tabs") },
-         { MIDORI_STARTUP_DELAYED_PAGES, "MIDORI_STARTUP_DELAYED_PAGES", N_("Show last tabs without loading") },
+         { MIDORI_STARTUP_BLANK_PAGE, "MIDORI_STARTUP_BLANK_PAGE", "blank-page" },
+         { MIDORI_STARTUP_HOMEPAGE, "MIDORI_STARTUP_HOMEPAGE", "homepage" },
+         { MIDORI_STARTUP_LAST_OPEN_PAGES, "MIDORI_STARTUP_LAST_OPEN_PAGES", "last-open-pages" },
+         { MIDORI_STARTUP_DELAYED_PAGES, "MIDORI_STARTUP_DELAYED_PAGES", "delayed-pages" },
          { 0, NULL, NULL }
         };
         type = g_enum_register_static ("MidoriStartup", values);
@@ -132,11 +132,11 @@
     if (!type)
     {
         static const GEnumValue values[] = {
-         { MIDORI_NEWTAB_BLANK_PAGE, "MIDORI_NEWTAB_BLANK_PAGE", N_("Show Blank Page") },
-         { MIDORI_NEWTAB_HOMEPAGE, "MIDORI_NEWTAB_HOMEPAGE", N_("Show Homepage") },
-         { MIDORI_NEWTAB_SEARCH, "MIDORI_NEWTAB_SEARCH", N_("Show default Search Engine") },
-         { MIDORI_NEWTAB_SPEED_DIAL, "MIDORI_NEWTAB_SPEED_DIAL", N_("Show Speed Dial") },
-         { MIDORI_NEWTAB_CUSTOM, "MIDORI_NEWTAB_CUSTOM", N_("Show custom page") },
+         { MIDORI_NEWTAB_BLANK_PAGE, "MIDORI_NEWTAB_BLANK_PAGE", "blank-page" },
+         { MIDORI_NEWTAB_HOMEPAGE, "MIDORI_NEWTAB_HOMEPAGE", "homepage" },
+         { MIDORI_NEWTAB_SEARCH, "MIDORI_NEWTAB_SEARCH", "search" },
+         { MIDORI_NEWTAB_SPEED_DIAL, "MIDORI_NEWTAB_SPEED_DIAL", "speed-dial" },
+         { MIDORI_NEWTAB_CUSTOM, "MIDORI_NEWTAB_CUSTOM", "custom" },
          { 0, NULL, NULL }
         };
         type = g_enum_register_static ("MidoriNewTabType", values);
@@ -151,14 +151,14 @@
     if (!type)
     {
         static const GEnumValue values[] = {
-         { MIDORI_ENCODING_CHINESE, "MIDORI_ENCODING_CHINESE", N_("Chinese Traditional (BIG5)") },
-         { MIDORI_ENCODING_CHINESE_SIMPLIFIED, "MIDORI_ENCODING_CHINESE_SIMPLIFIED", N_("Chinese Simplified (GB18030)") },
-         { MIDORI_ENCODING_JAPANESE, "MIDORI_ENCODING_JAPANESE", N_("Japanese (SHIFT_JIS)") },
-         { MIDORI_ENCODING_KOREAN, "MIDORI_ENCODING_KOREAN", N_("Korean (EUC-KR)") },
-         { MIDORI_ENCODING_RUSSIAN, "MIDORI_ENCODING_RUSSIAN", N_("Russian (KOI8-R)") },
-         { MIDORI_ENCODING_UNICODE, "MIDORI_ENCODING_UNICODE", N_("Unicode (UTF-8)") },
-         { MIDORI_ENCODING_WESTERN, "MIDORI_ENCODING_WESTERN", N_("Western (ISO-8859-1)") },
-         { MIDORI_ENCODING_CUSTOM, "MIDORI_ENCODING_CUSTOM", N_("Custom…") },
+         { MIDORI_ENCODING_CHINESE, "MIDORI_ENCODING_CHINESE", "chinese" },
+         { MIDORI_ENCODING_CHINESE_SIMPLIFIED, "MIDORI_ENCODING_CHINESE_SIMPLIFIED", "chinese-simplified" },
+         { MIDORI_ENCODING_JAPANESE, "MIDORI_ENCODING_JAPANESE", "japanise" },
+         { MIDORI_ENCODING_KOREAN, "MIDORI_ENCODING_KOREAN", "korean" },
+         { MIDORI_ENCODING_RUSSIAN, "MIDORI_ENCODING_RUSSIAN", "russian" },
+         { MIDORI_ENCODING_UNICODE, "MIDORI_ENCODING_UNICODE", "unicode" },
+         { MIDORI_ENCODING_WESTERN, "MIDORI_ENCODING_WESTERN", "western" },
+         { MIDORI_ENCODING_CUSTOM, "MIDORI_ENCODING_CUSTOM", "custom" },
          { 0, NULL, NULL }
         };
         type = g_enum_register_static ("MidoriPreferredEncoding", values);
@@ -173,9 +173,9 @@
     if (!type)
     {
         static const GEnumValue values[] = {
-         { MIDORI_NEW_PAGE_TAB, "MIDORI_NEW_PAGE_TAB", N_("New tab") },
-         { MIDORI_NEW_PAGE_WINDOW, "MIDORI_NEW_PAGE_WINDOW", N_("New window") },
-         { MIDORI_NEW_PAGE_CURRENT, "MIDORI_NEW_PAGE_CURRENT", N_("Current tab") },
+         { MIDORI_NEW_PAGE_TAB, "MIDORI_NEW_PAGE_TAB", "tab" },
+         { MIDORI_NEW_PAGE_WINDOW, "MIDORI_NEW_PAGE_WINDOW", "window" },
+         { MIDORI_NEW_PAGE_CURRENT, "MIDORI_NEW_PAGE_CURRENT", "current" },
          { 0, NULL, NULL }
         };
         type = g_enum_register_static ("MidoriNewPage", values);
@@ -190,12 +190,12 @@
     if (!type)
     {
         static const GEnumValue values[] = {
-         { MIDORI_TOOLBAR_DEFAULT, "MIDORI_TOOLBAR_DEFAULT", N_("Default") },
-         { MIDORI_TOOLBAR_ICONS, "MIDORI_TOOLBAR_ICONS", N_("Icons") },
-         { MIDORI_TOOLBAR_SMALL_ICONS, "MIDORI_TOOLBAR_SMALL_ICONS", N_("Small icons") },
-         { MIDORI_TOOLBAR_TEXT, "MIDORI_TOOLBAR_TEXT", N_("Text") },
-         { MIDORI_TOOLBAR_BOTH, "MIDORI_TOOLBAR_BOTH", N_("Icons and text") },
-         { MIDORI_TOOLBAR_BOTH_HORIZ, "MIDORI_TOOLBAR_BOTH_HORIZ", N_("Text beside icons") },
+         { MIDORI_TOOLBAR_DEFAULT, "MIDORI_TOOLBAR_DEFAULT", "default" },
+         { MIDORI_TOOLBAR_ICONS, "MIDORI_TOOLBAR_ICONS", "icons" },
+         { MIDORI_TOOLBAR_SMALL_ICONS, "MIDORI_TOOLBAR_SMALL_ICONS", "small-icons" },
+         { MIDORI_TOOLBAR_TEXT, "MIDORI_TOOLBAR_TEXT", "text" },
+         { MIDORI_TOOLBAR_BOTH, "MIDORI_TOOLBAR_BOTH", "both" },
+         { MIDORI_TOOLBAR_BOTH_HORIZ, "MIDORI_TOOLBAR_BOTH_HORIZ", "both-horiz" },
          { 0, NULL, NULL }
         };
         type = g_enum_register_static ("MidoriToolbarStyle", values);
@@ -210,9 +210,9 @@
     if (!type)
     {
         static const GEnumValue values[] = {
-         { MIDORI_PROXY_AUTOMATIC, "MIDORI_PROXY_AUTOMATIC", N_("Automatic (GNOME or environment)") },
-         { MIDORI_PROXY_HTTP, "MIDORI_PROXY_HTTP", N_("HTTP proxy server") },
-         { MIDORI_PROXY_NONE, "MIDORI_PROXY_NONE", N_("No proxy server") },
+         { MIDORI_PROXY_AUTOMATIC, "MIDORI_PROXY_AUTOMATIC", "automatic" },
+         { MIDORI_PROXY_HTTP, "MIDORI_PROXY_HTTP", "http" },
+         { MIDORI_PROXY_NONE, "MIDORI_PROXY_NONE", "none" },
          { 0, NULL, NULL }
         };
         type = g_enum_register_static ("MidoriProxy", values);
@@ -227,14 +227,14 @@
     if (!type)
     {
         static const GEnumValue values[] = {
-         { MIDORI_IDENT_MIDORI, "MIDORI_IDENT_MIDORI", N_("_Automatic") },
-         { MIDORI_IDENT_GENUINE, "MIDORI_IDENT_GENUINE", N_("Midori") },
-         { MIDORI_IDENT_CHROME, "MIDORI_IDENT_CHROME", N_("Chrome") },
-         { MIDORI_IDENT_SAFARI, "MIDORI_IDENT_SAFARI", N_("Safari") },
-         { MIDORI_IDENT_IPHONE, "MIDORI_IDENT_IPHONE", N_("iPhone") },
-         { MIDORI_IDENT_FIREFOX, "MIDORI_IDENT_FIREFOX", N_("Firefox") },
-         { MIDORI_IDENT_EXPLORER, "MIDORI_IDENT_EXPLORER", N_("Internet Explorer") },
-         { MIDORI_IDENT_CUSTOM, "MIDORI_IDENT_CUSTOM", N_("Custom…") },
+         { MIDORI_IDENT_MIDORI, "MIDORI_IDENT_MIDORI", "automatic" },
+         { MIDORI_IDENT_GENUINE, "MIDORI_IDENT_GENUINE", "midori" },
+         { MIDORI_IDENT_CHROME, "MIDORI_IDENT_CHROME", "chrome" },
+         { MIDORI_IDENT_SAFARI, "MIDORI_IDENT_SAFARI", "safari" },
+         { MIDORI_IDENT_IPHONE, "MIDORI_IDENT_IPHONE", "iphone" },
+         { MIDORI_IDENT_FIREFOX, "MIDORI_IDENT_FIREFOX", "firefox" },
+         { MIDORI_IDENT_EXPLORER, "MIDORI_IDENT_EXPLORER", "explorer" },
+         { MIDORI_IDENT_CUSTOM, "MIDORI_IDENT_CUSTOM", "custom" },
          { 0, NULL, NULL }
         };
         type = g_enum_register_static ("MidoriIdentity", values);