diff -Nru ubufox-3.0/chrome.manifest ubufox-3.1/chrome.manifest --- ubufox-3.0/chrome.manifest 2014-11-14 15:32:15.000000000 +0000 +++ ubufox-3.1/chrome.manifest 2015-06-25 23:41:55.000000000 +0000 @@ -18,7 +18,6 @@ locale ubufox lt locale/lt/ locale ubufox nl locale/nl/ locale ubufox pl locale/pl/ -locale ubufox pt locale/pt/ locale ubufox pt-BR locale/pt-BR/ locale ubufox pt-PT locale/pt-PT/ locale ubufox ro locale/ro/ diff -Nru ubufox-3.0/components/AboutStartpage.js ubufox-3.1/components/AboutStartpage.js --- ubufox-3.0/components/AboutStartpage.js 2013-08-05 21:53:32.000000000 +0000 +++ ubufox-3.1/components/AboutStartpage.js 2015-06-25 22:17:36.000000000 +0000 @@ -51,8 +51,7 @@ QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]), getURIFlags: function(aURI) { - return (Ci.nsIAboutModule.ALLOW_SCRIPT | - Ci.nsIAboutModule.URI_SAFE_FOR_UNTRUSTED_CONTENT); + return Ci.nsIAboutModule.ALLOW_SCRIPT; }, newChannel: function(aURI) { @@ -60,7 +59,9 @@ getService(Ci.nsIScriptSecurityManager); let uri; - // allow defaults packages to overwrite the homepage + // Allow defaults packages to overwrite the homepage - this is a bit of a + // hack, but they can't reliable override browser.startup.homepage because + // we override it in an addon try { uri = Services.io.newURI(Services.prefs.getCharPref("extensions.ubufox@ubuntu.com.custom_homepage"), null, null); @@ -71,10 +72,6 @@ let channel = Services.io.newChannelFromURI(uri); channel.originalURI = aURI; - // See https://bugzilla.mozilla.org/show_bug.cgi?id=774585 - channel.owner = "getSimpleCodebasePrincipal" in secMan ? - null : secMan.getCodebasePrincipal(aURI); - return channel; } }; diff -Nru ubufox-3.0/components/UpdateNotifier.js ubufox-3.1/components/UpdateNotifier.js --- ubufox-3.0/components/UpdateNotifier.js 2013-08-05 21:15:39.000000000 +0000 +++ ubufox-3.1/components/UpdateNotifier.js 2015-06-25 22:29:42.000000000 +0000 @@ -416,7 +416,7 @@ var idle = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer); idle.initWithCallback(function() { - let kungFuDeathGrip = idle; + let anchor = idle; watchOneDir(NS_XPCOM_CURRENT_PROCESS_DIR, [], "app"); watchOneDir(NS_GRE_DIR, [], "app"); watchOneDir(NS_APP_PLUGINS_DIR, [], "plugins"); @@ -436,7 +436,7 @@ // ["extensions"]).path]); idle.initWithCallback(function() { - let kungFuDeathGrip = idle; + let anchor = idle; // Would use the AddonManager here, but it doesn't expose full paths. // We use a delay here to avoid starting the plugin host at startup // if it isn't otherwise needed diff -Nru ubufox-3.0/content/overlay.css ubufox-3.1/content/overlay.css --- ubufox-3.0/content/overlay.css 2013-08-05 21:15:39.000000000 +0000 +++ ubufox-3.1/content/overlay.css 2015-06-25 23:08:39.000000000 +0000 @@ -3,5 +3,5 @@ } .popup-notification-icon[popupid="ubufox-restart-request"] { - list-style-image: url(chrome://global/skin/icons/information-64.png); + list-style-image: url(moz-icon://stock/reboot-notifier?size=dialog); } diff -Nru ubufox-3.0/content/overlay.js ubufox-3.1/content/overlay.js --- ubufox-3.0/content/overlay.js 2013-08-05 21:15:39.000000000 +0000 +++ ubufox-3.1/content/overlay.js 2015-06-25 22:37:06.000000000 +0000 @@ -50,63 +50,28 @@ addNotificationToBrowser: function URL_addNotificationToBrowser(aBrowser, aRaised) { - if (this.notificationStyle == "popup") { - PopupNotifications.show(aBrowser, "ubufox-restart-request", - this.restartNotificationLabel, - "ubufox-restart-notification-icon", - {label: this.restartNotificationButton, - accessKey: this.restartNotificationKey, - callback: (function() { - gBrowser.tabContainer.removeEventListener("TabOpen", - this.onTabOpen, - false); - gBrowser.browsers.forEach(function(browser) { - let notification = PopupNotifications.getNotification("ubufox-restart-request", - browser); - if (notification) { - PopupNotifications.remove(notification); - } - }); - - Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup) - .quit(Ci.nsIAppStartup.eRestart | - Ci.nsIAppStartup.eAttemptQuit); - }).bind(this)}, - [], {dismissed: aRaised ? false : true, - timeout: 8.64e15}); - } else if (this.notificationStyle == "infobar") { - let notificationBox = gBrowser.getNotificationBox(aBrowser); - let notification = notificationBox - .getNotificationWithValue("notification-restart"); - if (!notification) { - notificationBox.appendNotification(this.oldRestartNotificationLabel, - "notification-restart", "", - notificationBox.PRIORITY_WARNING_LOW, - [{ label: this.restartNotificationButton, - accessKey: this.restartNotificationKey, - callback: (function() { - gBrowser.tabContainer.removeEventListener("TabOpen", - this.onTabOpen, - false); - gBrowser.browsers.forEach(function(browser) { - let notificationBox = gBrowser.getNotificationBox(browser); - let notification = notificationBox - .getNotificationWithValue("notification-restart"); - if (notification) { - notificationBox.removeNotification(notification); - } - }); - - if (this.intervalId) { - window.clearInterval(this.intervalId); - } - - Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup) - .quit(Ci.nsIAppStartup.eRestart | - Ci.nsIAppStartup.eAttemptQuit); - }).bind(this)}]); - } - } + PopupNotifications.show(aBrowser, "ubufox-restart-request", + this.restartNotificationLabel, + "ubufox-restart-notification-icon", + {label: this.restartNotificationButton, + accessKey: this.restartNotificationKey, + callback: (function() { + gBrowser.tabContainer.removeEventListener("TabOpen", + this.onTabOpen, + false); + gBrowser.browsers.forEach(function(browser) { + let notification = PopupNotifications.getNotification("ubufox-restart-request", + browser); + if (notification) { + PopupNotifications.remove(notification); + } + }); + + Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup) + .quit(Ci.nsIAppStartup.eRestart | + Ci.nsIAppStartup.eAttemptQuit); + }).bind(this)}, [], {dismissed: aRaised ? false : true, + timeout: 8.64e15}); }, onTabOpen: function URL_onTabOpen(aEvent) { @@ -128,12 +93,6 @@ if (!this.restartRequested) { gBrowser.tabContainer.addEventListener("TabOpen", this.onTabOpen, false); this.displayNotifications(); - - if (this.notificationStyle == "infobar") { - this.intervalId = window.setInterval(this.displayNotifications.bind(this), - 900000); - } - this.restartRequested = true; } }, @@ -143,23 +102,11 @@ }, onPluginsUpdated: function URL_onPluginsUpdated() { - if (this.notificationStyle == "popup") { - this.requestRestart(); - } + this.requestRestart(); } }; XPCOMUtils.defineLazyGetter(UpdateRestartListener, - "notificationStyle", - function() { - try { - return Services.prefs.getCharPref("extensions.ubufox.update-restart-notification-style"); - } catch(e) { - return distro.updateRestartNotificationStyle; - } - }); - - XPCOMUtils.defineLazyGetter(UpdateRestartListener, "oldRestartNotificationLabel", function() { return document.getElementById("ubufox-restart-strings") diff -Nru ubufox-3.0/debian/changelog ubufox-3.1/debian/changelog --- ubufox-3.0/debian/changelog 2015-01-09 21:38:02.000000000 +0000 +++ ubufox-3.1/debian/changelog 2015-08-10 21:31:51.000000000 +0000 @@ -1,3 +1,27 @@ +ubufox (3.1-0ubuntu0.14.04.1) trusty-security; urgency=medium + + * New upstream release + - Remove the infobar-style restart notification + - Remove unused ctypes bindings + - Bundle a signed copy of the addon in the source tree + * Install the signed copy of the addon + - update debian/rules + - add debian/install + * Don't depend on mozilla-devscripts - the addon needs to be installed + as a packed xpi now, and mozilla-devscripts doesn't seem to support this + - update debian/control + * Drop other package features that can't be used now the addon is not + unpacked + - remove debian/docs + - remove debian/example-homepage.properties + - remove debian/xul-ext-ubufox.js + - add debian/maintscript to clean up /etc/xul-ext/ubufox.js + * Update package description as several features listed have long been + removed + - update debian/control + + -- Chris Coulson Mon, 27 Jul 2015 20:16:03 +0100 + ubufox (3.0-0ubuntu0.14.04.1) trusty-security; urgency=medium * New upstream release diff -Nru ubufox-3.0/debian/control ubufox-3.1/debian/control --- ubufox-3.0/debian/control 2014-05-23 13:06:41.000000000 +0000 +++ ubufox-3.1/debian/control 2015-07-27 19:15:56.000000000 +0000 @@ -2,34 +2,25 @@ Section: web Priority: optional Maintainer: Ubuntu Mozilla Team -Build-Depends: debhelper (>= 7), - cdbs, - mozilla-devscripts (>= 0.22~) +Build-Depends: debhelper (>= 7) Standards-Version: 3.9.1 Homepage: https://launchpad.net/ubufox Package: xul-ext-ubufox Architecture: all -Depends: aptdaemon, libglib2.0-0 (>= 2.26), ${misc:Depends} +Depends: libglib2.0-0 (>= 2.26), ${misc:Depends} Recommends: ${xpi:Recommends} Provides: ${xpi:Provides} Enhances: ${xpi:Enhances} Breaks: ubufox (<< 0.9~rc2-0ubuntu3) Replaces: ubufox (<< 0.9~rc2-0ubuntu3) -Description: Ubuntu-specific configuration defaults and apt support for Firefox +Description: Ubuntu modifications for Firefox Adds Ubuntu-specific modifications to Firefox. . Integrates the browser with Ubuntu to: - * Enable searching for missing plugins from Ubuntu software catalog - * Add the following options to the Help menu - - Get help on-line - - Help translating Firefox - - Ubuntu Release Notes + * Add a "Report a bug" entry to the Help menu * Set homepage to Ubuntu Start Page * Display a restart notification after upgrading Firefox - * Add ask.com to the search engines. - . - You can uninstall this if you prefer to use a pristine Firefox install. Package: ubufox Architecture: all diff -Nru ubufox-3.0/debian/docs ubufox-3.1/debian/docs --- ubufox-3.0/debian/docs 2014-05-23 13:06:41.000000000 +0000 +++ ubufox-3.1/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/example-homepage.properties diff -Nru ubufox-3.0/debian/example-homepage.properties ubufox-3.1/debian/example-homepage.properties --- ubufox-3.0/debian/example-homepage.properties 2014-05-23 13:06:41.000000000 +0000 +++ ubufox-3.1/debian/example-homepage.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# to test, just enable the example homepage pref in /etc/xul-ext/ubufox.js -browser.startup.homepage=http://www.ubuntu.com diff -Nru ubufox-3.0/debian/install ubufox-3.1/debian/install --- ubufox-3.0/debian/install 1970-01-01 00:00:00.000000000 +0000 +++ ubufox-3.1/debian/install 2015-07-27 19:15:56.000000000 +0000 @@ -0,0 +1 @@ +usr/share/mozilla diff -Nru ubufox-3.0/debian/maintscript ubufox-3.1/debian/maintscript --- ubufox-3.0/debian/maintscript 1970-01-01 00:00:00.000000000 +0000 +++ ubufox-3.1/debian/maintscript 2015-07-27 19:15:56.000000000 +0000 @@ -0,0 +1 @@ +rm_conffile /etc/xul-ext/ubufox.js 3.1~ diff -Nru ubufox-3.0/debian/rules ubufox-3.1/debian/rules --- ubufox-3.0/debian/rules 2014-05-23 13:06:41.000000000 +0000 +++ ubufox-3.1/debian/rules 2015-07-27 19:15:56.000000000 +0000 @@ -1,6 +1,9 @@ #!/usr/bin/make -f -MOZ_XPI_BUILD_COMMAND = sh build.sh +%: + dh $@ -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/mozilla-devscripts/xpi.mk +override_dh_auto_install: + mkdir -p debian/tmp/usr/share/mozilla/extensions/\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} + install *.xpi debian/tmp/usr/share/mozilla/extensions/\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}/ubufox@ubuntu.com.xpi + dh_auto_install diff -Nru ubufox-3.0/debian/xul-ext-ubufox.js ubufox-3.1/debian/xul-ext-ubufox.js --- ubufox-3.0/debian/xul-ext-ubufox.js 2014-05-23 13:06:41.000000000 +0000 +++ ubufox-3.1/debian/xul-ext-ubufox.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -// Place your global Firefox preferences in this file if you are using -// ubufox. Especially those preferences defined in ubufox need to be configured -// here to become effective. - -// Example: Homepage -//pref("browser.startup.homepage", "file:/usr/share/doc/xul-ext-ubufox/example-homepage.properties"); diff -Nru ubufox-3.0/defaults/preferences/ubuntu-mods.js ubufox-3.1/defaults/preferences/ubuntu-mods.js --- ubufox-3.0/defaults/preferences/ubuntu-mods.js 2015-01-09 12:49:44.000000000 +0000 +++ ubufox-3.1/defaults/preferences/ubuntu-mods.js 2015-06-25 23:32:25.000000000 +0000 @@ -2,12 +2,7 @@ pref("startup.homepage_override_url","chrome://ubufox/locale/ubufox.properties"); pref("startup.homepage_welcome_url","chrome://ubufox/locale/ubufox.properties"); -// look-and-feel modifications in firefox.js pref("browser.startup.homepage","chrome://ubufox/locale/ubufox.properties"); -pref("browser.link.open_newwindow", 3); -pref("browser.link.open_external", 3); -pref("middlemouse.contentLoadURL", false); // setting to false disables pasting urls on to the page - -// kerberos-for-https -pref("network.negotiate-auth.trusted-uris", "https://"); +// See https://lists.ubuntu.com/archives/ubuntu-devel/2004-October/000296.html +pref("middlemouse.contentLoadURL", false); diff -Nru ubufox-3.0/install.rdf ubufox-3.1/install.rdf --- ubufox-3.0/install.rdf 2015-01-09 19:38:34.000000000 +0000 +++ ubufox-3.1/install.rdf 2015-06-25 22:57:35.000000000 +0000 @@ -4,9 +4,10 @@ ubufox@ubuntu.com true - Ubuntu Firefox Modifications - 3.0 + Ubuntu Modifications + 3.1 Canonical Ltd. + 2 Alexander Sack <asac@ubuntu.com> Sasa Bodiroza <jazzva@gmail.com> Daniel Abramov <ex@vingrad.ru> diff -Nru ubufox-3.0/locale/en-AU/ubufox.properties ubufox-3.1/locale/en-AU/ubufox.properties --- ubufox-3.0/locale/en-AU/ubufox.properties 2013-08-05 21:15:39.000000000 +0000 +++ ubufox-3.1/locale/en-AU/ubufox.properties 2015-06-25 23:34:06.000000000 +0000 @@ -1,4 +1,4 @@ -extensions.ubufox@ubuntu.com.description=Ubuntu Firefox Pack. +extensions.ubufox@ubuntu.com.description=Ubuntu modifications for Firefox browser.startup.homepage=about:startpage startup.homepage_override_url=about:blank startup.homepage_welcome_url=about:blank diff -Nru ubufox-3.0/locale/en-CA/ubufox.properties ubufox-3.1/locale/en-CA/ubufox.properties --- ubufox-3.0/locale/en-CA/ubufox.properties 2013-08-05 21:15:39.000000000 +0000 +++ ubufox-3.1/locale/en-CA/ubufox.properties 2015-06-25 23:34:23.000000000 +0000 @@ -1,4 +1,4 @@ -extensions.ubufox@ubuntu.com.description=Ubuntu Firefox Pack. +extensions.ubufox@ubuntu.com.description=Ubuntu modifications for Firefox browser.startup.homepage=about:startpage startup.homepage_override_url=about:blank startup.homepage_welcome_url=about:blank diff -Nru ubufox-3.0/locale/en-GB/ubufox.properties ubufox-3.1/locale/en-GB/ubufox.properties --- ubufox-3.0/locale/en-GB/ubufox.properties 2013-08-05 21:15:39.000000000 +0000 +++ ubufox-3.1/locale/en-GB/ubufox.properties 2015-06-25 23:33:50.000000000 +0000 @@ -1,4 +1,4 @@ -extensions.ubufox@ubuntu.com.description=Ubuntu Firefox Pack. +extensions.ubufox@ubuntu.com.description=Ubuntu modifications for Firefox browser.startup.homepage=about:startpage startup.homepage_override_url=about:blank startup.homepage_welcome_url=about:blank diff -Nru ubufox-3.0/locale/en-US/ubufox.properties ubufox-3.1/locale/en-US/ubufox.properties --- ubufox-3.0/locale/en-US/ubufox.properties 2013-08-05 21:15:39.000000000 +0000 +++ ubufox-3.1/locale/en-US/ubufox.properties 2015-06-25 23:34:40.000000000 +0000 @@ -1,4 +1,4 @@ -extensions.ubufox@ubuntu.com.description=Ubuntu Firefox Pack. +extensions.ubufox@ubuntu.com.description=Ubuntu modifications for Firefox browser.startup.homepage=about:startpage startup.homepage_override_url=about:blank startup.homepage_welcome_url=about:blank diff -Nru ubufox-3.0/res/distributions/Ubuntu.jsm ubufox-3.1/res/distributions/Ubuntu.jsm --- ubufox-3.0/res/distributions/Ubuntu.jsm 2014-11-14 15:41:05.000000000 +0000 +++ ubufox-3.1/res/distributions/Ubuntu.jsm 2015-06-25 23:14:45.000000000 +0000 @@ -135,13 +135,15 @@ }, get startpageURI() { - try { - if (Services.prefs.getCharPref("distribution.id") != "canonical") { - return Services.io.newURI("about:home", null, null); - } - } catch(e) { - return Services.io.newURI("about:home", null, null); - } + // FIXME: about:home doesn't work when called from our about:startpage + // handler + //try { + // if (Services.prefs.getCharPref("distribution.id") != "canonical") { + // return Services.io.newURI("about:home", null, null); + // } + //} catch(e) { + // return Services.io.newURI("about:home", null, null); + //} let provider = getProviderForCurrentSearchEngine(); @@ -157,14 +159,5 @@ } return Services.io.newURI(path + "/" + query, null, baseuri); - }, - - get updateRestartNotificationStyle() { - let parts = distro.version.split("."); - if (Number(parts[0]) > 12 || (Number(parts[0]) == 12 && Number(parts[1] == 10))) { - return "popup"; - } - - return "infobar"; } }; diff -Nru ubufox-3.0/res/libs/gio.jsm ubufox-3.1/res/libs/gio.jsm --- ubufox-3.0/res/libs/gio.jsm 2013-08-05 21:15:39.000000000 +0000 +++ ubufox-3.1/res/libs/gio.jsm 2015-06-25 22:47:25.000000000 +0000 @@ -63,25 +63,6 @@ function gio_defines(lib) { // Enums - CTypesUtils.defineEnums(this, "GBusType", -1, [ - "G_BUS_TYPE_STARTER", - "G_BUS_TYPE_NONE", - "G_BUS_TYPE_SYSTEM", - "G_BUS_TYPE_SESSION" - ]); - - CTypesUtils.defineFlags(this, "GDBusProxyFlags", 0, [ - "G_DBUS_PROXY_FLAGS_NONE", - "G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES", - "G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS", - "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" - ]); - - CTypesUtils.defineFlags(this, "GDBusCallFlags", 0, [ - "G_DBUS_CALL_FLAGS_NONE", - "G_DBUS_CALL_FLAGS_NO_AUTO_START" - ]); - CTypesUtils.defineFlags(this, "GFileMonitorFlags", 0, [ "G_FILE_MONITOR_NONE", "G_FILE_MONITOR_WATCH_MOUNTS", @@ -99,90 +80,15 @@ "G_FILE_MONITOR_EVENT_MOVED" ]); - // GIOErrorEnum - CTypesUtils.defineSimple(this, "G_IO_ERROR_DBUS_ERROR", 36); - // Types - CTypesUtils.defineSimple(this, "GDBusInterfaceInfo", - ctypes.StructType("GDBusInterfaceInfo")); CTypesUtils.defineSimple(this, "GCancellable", ctypes.StructType("GCancellable")); - CTypesUtils.defineSimple(this, "GAsyncResult", - ctypes.StructType("GAsyncResult")); - CTypesUtils.defineSimple(this, "GDBusProxy", - ctypes.StructType("GDBusProxy")); CTypesUtils.defineSimple(this, "GFile", ctypes.StructType("GFile")); CTypesUtils.defineSimple(this, "GFileMonitor", ctypes.StructType("GFileMonitor")); - // Templates - CTypesUtils.defineSimple(this, "GAsyncReadyCallback", - ctypes.FunctionType(ctypes.default_abi, - ctypes.void_t, - [gobject.GObject.ptr, - this.GAsyncResult.ptr, - glib.gpointer]).ptr); - - // Functions - lib.lazy_bind_with_wrapper("g_dbus_proxy_new_for_bus", function(aWrappee, - aBusType, - aFlags, - aInterfaceInfo, - aName, aPath, - aInterface, - aCancellable, - aCallback) { - var ccw = CTypesUtils.wrapCallback(aCallback, - {type: gio.GAsyncReadyCallback, - root: true, singleshot: true}); - - try { - aWrappee(aBusType, aFlags, aInterfaceInfo, aName, aPath, aInterface, - aCancellable, ccw, null); - } catch(e) { - CTypesUtils.unrootCallback(aCallback); - throw e; - } - }, ctypes.void_t, [this.GBusType, this.GDBusProxyFlags, - this.GDBusInterfaceInfo.ptr, glib.gchar.ptr, - glib.gchar.ptr, glib.gchar.ptr, this.GCancellable.ptr, - this.GAsyncReadyCallback, glib.gpointer]); - lib.lazy_bind("g_dbus_proxy_new_for_bus_finish", this.GDBusProxy.ptr, - [this.GAsyncResult.ptr, glib.GError.ptr.ptr]); - lib.lazy_bind_with_wrapper("g_dbus_proxy_call", function(aWrappee, aProxy, - aMethod, aParams, - aFlags, aTimeout, - aCancellable, - aCallback) { - var ccw = CTypesUtils.wrapCallback(aCallback, - {type: gio.GAsyncReadyCallback, - root: true, singleshot: true}); - - try { - aWrappee(aProxy, aMethod, aParams, aFlags, aTimeout, aCancellable, - ccw, null); - } catch(e) { - CTypesUtils.unrootCallback(aCallback); - throw e; - } - }, ctypes.void_t, [this.GDBusProxy.ptr, glib.gchar.ptr, glib.GVariant.ptr, - this.GDBusCallFlags, glib.gint, this.GCancellable.ptr, - this.GAsyncReadyCallback, glib.gpointer]); - lib.lazy_bind("g_dbus_proxy_call_finish", glib.GVariant.ptr, - [this.GDBusProxy.ptr, this.GAsyncResult.ptr, - glib.GError.ptr.ptr]); - lib.lazy_bind_with_wrapper("g_dbus_proxy_get_name", getString, - glib.gchar.ptr, [this.GDBusProxy.ptr]); - lib.lazy_bind_with_wrapper("g_dbus_proxy_get_interface_name", getString, - glib.gchar.ptr, [this.GDBusProxy.ptr]); - lib.lazy_bind_with_wrapper("g_dbus_proxy_get_object_path", getString, - glib.gchar.ptr, [this.GDBusProxy.ptr]); lib.lazy_bind("g_io_error_quark", glib.GQuark); - lib.lazy_bind_with_wrapper("g_dbus_error_get_remote_error", getOwnedString, - glib.gchar.ptr, [glib.GError.ptr]); - lib.lazy_bind_with_wrapper("g_dbus_proxy_get_name_owner", getOwnedString, - glib.gchar.ptr, [this.GDBusProxy.ptr]); lib.lazy_bind("g_file_new_for_path", this.GFile.ptr, [glib.gchar.ptr]); lib.lazy_bind("g_file_monitor_file", this.GFileMonitor.ptr, [this.GFile.ptr, this.GFileMonitorFlags, this.GCancellable.ptr, @@ -195,10 +101,6 @@ CTypesUtils.defineSimple(this, "G_IO_ERROR", this.g_io_error_quark()); - gobject.createSignal(this.GDBusProxy, "g-signal", ctypes.void_t, - [this.GDBusProxy.ptr, glib.gchar.ptr, - glib.gchar.ptr, glib.GVariant.ptr, - glib.gpointer]); gobject.createSignal(this.GFileMonitor, "changed", ctypes.void_t, [this.GFileMonitor.ptr, this.GFile.ptr, this.GFile.ptr, this.GFileMonitorEvent, diff -Nru ubufox-3.0/res/libs/glib.jsm ubufox-3.1/res/libs/glib.jsm --- ubufox-3.0/res/libs/glib.jsm 2013-08-05 21:15:39.000000000 +0000 +++ ubufox-3.1/res/libs/glib.jsm 2015-06-25 22:44:20.000000000 +0000 @@ -67,38 +67,9 @@ [{'domain': this.GQuark}, {'code': this.gint}, {'message': this.gchar.ptr}])); - CTypesUtils.defineSimple(this, "GVariant", ctypes.StructType("GVariant")); - CTypesUtils.defineSimple(this, "GVariantBuilder", - ctypes.StructType("GVariantBuilder", - [{'x': ctypes.size_t.array(16)}])); - CTypesUtils.defineSimple(this, "GVariantType", ctypes.char); - - // Templates // Functions - lib.lazy_bind("g_error_free", ctypes.void_t, [this.GError.ptr]); lib.lazy_bind("g_free", ctypes.void_t, [this.gpointer]); - lib.lazy_bind("g_variant_builder_new", this.GVariantBuilder.ptr, - [this.GVariantType.ptr]); - lib.lazy_bind("g_variant_builder_add", ctypes.void_t, [this.GVariantBuilder.ptr, - this.gchar.ptr, "..."]); - lib.lazy_bind("g_variant_builder_add_value", ctypes.void_t, - [this.GVariantBuilder.ptr, this.GVariant.ptr]); - lib.lazy_bind("g_variant_builder_end", this.GVariant.ptr, - [this.GVariantBuilder.ptr]); - lib.lazy_bind("g_variant_builder_unref", ctypes.void_t, - [this.GVariantBuilder.ptr]); - lib.lazy_bind("g_variant_builder_init", ctypes.void_t, - [this.GVariantBuilder.ptr, this.GVariantType.ptr]); - lib.lazy_bind("g_variant_builder_clear", ctypes.void_t, - [this.GVariantBuilder.ptr]); - lib.lazy_bind("g_variant_unref", ctypes.void_t, [this.GVariant.ptr]); - lib.lazy_bind_with_wrapper("g_variant_get_string", getString, this.gchar.ptr, - [this.GVariant.ptr, ctypes.size_t.ptr]); - lib.lazy_bind("g_variant_get", ctypes.void_t, [this.GVariant.ptr, - this.gchar.ptr, "..."]); - lib.lazy_bind("g_variant_get_int32", this.gint32, [this.GVariant.ptr]); - lib.lazy_bind("g_variant_new", this.GVariant.ptr, [this.gchar.ptr, "..."]); } var glib = new CTypesUtils.newLibrary(GLIB_LIBNAME, GLIB_ABIS, glib_defines); diff -Nru ubufox-3.0/res/modules/Distro.jsm ubufox-3.1/res/modules/Distro.jsm --- ubufox-3.0/res/modules/Distro.jsm 2014-11-14 15:42:15.000000000 +0000 +++ ubufox-3.1/res/modules/Distro.jsm 2015-06-25 23:42:34.000000000 +0000 @@ -95,14 +95,11 @@ get startpageURI() { return Services.io.newURI("about:home", null, null); }, - - get updateRestartNotificationStyle() { - return "popup"; - } }; var distro = { get canReportBug() { + // Hide the menu entry for release builds of Firefox let channel = "default"; try { channel = Services.prefs.getCharPref("app.update.channel"); @@ -117,9 +114,5 @@ get startpageURI() { return impl.startpageURI; - }, - - get updateRestartNotificationStyle() { - return impl.updateRestartNotificationStyle; } }; Binary files /tmp/9hpEd1VPQ9/ubufox-3.0/ubuntu_modifications-3.1-fx-linux.xpi and /tmp/HLEiA8DTxi/ubufox-3.1/ubuntu_modifications-3.1-fx-linux.xpi differ