examples: Take advantage of user_data passed

The last parameter of the signal callback from .ui
is the template's object from which the class is
derived.

And so, we already have access to the window object.
Let's just use it.

diff --git a/examples/application10/exampleappwin.c b/examples/application10/exampleappwin.c
index d5d9be19d64a0ea31ca3a76e843ff5267f51e3db..1e8eaf732753e0bc5cd90743e61b756ebc6bbfc0 100644 (file)
--- a/examples/application10/exampleappwin.c
+++ b/examples/application10/exampleappwin.c
@@ -22,9 +22,9 @@ struct _ExampleAppWindow
 G_DEFINE_TYPE (ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW)
 
 static void
-search_text_changed (GtkEntry *entry)
+search_text_changed (GtkEntry         *entry,
+                     ExampleAppWindow *win)
 {
-  ExampleAppWindow *win;
   const gchar *text;
   GtkWidget *tab;
   GtkWidget *view;
@@ -36,8 +36,6 @@ search_text_changed (GtkEntry *entry)
   if (text[0] == '\0')
     return;
 
-  win = EXAMPLE_APP_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (entry)));
-
   tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
   view = gtk_bin_get_child (GTK_BIN (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
@@ -153,15 +151,13 @@ update_lines (ExampleAppWindow *win)
 }
 
 static void
-visible_child_changed (GObject    *stack,
-                       GParamSpec *pspec)
+visible_child_changed (GObject          *stack,
+                       GParamSpec       *pspec,
+                       ExampleAppWindow *win)
 {
-  ExampleAppWindow *win;
-
   if (gtk_widget_in_destruction (GTK_WIDGET (stack)))
     return;
 
-  win = EXAMPLE_APP_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (stack)));
   gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (win->searchbar), FALSE);
   update_words (win);
   update_lines (win);

diff --git a/examples/application7/exampleappwin.c b/examples/application7/exampleappwin.c
index f7f7d15d8817e3876593172d9a8efe2078310567..38ec02712869cfed89c6d7c433c4b330658ff6e3 100644 (file)
--- a/examples/application7/exampleappwin.c
+++ b/examples/application7/exampleappwin.c
@@ -16,9 +16,9 @@ struct _ExampleAppWindow
 G_DEFINE_TYPE (ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW)
 
 static void
-search_text_changed (GtkEntry *entry)
+search_text_changed (GtkEntry         *entry,
+                     ExampleAppWindow *win)
 {
-  ExampleAppWindow *win;
   const gchar *text;
   GtkWidget *tab;
   GtkWidget *view;
@@ -30,8 +30,6 @@ search_text_changed (GtkEntry *entry)
   if (text[0] == '\0')
     return;
 
-  win = EXAMPLE_APP_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (entry)));
-
   tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
   view = gtk_bin_get_child (GTK_BIN (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
@@ -48,16 +46,13 @@ search_text_changed (GtkEntry *entry)
 }
 
 static void
-visible_child_changed (GObject    *stack,
-                       GParamSpec *pspec)
+visible_child_changed (GObject          *stack,
+                       GParamSpec       *pspec,
+                       ExampleAppWindow *win)
 {
-  ExampleAppWindow *win;
-
   if (gtk_widget_in_destruction (GTK_WIDGET (stack)))
     return;
 
-  win = EXAMPLE_APP_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (stack)));
-
   gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (win->searchbar), FALSE);
 }
 

diff --git a/examples/application8/exampleappwin.c b/examples/application8/exampleappwin.c
index d299f341fe2bf628f14c8e1142b4d6bb4d78e21a..41d4df657b6d49c85e7f60532017fc017e8aaf1c 100644 (file)
--- a/examples/application8/exampleappwin.c
+++ b/examples/application8/exampleappwin.c
@@ -20,9 +20,9 @@ struct _ExampleAppWindow
 G_DEFINE_TYPE (ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW)
 
 static void
-search_text_changed (GtkEntry *entry)
+search_text_changed (GtkEntry         *entry,
+                     ExampleAppWindow *win)
 {
-  ExampleAppWindow *win;
   const gchar *text;
   GtkWidget *tab;
   GtkWidget *view;
@@ -34,8 +34,6 @@ search_text_changed (GtkEntry *entry)
   if (text[0] == '\0')
     return;
 
-  win = EXAMPLE_APP_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (entry)));
-
   tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
   view = gtk_bin_get_child (GTK_BIN (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
@@ -119,16 +117,13 @@ done:
 }
 
 static void
-visible_child_changed (GObject    *stack,
-                       GParamSpec *pspec)
+visible_child_changed (GObject          *stack,
+                       GParamSpec       *pspec,
+                       ExampleAppWindow *win)
 {
-  ExampleAppWindow *win;
-
   if (gtk_widget_in_destruction (GTK_WIDGET (stack)))
     return;
 
-  win = EXAMPLE_APP_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (stack)));
-
   gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (win->searchbar), FALSE);
   update_words (win);
 }

diff --git a/examples/application9/exampleappwin.c b/examples/application9/exampleappwin.c
index 8911fa52f97a50fe77fa33ece9ed93e1c3e77069..7d19b980e2609c3cbc23062a1bc6b7dceb41da3f 100644 (file)
--- a/examples/application9/exampleappwin.c
+++ b/examples/application9/exampleappwin.c
@@ -22,9 +22,9 @@ struct _ExampleAppWindow
 G_DEFINE_TYPE (ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW)
 
 static void
-search_text_changed (GtkEntry *entry)
+search_text_changed (GtkEntry         *entry,
+                     ExampleAppWindow *win)
 {
-  ExampleAppWindow *win;
   const gchar *text;
   GtkWidget *tab;
   GtkWidget *view;
@@ -36,8 +36,6 @@ search_text_changed (GtkEntry *entry)
   if (text[0] == '\0')
     return;
 
-  win = EXAMPLE_APP_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (entry)));
-
   tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
   view = gtk_bin_get_child (GTK_BIN (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
@@ -153,15 +151,13 @@ update_lines (ExampleAppWindow *win)
 }
 
 static void
-visible_child_changed (GObject    *stack,
-                       GParamSpec *pspec)
+visible_child_changed (GObject          *stack,
+                       GParamSpec       *pspec,
+                       ExampleAppWindow *win)
 {
-  ExampleAppWindow *win;
-
   if (gtk_widget_in_destruction (GTK_WIDGET (stack)))
     return;
 
-  win = EXAMPLE_APP_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (stack)));
   gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (win->searchbar), FALSE);
   update_words (win);
   update_lines (win);