Title: [279369] trunk/Source/WebKit
- Revision
- 279369
- Author
- [email protected]
- Date
- 2021-06-29 02:12:31 -0700 (Tue, 29 Jun 2021)
Log Message
[GTK][WPE] Check GApplication has a valid ID before trying to create the flatpack info
https://bugs.webkit.org/show_bug.cgi?id=227344
Reviewed by Michael Catanzaro.
Show a warning if GApplication is used but app ID is nullptr.
* UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
(WebKit::createFlatpakInfo):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (279368 => 279369)
--- trunk/Source/WebKit/ChangeLog 2021-06-29 08:11:24 UTC (rev 279368)
+++ trunk/Source/WebKit/ChangeLog 2021-06-29 09:12:31 UTC (rev 279369)
@@ -1,5 +1,17 @@
2021-06-29 Carlos Garcia Campos <[email protected]>
+ [GTK][WPE] Check GApplication has a valid ID before trying to create the flatpack info
+ https://bugs.webkit.org/show_bug.cgi?id=227344
+
+ Reviewed by Michael Catanzaro.
+
+ Show a warning if GApplication is used but app ID is nullptr.
+
+ * UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
+ (WebKit::createFlatpakInfo):
+
+2021-06-29 Carlos Garcia Campos <[email protected]>
+
[GTK][WPE] Bubblewrap: allow to set DBus proxy logging per proxy
https://bugs.webkit.org/show_bug.cgi?id=227447
Modified: trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (279368 => 279369)
--- trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2021-06-29 08:11:24 UTC (rev 279368)
+++ trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2021-06-29 09:12:31 UTC (rev 279369)
@@ -139,13 +139,15 @@
// xdg-desktop-portal relates your name to certain permissions so we want
// them to be application unique which is best done via GApplication.
GApplication* app = g_application_get_default();
- if (!app) {
- g_warning("GApplication is required for xdg-desktop-portal access in the WebKit sandbox. Actions that require xdg-desktop-portal will be broken.");
- return -1;
- }
+ if (!app)
+ g_error("GApplication is required for xdg-desktop-portal access in the WebKit sandbox.");
+ const char* appID = g_application_get_application_id(app);
+ if (!appID)
+ g_error("GApplication must have a valid ID for xdg-desktop-portal access in the WebKit sandbox.");
+
GUniquePtr<GKeyFile> keyFile(g_key_file_new());
- g_key_file_set_string(keyFile.get(), "Application", "name", g_application_get_application_id(app));
+ g_key_file_set_string(keyFile.get(), "Application", "name", appID);
data->reset(g_key_file_to_data(keyFile.get(), &size, nullptr));
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
