diff -Nru geary-0.4.2/CMakeLists.txt geary-0.4.3/CMakeLists.txt --- geary-0.4.2/CMakeLists.txt 2013-11-20 21:08:27.000000000 +0000 +++ geary-0.4.3/CMakeLists.txt 2013-12-12 23:07:29.000000000 +0000 @@ -15,7 +15,7 @@ # set(GETTEXT_PACKAGE "geary") set(RELEASE_NAME "Lightweight email client for GNOME.") -set(VERSION "0.4.2") +set(VERSION "0.4.3") set(VERSION_INFO "Release") set(LANGUAGE_SUPPORT_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/locale) @@ -52,6 +52,7 @@ find_package(PkgConfig) pkg_check_modules(LIBUNITY QUIET unity>=5.12.0) pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2) +pkg_check_modules(WEBKITGTK110X QUIET webkitgtk-3.0<=1.10.2) pkg_check_modules(WEBKITGTK22X QUIET webkitgtk-3.0>=2.2.0) # intl diff -Nru geary-0.4.2/NEWS geary-0.4.3/NEWS --- geary-0.4.2/NEWS 2013-11-20 21:08:27.000000000 +0000 +++ geary-0.4.3/NEWS 2013-12-12 23:07:29.000000000 +0000 @@ -1,3 +1,10 @@ +Geary 0.4.3 - 12 December 2013 +------------------------------ + + * Fix "squished" conversation list when used with certain themes + * Compile-time support for WebKitGTK 2.0 + + Geary 0.4.2 - 20 November 2013 ------------------------------ diff -Nru geary-0.4.2/README geary-0.4.3/README --- geary-0.4.2/README 2013-11-20 21:08:27.000000000 +0000 +++ geary-0.4.3/README 2013-12-12 23:07:29.000000000 +0000 @@ -28,7 +28,7 @@ * Contacting Yorba Yorba: http://www.yorba.org - Geary wiki: http://redmine.yorba.org/projects/geary/wiki + Geary wiki: https://wiki.gnome.org/Apps/Geary We also encourage you to join the Geary mailing list. Send an email with a subject: line of "subscribe" (no quotes) to diff -Nru geary-0.4.2/THANKS geary-0.4.3/THANKS --- geary-0.4.2/THANKS 2013-11-20 21:08:27.000000000 +0000 +++ geary-0.4.3/THANKS 2013-12-12 23:07:29.000000000 +0000 @@ -16,6 +16,7 @@ Michael George Sven Hagemann Mathias Hasselmann +Charles Lehner Brendan Long Timo Kluck Avi Levy diff -Nru geary-0.4.2/bindings/metadata/webkitgtk-1.10/WebKit-3.0.metadata geary-0.4.3/bindings/metadata/webkitgtk-1.10/WebKit-3.0.metadata --- geary-0.4.2/bindings/metadata/webkitgtk-1.10/WebKit-3.0.metadata 1970-01-01 00:00:00.000000000 +0000 +++ geary-0.4.3/bindings/metadata/webkitgtk-1.10/WebKit-3.0.metadata 2013-12-12 23:07:29.000000000 +0000 @@ -0,0 +1,16 @@ +DOM* parent="WebKit.DOM" name="DOM(.+)" + +DOMEventTarget.add_event_listener skip=false +DOMEventTarget.remove_event_listener skip=false + +WebView.entering_fullscreen#signal name="entering_fullscreen_signal" +WebView.leaving_fullscreen#signal name="leaving_fullscreen_signal" + +WebView.move_cursor#virtual_method name="leaving_fullscreen_method" +WebSettings.enable_default_context_menu#property deprecated=false + +DOMNode.dispatch_event type="void" +DOMWebKitNamedFlow.dispatch_event type="void" +DOMDOMApplicationCache.dispatch_event type="void" +DOMDOMWindow.dispatch_event type="void" + diff -Nru geary-0.4.2/bindings/metadata/webkitgtk-2.0/WebKit-3.0.metadata geary-0.4.3/bindings/metadata/webkitgtk-2.0/WebKit-3.0.metadata --- geary-0.4.2/bindings/metadata/webkitgtk-2.0/WebKit-3.0.metadata 2013-11-20 21:08:27.000000000 +0000 +++ geary-0.4.3/bindings/metadata/webkitgtk-2.0/WebKit-3.0.metadata 2013-12-12 23:07:29.000000000 +0000 @@ -13,4 +13,7 @@ DOMWebKitNamedFlow.dispatch_event type="void" DOMDOMApplicationCache.dispatch_event type="void" DOMDOMWindow.dispatch_event type="void" +DOMTextTrackCue.dispatch_event type="void" +DOMTextTrack.dispatch_event type="void" +DOMTextTrackList.dispatch_event type="void" diff -Nru geary-0.4.2/debian/changelog geary-0.4.3/debian/changelog --- geary-0.4.2/debian/changelog 2013-11-20 21:12:09.000000000 +0000 +++ geary-0.4.3/debian/changelog 2013-12-12 23:24:14.000000000 +0000 @@ -1,3 +1,10 @@ +geary (0.4.3-1~raring1) raring; urgency=low + + * Fix "squished" conversation list when used with certain themes + * Compile-time support for WebKitGTK 2.0 + + -- Jim Nelson Thu, 12 Dec 2013 15:00:34 -0800 + geary (0.4.2-1~raring1) raring; urgency=low * Compile with Vala 0.22.1 diff -Nru geary-0.4.2/src/CMakeLists.txt geary-0.4.3/src/CMakeLists.txt --- geary-0.4.2/src/CMakeLists.txt 2013-11-20 21:08:27.000000000 +0000 +++ geary-0.4.3/src/CMakeLists.txt 2013-12-12 23:07:29.000000000 +0000 @@ -435,8 +435,19 @@ message(STATUS "Unity launcher support: OFF") endif () -if (WEBKITGTK22X_FOUND) - message(STATUS "Targeting WebKitGTK 2.2.x") +if (WEBKITGTK110X_FOUND) + message(STATUS "Targeting WebKitGTK 1.10") + SET(EXTRA_CLIENT_PKG_CONFIG + ${EXTRA_CLIENT_PKG_CONFIG} + webkitgtk-3.0>=1.10.0 + webkitgtk-3.0<=1.10.2 + ) + + SET(WEBKITGTK_METADATA_DIR + webkitgtk-1.10 + ) +elseif (WEBKITGTK22X_FOUND) + message(STATUS "Targeting WebKitGTK 2.2") SET(EXTRA_CLIENT_PKG_CONFIG ${EXTRA_CLIENT_PKG_CONFIG} webkitgtk-3.0>=2.2.0 @@ -446,10 +457,10 @@ webkitgtk-2.2 ) else () - message(STATUS "Targeting WebKitGTK 1.10.0 to 2.0.4") + message(STATUS "Targeting WebKitGTK 2.0") SET(EXTRA_CLIENT_PKG_CONFIG ${EXTRA_CLIENT_PKG_CONFIG} - webkitgtk-3.0>=1.10.0 + webkitgtk-3.0>=2.0.0 webkitgtk-3.0<=2.0.4 ) diff -Nru geary-0.4.2/src/client/views/formatted-conversation-data.vala geary-0.4.3/src/client/views/formatted-conversation-data.vala --- geary-0.4.2/src/client/views/formatted-conversation-data.vala 2013-11-20 21:08:27.000000000 +0000 +++ geary-0.4.3/src/client/views/formatted-conversation-data.vala 2013-12-12 23:07:29.000000000 +0000 @@ -264,7 +264,10 @@ x_offset = 0; y_offset = 0; - width = 0; + // set width to 1 (rather than 0) to work around certain themes that cause the + // conversation list to be shown as "squished": + // https://bugzilla.gnome.org/show_bug.cgi?id=713954 + width = 1; height = cell_height; }