replace dprecated gtk_widget_reparent(), and remove useless gtkut_container_remove()
This commit is contained in:
parent
fcd3988a11
commit
b537038c0c
5 changed files with 15 additions and 23 deletions
|
@ -403,11 +403,6 @@ void gtkut_clist_set_focus_row(GtkCMCList *clist, gint row)
|
||||||
GTKUT_CTREE_REFRESH(clist);
|
GTKUT_CTREE_REFRESH(clist);
|
||||||
}
|
}
|
||||||
|
|
||||||
void gtkut_container_remove(GtkContainer *container, GtkWidget *widget)
|
|
||||||
{
|
|
||||||
gtk_container_remove(container, widget);
|
|
||||||
}
|
|
||||||
|
|
||||||
static gboolean gtkut_text_buffer_match_string(GtkTextBuffer *textbuf,
|
static gboolean gtkut_text_buffer_match_string(GtkTextBuffer *textbuf,
|
||||||
const GtkTextIter *iter,
|
const GtkTextIter *iter,
|
||||||
gunichar *wcs, gint len,
|
gunichar *wcs, gint len,
|
||||||
|
|
|
@ -132,9 +132,6 @@ void gtkut_ctree_set_focus_row (GtkCMCTree *ctree,
|
||||||
void gtkut_clist_set_focus_row (GtkCMCList *clist,
|
void gtkut_clist_set_focus_row (GtkCMCList *clist,
|
||||||
gint row);
|
gint row);
|
||||||
|
|
||||||
void gtkut_container_remove (GtkContainer *container,
|
|
||||||
GtkWidget *widget);
|
|
||||||
|
|
||||||
gchar *gtkut_text_view_get_selection (GtkTextView *textview);
|
gchar *gtkut_text_view_get_selection (GtkTextView *textview);
|
||||||
void gtkut_text_view_set_position (GtkTextView *text, gint pos);
|
void gtkut_text_view_set_position (GtkTextView *text, gint pos);
|
||||||
gboolean gtkut_text_view_search_string (GtkTextView *text, const gchar *str,
|
gboolean gtkut_text_view_search_string (GtkTextView *text, const gchar *str,
|
||||||
|
|
|
@ -2652,11 +2652,11 @@ static void main_window_separation_change(MainWindow *mainwin, LayoutType layout
|
||||||
g_object_ref(folder_wid);
|
g_object_ref(folder_wid);
|
||||||
g_object_ref(summary_wid);
|
g_object_ref(summary_wid);
|
||||||
g_object_ref(message_wid);
|
g_object_ref(message_wid);
|
||||||
gtkut_container_remove
|
gtk_container_remove
|
||||||
(GTK_CONTAINER(gtk_widget_get_parent(folder_wid)), folder_wid);
|
(GTK_CONTAINER(gtk_widget_get_parent(folder_wid)), folder_wid);
|
||||||
gtkut_container_remove
|
gtk_container_remove
|
||||||
(GTK_CONTAINER(gtk_widget_get_parent(summary_wid)), summary_wid);
|
(GTK_CONTAINER(gtk_widget_get_parent(summary_wid)), summary_wid);
|
||||||
gtkut_container_remove
|
gtk_container_remove
|
||||||
(GTK_CONTAINER(gtk_widget_get_parent(message_wid)), message_wid);
|
(GTK_CONTAINER(gtk_widget_get_parent(message_wid)), message_wid);
|
||||||
|
|
||||||
gtk_widget_hide(mainwin->window);
|
gtk_widget_hide(mainwin->window);
|
||||||
|
@ -2732,11 +2732,11 @@ void main_window_toggle_message_view(MainWindow *mainwin)
|
||||||
mainwin->messageview->visible = FALSE;
|
mainwin->messageview->visible = FALSE;
|
||||||
summaryview->displayed = NULL;
|
summaryview->displayed = NULL;
|
||||||
g_object_ref(ppaned);
|
g_object_ref(ppaned);
|
||||||
gtkut_container_remove(GTK_CONTAINER(container), ppaned);
|
gtk_container_remove(GTK_CONTAINER(container), ppaned);
|
||||||
gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), container);
|
gtk_container_add(GTK_CONTAINER(container), GTK_WIDGET_PTR(summaryview));
|
||||||
} else {
|
} else {
|
||||||
mainwin->messageview->visible = TRUE;
|
mainwin->messageview->visible = TRUE;
|
||||||
gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), ppaned);
|
gtk_container_remove(GTK_CONTAINER(container), ppaned);
|
||||||
gtk_container_add(GTK_CONTAINER(container), ppaned);
|
gtk_container_add(GTK_CONTAINER(container), ppaned);
|
||||||
g_object_unref(ppaned);
|
g_object_unref(ppaned);
|
||||||
}
|
}
|
||||||
|
@ -2747,7 +2747,7 @@ void main_window_toggle_message_view(MainWindow *mainwin)
|
||||||
mainwin->messageview->visible = FALSE;
|
mainwin->messageview->visible = FALSE;
|
||||||
summaryview->displayed = NULL;
|
summaryview->displayed = NULL;
|
||||||
g_object_ref(mainwin->messageview->vbox);
|
g_object_ref(mainwin->messageview->vbox);
|
||||||
gtkut_container_remove(GTK_CONTAINER(container), mainwin->messageview->vbox);
|
gtk_container_remove(GTK_CONTAINER(container), mainwin->messageview->vbox);
|
||||||
} else {
|
} else {
|
||||||
mainwin->messageview->visible = TRUE;
|
mainwin->messageview->visible = TRUE;
|
||||||
gtk_container_add(GTK_CONTAINER(container), mainwin->messageview->vbox);
|
gtk_container_add(GTK_CONTAINER(container), mainwin->messageview->vbox);
|
||||||
|
|
|
@ -2716,7 +2716,7 @@ static void icon_list_clear (MimeView *mimeview)
|
||||||
|
|
||||||
orig = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_grid));
|
orig = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_grid));
|
||||||
for (child = orig; child != NULL; child = g_list_next(child)) {
|
for (child = orig; child != NULL; child = g_list_next(child)) {
|
||||||
gtkut_container_remove(GTK_CONTAINER(mimeview->icon_grid),
|
gtk_container_remove(GTK_CONTAINER(mimeview->icon_grid),
|
||||||
GTK_WIDGET(child->data));
|
GTK_WIDGET(child->data));
|
||||||
}
|
}
|
||||||
g_list_free(orig);
|
g_list_free(orig);
|
||||||
|
@ -2821,7 +2821,7 @@ static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
|
||||||
gtk_paned_set_position(GTK_PANED(mimeview->paned),
|
gtk_paned_set_position(GTK_PANED(mimeview->paned),
|
||||||
prefs_common.mimeview_tree_height);
|
prefs_common.mimeview_tree_height);
|
||||||
|
|
||||||
gtkut_container_remove(GTK_CONTAINER(mimeview->icon_mainbox),
|
gtk_container_remove(GTK_CONTAINER(mimeview->icon_mainbox),
|
||||||
button);
|
button);
|
||||||
gtk_box_pack_end(GTK_BOX(mimeview->ctree_mainbox),
|
gtk_box_pack_end(GTK_BOX(mimeview->ctree_mainbox),
|
||||||
button, FALSE, FALSE, 0);
|
button, FALSE, FALSE, 0);
|
||||||
|
@ -2832,7 +2832,7 @@ static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
|
||||||
gtk_widget_show(mimeview->icon_mainbox);
|
gtk_widget_show(mimeview->icon_mainbox);
|
||||||
gtk_paned_set_position(GTK_PANED(mimeview->paned), 0);
|
gtk_paned_set_position(GTK_PANED(mimeview->paned), 0);
|
||||||
|
|
||||||
gtkut_container_remove(GTK_CONTAINER(mimeview->ctree_mainbox),
|
gtk_container_remove(GTK_CONTAINER(mimeview->ctree_mainbox),
|
||||||
button);
|
button);
|
||||||
gtk_box_pack_start(GTK_BOX(mimeview->icon_mainbox),
|
gtk_box_pack_start(GTK_BOX(mimeview->icon_mainbox),
|
||||||
button, FALSE, FALSE, 0);
|
button, FALSE, FALSE, 0);
|
||||||
|
|
|
@ -861,9 +861,9 @@ void summary_relayout(SummaryView *summaryview)
|
||||||
g_object_ref(summaryview->hbox_l);
|
g_object_ref(summaryview->hbox_l);
|
||||||
g_object_ref(summaryview->statlabel_msgs);
|
g_object_ref(summaryview->statlabel_msgs);
|
||||||
|
|
||||||
gtkut_container_remove(GTK_CONTAINER(
|
gtk_container_remove(GTK_CONTAINER(
|
||||||
gtk_widget_get_parent(summaryview->hbox_l)), summaryview->hbox_l);
|
gtk_widget_get_parent(summaryview->hbox_l)), summaryview->hbox_l);
|
||||||
gtkut_container_remove(GTK_CONTAINER(
|
gtk_container_remove(GTK_CONTAINER(
|
||||||
gtk_widget_get_parent(summaryview->statlabel_msgs)), summaryview->statlabel_msgs);
|
gtk_widget_get_parent(summaryview->statlabel_msgs)), summaryview->statlabel_msgs);
|
||||||
|
|
||||||
switch (prefs_common.layout_mode) {
|
switch (prefs_common.layout_mode) {
|
||||||
|
|
Loading…
Reference in a new issue