[gnome-todo] project: Replace gtk_widget_get_toplevel()



commit 12f941a3afea4c7759cd3becca3905bba21a6765
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Wed Jun 5 22:36:26 2019 -0300

    project: Replace gtk_widget_get_toplevel()

 src/task-list-view/gtd-edit-pane.c      |  7 ++++---
 src/task-list-view/gtd-task-list-view.c | 22 +++++++++-------------
 2 files changed, 13 insertions(+), 16 deletions(-)
---
diff --git a/src/task-list-view/gtd-edit-pane.c b/src/task-list-view/gtd-edit-pane.c
index 70625cb..09070f4 100644
--- a/src/task-list-view/gtd-edit-pane.c
+++ b/src/task-list-view/gtd-edit-pane.c
@@ -321,7 +321,7 @@ on_hyperlink_clicked_cb (GtkGestureClick *gesture,
       GtkTextIter url_start;
       GtkTextIter url_end;
       GtkTextTag *tag;
-      GtkWindow *window;
+      GtkRoot *root;
 
       tag = l->data;
 
@@ -343,9 +343,10 @@ on_hyperlink_clicked_cb (GtkGestureClick *gesture,
         continue;
 
       url = gtk_text_iter_get_text (&url_start, &url_end);
-      window = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (text_view)));
+      root = gtk_widget_get_root (GTK_WIDGET (text_view));
 
-      gtk_show_uri_on_window (window, url, GDK_CURRENT_TIME, &error);
+      if (root && GTK_IS_WINDOW (root))
+        gtk_show_uri_on_window (GTK_WINDOW (root), url, GDK_CURRENT_TIME, &error);
 
       if (error)
         {
diff --git a/src/task-list-view/gtd-task-list-view.c b/src/task-list-view/gtd-task-list-view.c
index 1485032..5cfe328 100644
--- a/src/task-list-view/gtd-task-list-view.c
+++ b/src/task-list-view/gtd-task-list-view.c
@@ -324,14 +324,14 @@ static gboolean
 scroll_to_bottom_cb (gpointer data)
 {
   GtdTaskListViewPrivate *priv;
-  GtkWindow *window;
   GtkWidget *widget;
+  GtkRoot *root;
 
   priv = gtd_task_list_view_get_instance_private (data);
   widget = GTK_WIDGET (data);
-  window = GTK_WINDOW (gtk_widget_get_toplevel (widget));
+  root = gtk_widget_get_root (widget);
 
-  g_assert (window != NULL);
+  g_assert (root != NULL);
 
   priv->scroll_to_bottom_handler_id = 0;
 
@@ -342,7 +342,7 @@ scroll_to_bottom_cb (gpointer data)
   if (gtk_widget_get_visible (widget) &&
       gtk_widget_get_child_visible (widget) &&
       gtk_widget_get_mapped (widget) &&
-      !gtk_widget_is_ancestor (gtk_window_get_focus (window), widget))
+      !gtk_widget_is_ancestor (gtk_window_get_focus (GTK_WINDOW (root)), widget))
     {
       gboolean ignored;
 
@@ -440,7 +440,7 @@ on_remove_task_row_cb (GtdTaskRow      *row,
   task = gtd_task_row_get_task (row);
 
   text = g_strdup_printf (_("Task <b>%s</b> removed"), gtd_task_get_title (task));
-  window = GTD_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (self)));
+  window = GTD_WINDOW (gtk_widget_get_root (GTK_WIDGET (self)));
 
   data = g_new0 (RemoveTaskData, 1);
   data->view = self;
@@ -1023,22 +1023,18 @@ static void
 gtd_task_list_view_map (GtkWidget *widget)
 {
   GtdTaskListViewPrivate *priv;
-  GtkWidget *window;
+  GtkRoot *root;
 
   GTK_WIDGET_CLASS (gtd_task_list_view_parent_class)->map (widget);
 
   priv = GTD_TASK_LIST_VIEW (widget)->priv;
-  window = gtk_widget_get_toplevel (widget);
+  root = gtk_widget_get_root (widget);
 
   /* Clear previously added "list" actions */
-  gtk_widget_insert_action_group (window,
-                                  "list",
-                                  NULL);
+  gtk_widget_insert_action_group (GTK_WIDGET (root), "list", NULL);
 
   /* Add this instance's action group */
-  gtk_widget_insert_action_group (window,
-                                  "list",
-                                  priv->action_group);
+  gtk_widget_insert_action_group (GTK_WIDGET (root), "list", priv->action_group);
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]