WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch for landing
bug-211171-20200429122828.patch (text/plain), 37.10 KB, created by
Claudio Saavedra
on 2020-04-29 02:28:29 PDT
(
hide
)
Description:
Patch for landing
Filename:
MIME Type:
Creator:
Claudio Saavedra
Created:
2020-04-29 02:28:29 PDT
Size:
37.10 KB
patch
obsolete
>Subversion Revision: 260887 >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index babe082e0a460f2966df93ce60e0acc1abf938d1..9d211a9d099193b8efbe879a3a065cf927844bf8 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,46 @@ >+2020-04-29 Claudio Saavedra <csaavedra@igalia.com> >+ >+ [GTK] Remove deprecated GTK API calls from MiniBrowser >+ https://bugs.webkit.org/show_bug.cgi?id=211171 >+ >+ Reviewed by Carlos Garcia Campos. >+ >+ In preparation to porting MiniBrowser to GTK4, remove >+ all deprecated API calls. Also get rid of the --geometry >+ command-line argument and make it a no-op. >+ >+ * MiniBrowser/gtk/BrowserDownloadsBar.c: >+ (browser_downloads_bar_init): >+ (browser_downloads_bar_new): >+ (actionButtonClicked): >+ (browser_download_init): >+ (downloadFinished): >+ * MiniBrowser/gtk/BrowserSearchBar.c: >+ (doSearch): >+ (searchEntryMenuIconPressedCallback): >+ (browser_search_bar_init): >+ * MiniBrowser/gtk/BrowserSettingsDialog.c: >+ (browser_settings_dialog_init): >+ * MiniBrowser/gtk/BrowserTab.c: >+ (createInfoBarQuestionMessage): >+ (browserTabConstructed): >+ * MiniBrowser/gtk/BrowserWindow.c: >+ (browserWindowHistoryItemSelected): >+ (browserWindowHistoryItemActivated): >+ (browserWindowCreateBackForwardMenu): >+ (browserWindowUpdateNavigationMenu): >+ (backForwardlistChanged): >+ (updateUriEntryIcon): >+ (webViewIsLoadingChanged): >+ (browserWindowSetupEditorToolbarItem): >+ (browserWindowSetupEditorToolbar): >+ (browserWindowSwitchTab): >+ (browserWindowSetupToolbarItem): >+ (browser_window_init): >+ (browserWindowUpdateNavigationActions): Deleted. >+ * MiniBrowser/gtk/main.c: >+ (main): >+ > 2020-04-28 Said Abou-Hallawa <sabouhallawa@apple.com> > > Upgrade motionmark1.1.plan to r260656 >diff --git a/Tools/MiniBrowser/gtk/BrowserDownloadsBar.c b/Tools/MiniBrowser/gtk/BrowserDownloadsBar.c >index e7884f5f56c8276894a8c00bee9efb91a651beca..b9feb8e7d97716ff505c3ce0d3bea830ff0a9d62 100644 >--- a/Tools/MiniBrowser/gtk/BrowserDownloadsBar.c >+++ b/Tools/MiniBrowser/gtk/BrowserDownloadsBar.c >@@ -70,7 +70,8 @@ static void browser_downloads_bar_init(BrowserDownloadsBar *downloadsBar) > > GtkWidget *title = gtk_label_new(NULL); > gtk_label_set_markup(GTK_LABEL(title), "<span size='xx-large' weight='bold'>Downloads</span>"); >- gtk_misc_set_alignment(GTK_MISC(title), 0., 0.5); >+ gtk_label_set_xalign(GTK_LABEL(title), 0.); >+ gtk_label_set_yalign(GTK_LABEL(title), 0.5); > gtk_box_pack_start(GTK_BOX(contentBox), title, FALSE, FALSE, 12); > gtk_widget_show(title); > } >@@ -84,7 +85,7 @@ static void browser_downloads_bar_class_init(BrowserDownloadsBarClass *klass) > GtkWidget *browser_downloads_bar_new() > { > GtkInfoBar *downloadsBar = GTK_INFO_BAR(g_object_new(BROWSER_TYPE_DOWNLOADS_BAR, NULL)); >- gtk_info_bar_add_buttons(downloadsBar, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); >+ gtk_info_bar_add_buttons(downloadsBar, "_Close", GTK_RESPONSE_CLOSE, NULL); > return GTK_WIDGET(downloadsBar); > } > >@@ -115,7 +116,7 @@ static void actionButtonClicked(GtkButton *button, BrowserDownload *browserDownl > return; > } > >- gtk_show_uri(gtk_widget_get_screen(GTK_WIDGET(browserDownload)), >+ gtk_show_uri_on_window(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(browserDownload))), > webkit_download_get_destination(browserDownload->download), > gtk_get_current_event_time(), NULL); > gtk_widget_destroy(GTK_WIDGET(browserDownload)); >@@ -149,12 +150,14 @@ static void browser_download_init(BrowserDownload *download) > > download->statusLabel = gtk_label_new("Starting Download"); > gtk_label_set_ellipsize(GTK_LABEL(download->statusLabel), PANGO_ELLIPSIZE_END); >- gtk_misc_set_alignment(GTK_MISC(download->statusLabel), 0., 0.5); >+ gtk_label_set_xalign(GTK_LABEL(download->statusLabel), 0.); >+ gtk_label_set_yalign(GTK_LABEL(download->statusLabel), 0.5); > gtk_box_pack_start(GTK_BOX(statusBox), download->statusLabel, TRUE, TRUE, 0); > gtk_widget_show(download->statusLabel); > > download->remainingLabel = gtk_label_new(NULL); >- gtk_misc_set_alignment(GTK_MISC(download->remainingLabel), 1., 0.5); >+ gtk_label_set_xalign(GTK_LABEL(download->remainingLabel), 1.); >+ gtk_label_set_yalign(GTK_LABEL(download->remainingLabel), 0.5); > gtk_box_pack_end(GTK_BOX(statusBox), download->remainingLabel, TRUE, TRUE, 0); > gtk_widget_show(download->remainingLabel); > >@@ -162,7 +165,7 @@ static void browser_download_init(BrowserDownload *download) > gtk_box_pack_start(GTK_BOX(vbox), download->progressBar, FALSE, FALSE, 0); > gtk_widget_show(download->progressBar); > >- download->actionButton = gtk_button_new_from_stock(GTK_STOCK_CANCEL); >+ download->actionButton = gtk_button_new_with_mnemonic("_Cancel"); > g_signal_connect(download->actionButton, "clicked", G_CALLBACK(actionButtonClicked), download); > gtk_box_pack_end(GTK_BOX(mainBox), download->actionButton, FALSE, FALSE, 0); > gtk_widget_show(download->actionButton); >@@ -233,8 +236,7 @@ static void downloadFinished(WebKitDownload *download, BrowserDownload *browserD > gtk_label_set_text(GTK_LABEL(browserDownload->statusLabel), text); > g_free(text); > gtk_label_set_text(GTK_LABEL(browserDownload->remainingLabel), NULL); >- gtk_button_set_image(GTK_BUTTON(browserDownload->actionButton), >- gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON)); >+ gtk_button_set_image(GTK_BUTTON(browserDownload->actionButton), gtk_image_new_from_icon_name("document-open", GTK_ICON_SIZE_BUTTON)); > gtk_button_set_label(GTK_BUTTON(browserDownload->actionButton), "Open ..."); > browserDownload->finished = TRUE; > } >diff --git a/Tools/MiniBrowser/gtk/BrowserSearchBar.c b/Tools/MiniBrowser/gtk/BrowserSearchBar.c >index 351243cbd5a6fa5c24001dd03971a91f5accd6ab..1d5c7c8a8818caf3f94e99808ea3afc9d6568406 100644 >--- a/Tools/MiniBrowser/gtk/BrowserSearchBar.c >+++ b/Tools/MiniBrowser/gtk/BrowserSearchBar.c >@@ -57,13 +57,13 @@ static void doSearch(BrowserSearchBar *searchBar) > > if (!gtk_entry_get_text_length(entry)) { > webkit_find_controller_search_finish(webkit_web_view_get_find_controller(searchBar->webView)); >- gtk_entry_set_icon_from_stock(entry, GTK_ENTRY_ICON_SECONDARY, NULL); >+ gtk_entry_set_icon_from_icon_name(entry, GTK_ENTRY_ICON_SECONDARY, NULL); > setFailedStyleForEntry(searchBar, FALSE); > return; > } > >- if (!gtk_entry_get_icon_stock(entry, GTK_ENTRY_ICON_SECONDARY)) >- gtk_entry_set_icon_from_stock(entry, GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR); >+ if (!gtk_entry_get_icon_name(entry, GTK_ENTRY_ICON_SECONDARY)) >+ gtk_entry_set_icon_from_icon_name(entry, GTK_ENTRY_ICON_SECONDARY, "edit-clear"); > > WebKitFindOptions options = WEBKIT_FIND_OPTIONS_WRAP_AROUND; > if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(searchBar->caseCheckButton))) >@@ -94,10 +94,8 @@ static void searchCloseButtonClickedCallback(BrowserSearchBar *searchBar) > > static void searchEntryMenuIconPressedCallback(BrowserSearchBar *searchBar, GtkEntryIconPosition iconPosition, GdkEvent *event) > { >- if (iconPosition == GTK_ENTRY_ICON_PRIMARY) { >- GdkEventButton *eventButton = (GdkEventButton *)event; >- gtk_menu_popup(GTK_MENU(searchBar->optionsMenu), NULL, NULL, NULL, NULL, eventButton->button, eventButton->time); >- } >+ if (iconPosition == GTK_ENTRY_ICON_PRIMARY) >+ gtk_menu_popup_at_pointer(GTK_MENU(searchBar->optionsMenu), event); > } > > static void searchEntryClearIconReleasedCallback(BrowserSearchBar *searchBar, GtkEntryIconPosition iconPosition) >@@ -158,7 +156,7 @@ static void browser_search_bar_init(BrowserSearchBar *searchBar) > searchBar->entry = gtk_entry_new(); > gtk_widget_set_name(searchBar->entry, "searchEntry"); > gtk_entry_set_placeholder_text(GTK_ENTRY(searchBar->entry), "Search"); >- gtk_entry_set_icon_from_stock(GTK_ENTRY(searchBar->entry), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND); >+ gtk_entry_set_icon_from_icon_name(GTK_ENTRY(searchBar->entry), GTK_ENTRY_ICON_PRIMARY, "edit-find"); > gtk_box_pack_start(hBox, searchBar->entry, TRUE, TRUE, 0); > > searchBar->cssProvider = gtk_css_provider_new(); >@@ -167,28 +165,21 @@ static void browser_search_bar_init(BrowserSearchBar *searchBar) > GtkBox *hBoxButtons = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0)); > gtk_box_pack_start(hBox, GTK_WIDGET(hBoxButtons), TRUE, TRUE, 0); > >- searchBar->prevButton = gtk_button_new(); >+ searchBar->prevButton = gtk_button_new_from_icon_name("go-up", GTK_ICON_SIZE_SMALL_TOOLBAR); > GtkButton *button = GTK_BUTTON(searchBar->prevButton); >- GtkWidget *image = gtk_image_new_from_stock(GTK_STOCK_GO_UP, GTK_ICON_SIZE_SMALL_TOOLBAR); >- gtk_button_set_image(button, image); > gtk_button_set_relief(button, GTK_RELIEF_NONE); >- gtk_button_set_focus_on_click(button, FALSE); >+ gtk_widget_set_focus_on_click(searchBar->prevButton, FALSE); > gtk_box_pack_start(hBoxButtons, searchBar->prevButton, FALSE, FALSE, 0); > >- searchBar->nextButton = gtk_button_new(); >+ searchBar->nextButton = gtk_button_new_from_icon_name("go-down", GTK_ICON_SIZE_SMALL_TOOLBAR); > button = GTK_BUTTON(searchBar->nextButton); >- image = gtk_image_new_from_stock(GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_SMALL_TOOLBAR); >- gtk_button_set_image(button, image); > gtk_button_set_relief(button, GTK_RELIEF_NONE); >- gtk_button_set_focus_on_click(button, FALSE); >+ gtk_widget_set_focus_on_click(searchBar->nextButton, FALSE); > gtk_box_pack_start(hBoxButtons, searchBar->nextButton, FALSE, FALSE, 0); > >- GtkWidget *closeButton = gtk_button_new(); >- button = GTK_BUTTON(closeButton); >- image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_SMALL_TOOLBAR); >- gtk_button_set_image(button, image); >- gtk_button_set_relief(button, GTK_RELIEF_NONE); >- gtk_button_set_focus_on_click(button, FALSE); >+ GtkWidget *closeButton = gtk_button_new_from_icon_name("window-close", GTK_ICON_SIZE_SMALL_TOOLBAR); >+ gtk_button_set_relief(GTK_BUTTON(closeButton), GTK_RELIEF_NONE); >+ gtk_widget_set_focus_on_click(closeButton, FALSE); > gtk_box_pack_end(hBoxButtons, closeButton, FALSE, FALSE, 0); > > searchBar->optionsMenu = g_object_ref_sink(gtk_menu_new()); >diff --git a/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c b/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c >index 178f0539d1b5116ec71dc0e009aac6c855e052eb..d77576404e842d874285105c913313f46b471537 100644 >--- a/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c >+++ b/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c >@@ -133,7 +133,7 @@ static void browser_settings_dialog_init(BrowserSettingsDialog *dialog) > gtk_window_set_title(GTK_WINDOW(dialog), "WebKit View Settings"); > gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); > gtk_container_set_border_width(GTK_CONTAINER(dialog), 5); >- gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); >+ gtk_dialog_add_button(GTK_DIALOG(dialog), "_Close", GTK_RESPONSE_CLOSE); > gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE); > > GtkWidget *scrolledWindow = gtk_scrolled_window_new(NULL, NULL); >diff --git a/Tools/MiniBrowser/gtk/BrowserTab.c b/Tools/MiniBrowser/gtk/BrowserTab.c >index 962f33d113f6192f2b349ea088235f6e48bb875d..8579098d6d9bf5f3e103e69a4aa9573bcf459db6 100644 >--- a/Tools/MiniBrowser/gtk/BrowserTab.c >+++ b/Tools/MiniBrowser/gtk/BrowserTab.c >@@ -158,22 +158,24 @@ static GtkWidget *createInfoBarQuestionMessage(const char *title, const char *te > gtk_orientable_set_orientation(GTK_ORIENTABLE(contentBox), GTK_ORIENTATION_VERTICAL); > gtk_box_set_spacing(GTK_BOX(contentBox), 0); > >- GtkWidget *label = gtk_label_new(NULL); >+ GtkLabel *label = GTK_LABEL(gtk_label_new(NULL)); > gchar *markup = g_strdup_printf("<span size='xx-large' weight='bold'>%s</span>", title); >- gtk_label_set_markup(GTK_LABEL(label), markup); >+ gtk_label_set_markup(label, markup); > g_free(markup); >- gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); >- gtk_label_set_selectable(GTK_LABEL(label), TRUE); >- gtk_misc_set_alignment(GTK_MISC(label), 0., 0.5); >- gtk_box_pack_start(GTK_BOX(contentBox), label, FALSE, FALSE, 2); >- gtk_widget_show(label); >- >- label = gtk_label_new(text); >- gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); >- gtk_label_set_selectable(GTK_LABEL(label), TRUE); >- gtk_misc_set_alignment(GTK_MISC(label), 0., 0.5); >- gtk_box_pack_start(GTK_BOX(contentBox), label, FALSE, FALSE, 0); >- gtk_widget_show(label); >+ gtk_label_set_line_wrap(label, TRUE); >+ gtk_label_set_selectable(label, TRUE); >+ gtk_label_set_xalign(label, 0.); >+ gtk_label_set_yalign(label, 0.5); >+ gtk_box_pack_start(GTK_BOX(contentBox), GTK_WIDGET(label), FALSE, FALSE, 2); >+ gtk_widget_show(GTK_WIDGET(label)); >+ >+ label = GTK_LABEL(gtk_label_new(text)); >+ gtk_label_set_line_wrap(label, TRUE); >+ gtk_label_set_selectable(label, TRUE); >+ gtk_label_set_xalign(label, 0.); >+ gtk_label_set_yalign(label, 0.5); >+ gtk_box_pack_start(GTK_BOX(contentBox), GTK_WIDGET(label), FALSE, FALSE, 0); >+ gtk_widget_show(GTK_WIDGET(label)); > > return dialog; > } >@@ -408,8 +410,8 @@ static void browserTabConstructed(GObject *gObject) > gtk_widget_set_halign(tab->statusLabel, GTK_ALIGN_START); > gtk_widget_set_valign(tab->statusLabel, GTK_ALIGN_END); > #if !GTK_CHECK_VERSION(3, 98, 0) >- gtk_widget_set_margin_left(tab->statusLabel, 1); >- gtk_widget_set_margin_right(tab->statusLabel, 1); >+ gtk_widget_set_margin_start(tab->statusLabel, 1); >+ gtk_widget_set_margin_end(tab->statusLabel, 1); > gtk_widget_set_margin_top(tab->statusLabel, 1); > gtk_widget_set_margin_bottom(tab->statusLabel, 1); > #endif >@@ -447,7 +449,6 @@ static void browserTabConstructed(GObject *gObject) > tab->titleLabel = gtk_label_new(NULL); > gtk_label_set_ellipsize(GTK_LABEL(tab->titleLabel), PANGO_ELLIPSIZE_END); > gtk_label_set_single_line_mode(GTK_LABEL(tab->titleLabel), TRUE); >- gtk_misc_set_padding(GTK_MISC(tab->titleLabel), 0, 0); > gtk_box_pack_start(GTK_BOX(hbox), tab->titleLabel, FALSE, FALSE, 0); > gtk_widget_show(tab->titleLabel); > >@@ -457,7 +458,7 @@ static void browserTabConstructed(GObject *gObject) > tab->titleCloseButton = gtk_button_new(); > g_signal_connect_swapped(tab->titleCloseButton, "clicked", G_CALLBACK(gtk_widget_destroy), tab); > gtk_button_set_relief(GTK_BUTTON(tab->titleCloseButton), GTK_RELIEF_NONE); >- gtk_button_set_focus_on_click(GTK_BUTTON(tab->titleCloseButton), FALSE); >+ gtk_widget_set_focus_on_click(tab->titleCloseButton, FALSE); > > GtkWidget *image = gtk_image_new_from_icon_name("window-close-symbolic", GTK_ICON_SIZE_MENU); > gtk_container_add(GTK_CONTAINER(tab->titleCloseButton), image); >diff --git a/Tools/MiniBrowser/gtk/BrowserWindow.c b/Tools/MiniBrowser/gtk/BrowserWindow.c >index 53c564f4543d705c9bafe1f41833c23b3c8e7f30..e786fdcfe6352be274281d58a5260b15ea622567 100644 >--- a/Tools/MiniBrowser/gtk/BrowserWindow.c >+++ b/Tools/MiniBrowser/gtk/BrowserWindow.c >@@ -210,15 +210,15 @@ static void downloadStarted(WebKitWebContext *webContext, WebKitDownload *downlo > } > > #if !GTK_CHECK_VERSION(3, 98, 0) >-static void browserWindowHistoryItemSelected(BrowserWindow *window, GtkMenuItem *item) >+static void browserWindowHistoryItemSelected(BrowserWindow *window, GtkMenuItem *menuItem) > { >- GtkAction *action = gtk_activatable_get_related_action(GTK_ACTIVATABLE(item)); >- browserWindowSetStatusText(window, action ? gtk_action_get_name(action) : NULL); >+ WebKitBackForwardListItem *item = g_object_get_data(G_OBJECT(menuItem), "back-forward-list-item"); >+ browserWindowSetStatusText(window, item ? webkit_back_forward_list_item_get_uri(item) : NULL); > } > >-static void browserWindowHistoryItemActivated(BrowserWindow *window, GtkAction *action) >+static void browserWindowHistoryItemActivated(BrowserWindow *window, GtkMenuItem *menuItem) > { >- WebKitBackForwardListItem *item = g_object_get_data(G_OBJECT(action), "back-forward-list-item"); >+ WebKitBackForwardListItem *item = g_object_get_data(G_OBJECT(menuItem), "back-forward-list-item"); > if (!item) > return; > >@@ -235,16 +235,12 @@ static GtkWidget *browserWindowCreateBackForwardMenu(BrowserWindow *window, GLis > GList *listItem; > for (listItem = list; listItem; listItem = g_list_next(listItem)) { > WebKitBackForwardListItem *item = (WebKitBackForwardListItem *)listItem->data; >- const char *uri = webkit_back_forward_list_item_get_uri(item); > const char *title = webkit_back_forward_list_item_get_title(item); > >- GtkAction *action = gtk_action_new(uri, title, NULL, NULL); >- g_object_set_data_full(G_OBJECT(action), "back-forward-list-item", g_object_ref(item), g_object_unref); >- g_signal_connect_swapped(action, "activate", G_CALLBACK(browserWindowHistoryItemActivated), window); >- >- GtkWidget *menuItem = gtk_action_create_menu_item(action); >+ GtkWidget *menuItem = gtk_menu_item_new_with_label(title); >+ g_object_set_data_full(G_OBJECT(menuItem), "back-forward-list-item", g_object_ref(item), g_object_unref); > g_signal_connect_swapped(menuItem, "select", G_CALLBACK(browserWindowHistoryItemSelected), window); >- g_object_unref(action); >+ g_signal_connect_swapped(menuItem, "activate", G_CALLBACK(browserWindowHistoryItemActivated), window); > > gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuItem); > gtk_widget_show(menuItem); >@@ -256,7 +252,7 @@ static GtkWidget *browserWindowCreateBackForwardMenu(BrowserWindow *window, GLis > } > #endif > >-static void browserWindowUpdateNavigationActions(BrowserWindow *window, WebKitBackForwardList *backForwardlist) >+static void browserWindowUpdateNavigationMenu(BrowserWindow *window, WebKitBackForwardList *backForwardlist) > { > #if !GTK_CHECK_VERSION(3, 98, 0) > WebKitWebView *webView = browser_tab_get_web_view(window->activeTab); >@@ -300,7 +296,7 @@ static void browserWindowTryClose(BrowserWindow *window) > > static void backForwardlistChanged(WebKitBackForwardList *backForwardlist, WebKitBackForwardListItem *itemAdded, GList *itemsRemoved, BrowserWindow *window) > { >- browserWindowUpdateNavigationActions(window, backForwardlist); >+ browserWindowUpdateNavigationMenu(window, backForwardlist); > } > > static void webViewClose(WebKitWebView *webView, BrowserWindow *window) >@@ -495,7 +491,7 @@ static void updateUriEntryIcon(BrowserWindow *window) > if (window->favicon) > gtk_entry_set_icon_from_pixbuf(entry, GTK_ENTRY_ICON_PRIMARY, window->favicon); > else >- gtk_entry_set_icon_from_stock(entry, GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_NEW); >+ gtk_entry_set_icon_from_icon_name(entry, GTK_ENTRY_ICON_PRIMARY, "document-new"); > #endif > } > >@@ -522,7 +518,7 @@ static void webViewIsLoadingChanged(WebKitWebView *webView, GParamSpec *paramSpe > #if !GTK_CHECK_VERSION(3, 98, 0) > gboolean isLoading = webkit_web_view_is_loading(webView); > gtk_tool_button_set_label(GTK_TOOL_BUTTON(window->reloadOrStopButton), isLoading ? "Stop" : "Reload"); >- gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(window->reloadOrStopButton), isLoading ? GTK_STOCK_STOP : GTK_STOCK_REFRESH); >+ gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(window->reloadOrStopButton), isLoading ? "process-stop" : "view-refresh"); > #endif > } > >@@ -758,6 +754,19 @@ static void browserWindowDispose(GObject *gObject) > G_OBJECT_CLASS(browser_window_parent_class)->dispose(gObject); > } > >+static GtkWidget * >+browserWindowSetupEditorToolbarItem(BrowserWindow* window, GtkWidget* toolbar, GType type, const char* label, const char* namedIcon) >+{ >+ GtkWidget *item = g_object_new(type, "icon-name", namedIcon, NULL); >+ gtk_widget_set_name(item, label); >+ gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), label); >+ g_signal_connect(G_OBJECT(item), type == GTK_TYPE_TOGGLE_TOOL_BUTTON ? "toggled" : "clicked", G_CALLBACK(editingCommandCallback), window); >+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1); >+ gtk_widget_show(item); >+ >+ return item; >+} >+ > static void browserWindowSetupEditorToolbar(BrowserWindow *window) > { > #if !GTK_CHECK_VERSION(3, 98, 0) >@@ -765,102 +774,50 @@ static void browserWindowSetupEditorToolbar(BrowserWindow *window) > gtk_orientable_set_orientation(GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL); > gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ); > >- GtkToolItem *item = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_BOLD); >- window->boldItem = GTK_WIDGET(item); >- gtk_widget_set_name(GTK_WIDGET(item), "Bold"); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Bold"); >- g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(editingCommandCallback), window); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_show(GTK_WIDGET(item)); >- >- item = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_ITALIC); >- window->italicItem = GTK_WIDGET(item); >- gtk_widget_set_name(GTK_WIDGET(item), "Italic"); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Italic"); >- g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(editingCommandCallback), window); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_show(GTK_WIDGET(item)); >+ window->boldItem = browserWindowSetupEditorToolbarItem(window, toolbar, GTK_TYPE_TOGGLE_TOOL_BUTTON, "Bold", "format-text-bold"); >+ window->italicItem = browserWindowSetupEditorToolbarItem(window, toolbar, GTK_TYPE_TOGGLE_TOOL_BUTTON, "Italic", "format-text-italic"); >+ window->underlineItem = browserWindowSetupEditorToolbarItem(window, toolbar, GTK_TYPE_TOGGLE_TOOL_BUTTON, "Underline", "format-text-underline"); >+ window->strikethroughItem = browserWindowSetupEditorToolbarItem(window, toolbar, GTK_TYPE_TOGGLE_TOOL_BUTTON, "Strikethrough", "format-text-strikethrough"); > >- item = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_UNDERLINE); >- window->underlineItem = GTK_WIDGET(item); >- gtk_widget_set_name(GTK_WIDGET(item), "Underline"); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Underline"); >- g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(editingCommandCallback), window); >+ GtkToolItem *item = gtk_separator_tool_item_new(); > gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); > gtk_widget_show(GTK_WIDGET(item)); > >- item = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_STRIKETHROUGH); >- gtk_widget_set_name(GTK_WIDGET(item), "Strikethrough"); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Strikethrough"); >- window->strikethroughItem = GTK_WIDGET(item); >- g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(editingCommandCallback), window); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_show(GTK_WIDGET(item)); >+ browserWindowSetupEditorToolbarItem(window, toolbar, GTK_TYPE_TOOL_BUTTON, WEBKIT_EDITING_COMMAND_CUT, "edit-cut"); >+ browserWindowSetupEditorToolbarItem(window, toolbar, GTK_TYPE_TOOL_BUTTON, WEBKIT_EDITING_COMMAND_COPY, "edit-copy"); >+ browserWindowSetupEditorToolbarItem(window, toolbar, GTK_TYPE_TOOL_BUTTON, WEBKIT_EDITING_COMMAND_PASTE, "edit-paste"); > > item = gtk_separator_tool_item_new(); > gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); > gtk_widget_show(GTK_WIDGET(item)); > >- item = gtk_tool_button_new_from_stock(GTK_STOCK_CUT); >- gtk_widget_set_name(GTK_WIDGET(item), WEBKIT_EDITING_COMMAND_CUT); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), WEBKIT_EDITING_COMMAND_CUT); >- g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(editingCommandCallback), window); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_show(GTK_WIDGET(item)); >- >- item = gtk_tool_button_new_from_stock(GTK_STOCK_COPY); >- gtk_widget_set_name(GTK_WIDGET(item), WEBKIT_EDITING_COMMAND_COPY); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), WEBKIT_EDITING_COMMAND_COPY); >- g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(editingCommandCallback), window); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_show(GTK_WIDGET(item)); >- >- item = gtk_tool_button_new_from_stock(GTK_STOCK_PASTE); >- gtk_widget_set_name(GTK_WIDGET(item), WEBKIT_EDITING_COMMAND_PASTE); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), WEBKIT_EDITING_COMMAND_PASTE); >- g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(editingCommandCallback), window); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_show(GTK_WIDGET(item)); >+ browserWindowSetupEditorToolbarItem(window, toolbar, GTK_TYPE_TOOL_BUTTON, WEBKIT_EDITING_COMMAND_UNDO, "edit-undo"); >+ browserWindowSetupEditorToolbarItem(window, toolbar, GTK_TYPE_TOOL_BUTTON, WEBKIT_EDITING_COMMAND_REDO, "edit-redo"); > > item = gtk_separator_tool_item_new(); > gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); > gtk_widget_show(GTK_WIDGET(item)); > >- item = gtk_tool_button_new_from_stock(GTK_STOCK_UNDO); >- gtk_widget_set_name(GTK_WIDGET(item), WEBKIT_EDITING_COMMAND_UNDO); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), WEBKIT_EDITING_COMMAND_UNDO); >- g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(editingCommandCallback), window); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_show(GTK_WIDGET(item)); >- >- item = gtk_tool_button_new_from_stock(GTK_STOCK_REDO); >- gtk_widget_set_name(GTK_WIDGET(item), WEBKIT_EDITING_COMMAND_REDO); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), WEBKIT_EDITING_COMMAND_REDO); >- g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(editingCommandCallback), window); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_show(GTK_WIDGET(item)); >- >- item = gtk_separator_tool_item_new(); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_show(GTK_WIDGET(item)); >- >- item = gtk_radio_tool_button_new_from_stock(NULL, GTK_STOCK_JUSTIFY_LEFT); >+ item = gtk_radio_tool_button_new(NULL); > GSList *justifyRadioGroup = gtk_radio_tool_button_get_group(GTK_RADIO_TOOL_BUTTON(item)); >+ gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(item), "format-justify-left"); > gtk_widget_set_name(GTK_WIDGET(item), "JustifyLeft"); > gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Justify Left"); > g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(editingCommandCallback), window); > gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); > gtk_widget_show(GTK_WIDGET(item)); > >- item = gtk_radio_tool_button_new_from_stock(justifyRadioGroup, GTK_STOCK_JUSTIFY_CENTER); >+ item = gtk_radio_tool_button_new(justifyRadioGroup); > justifyRadioGroup = gtk_radio_tool_button_get_group(GTK_RADIO_TOOL_BUTTON(item)); >+ gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(item), "format-justify-center"); > gtk_widget_set_name(GTK_WIDGET(item), "JustifyCenter"); > gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Justify Center"); > g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(editingCommandCallback), window); > gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); > gtk_widget_show(GTK_WIDGET(item)); > >- item = gtk_radio_tool_button_new_from_stock(justifyRadioGroup, GTK_STOCK_JUSTIFY_RIGHT); >+ item = gtk_radio_tool_button_new(justifyRadioGroup); >+ gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(item), "format-justify-right"); > gtk_widget_set_name(GTK_WIDGET(item), "JustifyRight"); > gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Justify Right"); > g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(editingCommandCallback), window); >@@ -871,19 +828,8 @@ static void browserWindowSetupEditorToolbar(BrowserWindow *window) > gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); > gtk_widget_show(GTK_WIDGET(item)); > >- item = gtk_tool_button_new_from_stock(GTK_STOCK_INDENT); >- gtk_widget_set_name(GTK_WIDGET(item), "Indent"); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Indent"); >- g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(editingCommandCallback), window); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_show(GTK_WIDGET(item)); >- >- item = gtk_tool_button_new_from_stock(GTK_STOCK_UNINDENT); >- gtk_widget_set_name(GTK_WIDGET(item), "Outdent"); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Outdent"); >- g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(editingCommandCallback), window); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_show(GTK_WIDGET(item)); >+ browserWindowSetupEditorToolbarItem(window, toolbar, GTK_TYPE_TOOL_BUTTON, "Indent", "format-indent-more"); >+ browserWindowSetupEditorToolbarItem(window, toolbar, GTK_TYPE_TOOL_BUTTON, "Outdent", "format-indent-less"); > > item = gtk_separator_tool_item_new(); > gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >@@ -963,7 +909,7 @@ static void browserWindowSwitchTab(GtkNotebook *notebook, BrowserTab *tab, guint > #endif > > WebKitBackForwardList *backForwardlist = webkit_web_view_get_back_forward_list(webView); >- browserWindowUpdateNavigationActions(window, backForwardlist); >+ browserWindowUpdateNavigationMenu(window, backForwardlist); > g_signal_connect(backForwardlist, "changed", G_CALLBACK(backForwardlistChanged), window); > } > >@@ -972,6 +918,19 @@ static void browserWindowTabAddedOrRemoved(GtkNotebook *notebook, BrowserTab *ta > gtk_notebook_set_show_tabs(GTK_NOTEBOOK(window->notebook), gtk_notebook_get_n_pages(notebook) > 1); > } > >+static GtkWidget* browserWindowSetupToolbarItem(BrowserWindow* window, GtkWidget* toolbar, GType type, const char* label, const char* namedIcon, GCallback callback) >+{ >+ GtkWidget *item = g_object_new(type, "icon-name", namedIcon, NULL); >+ if (type == GTK_TYPE_MENU_TOOL_BUTTON) >+ gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(item), 0); >+ g_signal_connect_swapped(item, "clicked", callback, (gpointer)window); >+ gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), label); >+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1); >+ gtk_widget_show(item); >+ >+ return item; >+} >+ > static void browser_window_init(BrowserWindow *window) > { > windowList = g_list_append(windowList, window); >@@ -1059,57 +1018,20 @@ static void browser_window_init(BrowserWindow *window) > gtk_orientable_set_orientation(GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL); > gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ); > >- GtkToolItem *item = gtk_menu_tool_button_new_from_stock(GTK_STOCK_GO_BACK); >- window->backItem = GTK_WIDGET(item); >- gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(item), 0); >- g_signal_connect_swapped(item, "clicked", G_CALLBACK(goBackCallback), (gpointer)window); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Back"); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_show(GTK_WIDGET(item)); >- >- item = gtk_menu_tool_button_new_from_stock(GTK_STOCK_GO_FORWARD); >- window->forwardItem = GTK_WIDGET(item); >- gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(item), 0); >- g_signal_connect_swapped(G_OBJECT(item), "clicked", G_CALLBACK(goForwardCallback), (gpointer)window); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Forward"); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_show(GTK_WIDGET(item)); >+ window->backItem = browserWindowSetupToolbarItem(window, toolbar, GTK_TYPE_MENU_TOOL_BUTTON, "Back", "go-previous", G_CALLBACK(goBackCallback)); >+ window->forwardItem = browserWindowSetupToolbarItem(window, toolbar, GTK_TYPE_MENU_TOOL_BUTTON, "Forward", "go-next", G_CALLBACK(goForwardCallback)); >+ browserWindowSetupToolbarItem(window, toolbar, GTK_TYPE_TOOL_BUTTON, "Preferences", "preferences-system", G_CALLBACK(settingsCallback)); > >- item = gtk_tool_button_new_from_stock(GTK_STOCK_PREFERENCES); >- g_signal_connect_swapped(G_OBJECT(item), "clicked", G_CALLBACK(settingsCallback), window); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Preferences"); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_show(GTK_WIDGET(item)); >+ window->zoomOutItem = browserWindowSetupToolbarItem(window, toolbar, GTK_TYPE_TOOL_BUTTON, "Zoom Out", "zoom-out", G_CALLBACK(zoomOutCallback)); >+ window->zoomInItem = browserWindowSetupToolbarItem(window, toolbar, GTK_TYPE_TOOL_BUTTON, "Zoom In", "zoom-in", G_CALLBACK(zoomInCallback)); > >- item = gtk_tool_button_new_from_stock(GTK_STOCK_ZOOM_OUT); >- window->zoomOutItem = GTK_WIDGET(item); >- g_signal_connect_swapped(item, "clicked", G_CALLBACK(zoomOutCallback), window); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Zoom Out"); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_show(GTK_WIDGET(item)); >+ gtk_widget_add_accelerator(browserWindowSetupToolbarItem(window, toolbar, GTK_TYPE_TOOL_BUTTON, "Find", "edit-find", G_CALLBACK(searchCallback)), >+ "clicked", window->accelGroup, GDK_KEY_F, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); > >- item = gtk_tool_button_new_from_stock(GTK_STOCK_ZOOM_IN); >- window->zoomInItem = GTK_WIDGET(item); >- g_signal_connect_swapped(item, "clicked", G_CALLBACK(zoomInCallback), window); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Zoom In"); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_show(GTK_WIDGET(item)); >+ gtk_widget_add_accelerator(browserWindowSetupToolbarItem(window, toolbar, GTK_TYPE_TOOL_BUTTON, "Home", "go-home", G_CALLBACK(loadHomePage)), >+ "clicked", window->accelGroup, GDK_KEY_Home, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE); > >- item = gtk_tool_button_new_from_stock(GTK_STOCK_FIND); >- g_signal_connect_swapped(item, "clicked", G_CALLBACK(searchCallback), window); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Find"); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_add_accelerator(GTK_WIDGET(item), "clicked", window->accelGroup, GDK_KEY_F, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); >- gtk_widget_show(GTK_WIDGET(item)); >- >- item = gtk_tool_button_new_from_stock(GTK_STOCK_HOME); >- g_signal_connect_swapped(item, "clicked", G_CALLBACK(loadHomePage), window); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Home"); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >- gtk_widget_add_accelerator(GTK_WIDGET(item), "clicked", window->accelGroup, GDK_KEY_Home, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE); >- gtk_widget_show(GTK_WIDGET(item)); >- >- item = gtk_tool_button_new(gtk_image_new_from_icon_name("tab-new", GTK_ICON_SIZE_SMALL_TOOLBAR), NULL); >+ GtkToolItem *item = gtk_tool_button_new(gtk_image_new_from_icon_name("tab-new", GTK_ICON_SIZE_SMALL_TOOLBAR), NULL); > g_signal_connect_swapped(item, "clicked", G_CALLBACK(newTabCallback), window); > gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "New Tab"); > gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >@@ -1123,13 +1045,8 @@ static void browser_window_init(BrowserWindow *window) > gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); > gtk_widget_show(GTK_WIDGET(item)); > >- item = gtk_tool_button_new_from_stock(GTK_STOCK_REFRESH); >- window->reloadOrStopButton = GTK_WIDGET(item); >- g_signal_connect_swapped(item, "clicked", G_CALLBACK(reloadOrStopCallback), window); >- gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Reload"); >- gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); >+ window->reloadOrStopButton = browserWindowSetupToolbarItem(window, toolbar, GTK_TYPE_TOOL_BUTTON, "Reload", "view-refresh", G_CALLBACK(reloadOrStopCallback)); > gtk_widget_add_accelerator(window->reloadOrStopButton, "clicked", window->accelGroup, GDK_KEY_F5, 0, GTK_ACCEL_VISIBLE); >- gtk_widget_show(window->reloadOrStopButton); > #endif > GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); > window->mainBox = vbox; >diff --git a/Tools/MiniBrowser/gtk/main.c b/Tools/MiniBrowser/gtk/main.c >index e7e7ed6453d049ac383fa906a63344091cef082e..2ff45b938cffabe95fe17137393b8b6c506d4993 100644 >--- a/Tools/MiniBrowser/gtk/main.c >+++ b/Tools/MiniBrowser/gtk/main.c >@@ -111,7 +111,7 @@ static const GOptionEntry commandLineOptions[] = > { "editor-mode", 'e', 0, G_OPTION_ARG_NONE, &editorMode, "Run in editor mode", NULL }, > { "dark-mode", 'd', 0, G_OPTION_ARG_NONE, &darkMode, "Run in dark mode", NULL }, > { "session-file", 's', 0, G_OPTION_ARG_FILENAME, &sessionFile, "Session file", "FILE" }, >- { "geometry", 'g', 0, G_OPTION_ARG_STRING, &geometry, "Set the size and position of the window (WIDTHxHEIGHT+X+Y)", "GEOMETRY" }, >+ { "geometry", 'g', 0, G_OPTION_ARG_STRING, &geometry, "Unused. Kept for backwards-compatibility only", "GEOMETRY" }, > { "full-screen", 'f', 0, G_OPTION_ARG_NONE, &fullScreen, "Set the window to full-screen mode", NULL }, > { "private", 'p', 0, G_OPTION_ARG_NONE, &privateMode, "Run in private browsing mode", NULL }, > { "automation", 0, 0, G_OPTION_ARG_NONE, &automationMode, "Run in automation mode", NULL }, >@@ -621,10 +621,6 @@ int main(int argc, char *argv[]) > g_object_set(gtk_widget_get_settings(GTK_WIDGET(mainWindow)), "gtk-application-prefer-dark-theme", TRUE, NULL); > if (fullScreen) > gtk_window_fullscreen(GTK_WINDOW(mainWindow)); >-#if !GTK_CHECK_VERSION(3, 98, 0) >- else if (geometry) >- gtk_window_parse_geometry(GTK_WINDOW(mainWindow), geometry); >-#endif > > if (backgroundColor) > browser_window_set_background_color(mainWindow, backgroundColor);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=397949">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 211171
:
397942
| 397949