[gtranslator: 1/2] Revert "The gtr_application_init should not use GTK+ functions. I moved css loader and load_accels()
- From: Daniel Garcia Moreno <danigm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtranslator: 1/2] Revert "The gtr_application_init should not use GTK+ functions. I moved css loader and load_accels()
- Date: Mon, 11 Nov 2019 10:45:32 +0000 (UTC)
commit 777845ee889da3227eecbe59881a9cbd3e9b73c7
Author: Izabela Bakollari <izabela bakollari gmail com>
Date: Mon Nov 11 10:45:14 2019 +0000
Revert "The gtr_application_init should not use GTK+ functions. I moved css loader and load_accels() at
gtr_application_startup where gtk_init is called. This commit tries to solve the critical at start
"gtk_icon_theme_get_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed""
The commit included unrelated changes that were merged
accidentally into master.
This reverts commit 684a862c60bf70c00fcc34ed02c545dfe449c2e6.
src/gtr-notebook.c | 6 +++---
src/gtr-window.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/gtr-notebook.c b/src/gtr-notebook.c
index c8e1e776..f84d9640 100644
--- a/src/gtr-notebook.c
+++ b/src/gtr-notebook.c
@@ -35,7 +35,7 @@ typedef struct
GtkWidget *titlebar;
GtkWidget *save;
GtkWidget *sort_id;
- GtkWidget *sortby_menu;
+ GtkWidget *order_menu_popover;
GtkWidget *undo;
GtkWidget *redo;
@@ -142,7 +142,7 @@ gtr_notebook_class_init (GtrNotebookClass * klass)
gtk_widget_class_bind_template_child_private (widget_class, GtrNotebook, titlebar);
gtk_widget_class_bind_template_child_private (widget_class, GtrNotebook, sort_id);
- gtk_widget_class_bind_template_child_private (widget_class, GtrNotebook, sortby_menu);
+ gtk_widget_class_bind_template_child_private (widget_class, GtrNotebook, order_menu_popover);
gtk_widget_class_bind_template_child_private (widget_class, GtrNotebook, undo);
gtk_widget_class_bind_template_child_private (widget_class, GtrNotebook, redo);
gtk_widget_class_bind_template_child_private (widget_class, GtrNotebook, save);
@@ -298,5 +298,5 @@ gtr_notebook_hide_sort_menu (GtrNotebook *notebook)
GtrNotebookPrivate *priv = gtr_notebook_get_instance_private (notebook);
if (priv->sort_id)
- gtk_menu_button_set_use_popover (GTK_MENU_BUTTON (priv->sortby_menu), FALSE);
+ gtk_popover_popdown (GTK_POPOVER (priv->order_menu_popover));
}
diff --git a/src/gtr-window.c b/src/gtr-window.c
index 872c269a..21a03377 100644
--- a/src/gtr-window.c
+++ b/src/gtr-window.c
@@ -1299,7 +1299,7 @@ gtr_window_tm_keybind (GtrWindow *window,
void
gtr_window_hide_sort_menu (GtrWindow *window)
{
- GtrWindowPrivate *priv = gtr_window_get_instance_private(window);
+ GtrWindowPrivate *priv = gtr_window_get_instance_private (window);
gtr_notebook_hide_sort_menu (GTR_NOTEBOOK (priv->notebook));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]