summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-22 13:06:03 +0100
committerinfirit <[email protected]>2014-11-22 15:13:50 +0100
commit7dbd1866ad11c2052cf1508531faed7e57d5d2cc (patch)
tree3625f4b8199dfb11c0502e591c60e4e6ee1a6913
parent657eec661403b86781533b81699607d6ac54ec5a (diff)
downloadmate-panel-7dbd1866ad11c2052cf1508531faed7e57d5d2cc.tar.bz2
mate-panel-7dbd1866ad11c2052cf1508531faed7e57d5d2cc.tar.xz
panel-addto: Remove the vbox as it is redundant.
And cut down on some ifdef hell in the process.
-rw-r--r--mate-panel/panel-addto.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/mate-panel/panel-addto.c b/mate-panel/panel-addto.c
index 1c614a4d..377ec852 100644
--- a/mate-panel/panel-addto.c
+++ b/mate-panel/panel-addto.c
@@ -1199,9 +1199,6 @@ panel_addto_dialog_new (PanelWidget *panel_widget)
{
PanelAddtoDialog *dialog;
GtkWidget *dialog_vbox;
-#if !GTK_CHECK_VERSION (3, 0, 0)
- GtkWidget *vbox;
-#endif
GtkWidget *inner_vbox;
GtkWidget *find_hbox;
GtkWidget *sw;
@@ -1243,30 +1240,16 @@ panel_addto_dialog_new (PanelWidget *panel_widget)
gtk_container_set_border_width (GTK_CONTAINER (dialog->addto_dialog), 5);
dialog_vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog->addto_dialog));
-#if GTK_CHECK_VERSION (3, 0, 0)
gtk_box_set_spacing (GTK_BOX (dialog_vbox), 12);
gtk_container_set_border_width (GTK_CONTAINER (dialog_vbox), 5);
-#else
- gtk_box_set_spacing (GTK_BOX (dialog_vbox), 2);
-#endif
g_signal_connect (G_OBJECT (dialog->addto_dialog), "response",
G_CALLBACK (panel_addto_dialog_response), dialog);
g_signal_connect (dialog->addto_dialog, "destroy",
G_CALLBACK (panel_addto_dialog_destroy), dialog);
-#if !GTK_CHECK_VERSION (3, 0, 0)
- vbox = gtk_vbox_new (FALSE, 12);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
- gtk_container_add (GTK_CONTAINER (dialog_vbox), vbox);
-#endif
-
inner_vbox = gtk_vbox_new (FALSE, 6);
-#if GTK_CHECK_VERSION (3, 0, 0)
gtk_box_pack_start (GTK_BOX (dialog_vbox), inner_vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (vbox), inner_vbox, TRUE, TRUE, 0);
-#endif
find_hbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (inner_vbox), find_hbox, FALSE, FALSE, 0);
@@ -1349,11 +1332,7 @@ panel_addto_dialog_new (PanelWidget *panel_widget)
gtk_container_add (GTK_CONTAINER (sw), dialog->tree_view);
-#if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_show_all (dialog_vbox);
-#else
- gtk_widget_show_all (vbox);
-#endif
panel_toplevel_push_autohide_disabler (dialog->panel_widget->toplevel);
panel_widget_register_open_dialog (panel_widget,