[gtk+] gtk/gtktreeview.c: Use accessor functions to access GtkWindow
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gtk/gtktreeview.c: Use accessor functions to access GtkWindow
- Date: Mon, 23 Aug 2010 18:35:37 +0000 (UTC)
commit f05acd707dab87e68ae8cbe59ab17ea7673cab45
Author: Javier Jardón <jjardon gnome org>
Date: Tue Aug 17 15:15:12 2010 +0200
gtk/gtktreeview.c: Use accessor functions to access GtkWindow
gtk/gtktreeview.c | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 7bbb4e4..8f54070 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -10357,21 +10357,26 @@ static void
gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view)
{
GtkWidget *frame, *vbox, *toplevel;
+ GtkWindowGroup *group;
GdkScreen *screen;
if (tree_view->priv->search_custom_entry_set)
return;
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (tree_view));
+ group = gtk_window_get_group (GTK_WINDOW (toplevel));
screen = gtk_widget_get_screen (GTK_WIDGET (tree_view));
if (tree_view->priv->search_window != NULL)
{
- if (GTK_WINDOW (toplevel)->group)
- gtk_window_group_add_window (GTK_WINDOW (toplevel)->group,
+ GtkWindowGroup *search_group;
+
+ search_group = gtk_window_get_group (GTK_WINDOW (tree_view->priv->search_window));
+ if (group)
+ gtk_window_group_add_window (group,
GTK_WINDOW (tree_view->priv->search_window));
- else if (GTK_WINDOW (tree_view->priv->search_window)->group)
- gtk_window_group_remove_window (GTK_WINDOW (tree_view->priv->search_window)->group,
+ else if (search_group)
+ gtk_window_group_remove_window (search_group,
GTK_WINDOW (tree_view->priv->search_window));
gtk_window_set_screen (GTK_WINDOW (tree_view->priv->search_window), screen);
return;
@@ -10380,8 +10385,8 @@ gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view)
tree_view->priv->search_window = gtk_window_new (GTK_WINDOW_POPUP);
gtk_window_set_screen (GTK_WINDOW (tree_view->priv->search_window), screen);
- if (GTK_WINDOW (toplevel)->group)
- gtk_window_group_add_window (GTK_WINDOW (toplevel)->group,
+ if (group)
+ gtk_window_group_add_window (group,
GTK_WINDOW (tree_view->priv->search_window));
gtk_window_set_type_hint (GTK_WINDOW (tree_view->priv->search_window),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]