applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shell: Remove reparenting hacks

Browse source 
Now that CcNotebook is buildable, we don't need to do these ugly hacks.
This commit is contained in:
Jasper St. Pierre 2012-06-12 13:57:43 -04:00
parent f8da96e425
commit d382c42e5c
1 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
shell/gnome-control-center.c
View file

@ -559,17 +559,6 @@ search_entry_key_press_event_cb (GtkEntry *entry,
return FALSE; return FALSE;
} }
static void
reparent_notebook_page (GnomeControlCenterPrivate *priv,
GtkWidget *widget)
{
g_object_ref (widget);
gtk_container_remove (GTK_CONTAINER (priv->notebook), widget);
gtk_widget_set_name (widget, "search-page");
cc_notebook_add_page (CC_NOTEBOOK (priv->notebook), widget);
g_object_unref (widget);
}
static void static void
on_search_selection_changed (GtkTreeSelection *selection, on_search_selection_changed (GtkTreeSelection *selection,
GnomeControlCenter *shell) GnomeControlCenter *shell)
@ -652,8 +641,6 @@ setup_search (GnomeControlCenter *shell)
gtk_tree_view_append_column (GTK_TREE_VIEW (priv->search_view), column); gtk_tree_view_append_column (GTK_TREE_VIEW (priv->search_view), column);
priv->search_scrolled = W (priv->builder, "search-scrolled-window"); priv->search_scrolled = W (priv->builder, "search-scrolled-window");
reparent_notebook_page (priv, priv->search_scrolled);
gtk_container_add (GTK_CONTAINER (priv->search_scrolled), search_view);
g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->search_view)), g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->search_view)),
"changed", "changed",
@ -1311,7 +1298,6 @@ gnome_control_center_init (GnomeControlCenter *self)
/* Main scrolled window */ /* Main scrolled window */
priv->scrolled_window = W (priv->builder, "scrolledwindow1"); priv->scrolled_window = W (priv->builder, "scrolledwindow1");
reparent_notebook_page (priv, priv->scrolled_window);
gtk_widget_set_size_request (priv->scrolled_window, FIXED_WIDTH, -1); gtk_widget_set_size_request (priv->scrolled_window, FIXED_WIDTH, -1);
priv->main_vbox = W (priv->builder, "main-vbox"); priv->main_vbox = W (priv->builder, "main-vbox");