summaryrefslogtreecommitdiff
path: root/mate-volume-control/gvc-sound-theme-chooser.c
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-11-21 22:40:13 +0300
committermonsta <[email protected]>2016-11-21 22:40:13 +0300
commit914205c39a5cc85779959a793337adff58ba0a60 (patch)
treecb986d8789749c133c90d34c9aaaa6a3956e2899 /mate-volume-control/gvc-sound-theme-chooser.c
parenta8c8c031e835211b8fd3a16114816a9d2f9171f2 (diff)
downloadmate-media-914205c39a5cc85779959a793337adff58ba0a60.tar.bz2
mate-media-914205c39a5cc85779959a793337adff58ba0a60.tar.xz
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
and require libmate-desktop >= 1.17
Diffstat (limited to 'mate-volume-control/gvc-sound-theme-chooser.c')
-rw-r--r--mate-volume-control/gvc-sound-theme-chooser.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/mate-volume-control/gvc-sound-theme-chooser.c b/mate-volume-control/gvc-sound-theme-chooser.c
index a30518d..c34ded8 100644
--- a/mate-volume-control/gvc-sound-theme-chooser.c
+++ b/mate-volume-control/gvc-sound-theme-chooser.c
@@ -995,29 +995,10 @@ on_key_changed (GSettings *settings,
update_theme (chooser);
}
-#if !GTK_CHECK_VERSION (3, 0, 0)
-static void
-constrain_list_size (GtkWidget *widget,
- GtkRequisition *requisition,
- GtkWidget *to_size)
-{
- GtkRequisition req;
- int max_height;
-
- /* Constrain height to be the tree height up to a max */
- max_height = (gdk_screen_get_height (gtk_widget_get_screen (widget))) / 4;
-
- gtk_widget_size_request (to_size, &req);
-
- requisition->height = MIN (req.height, max_height);
-}
-#endif
-
static void
setup_list_size_constraint (GtkWidget *widget,
GtkWidget *to_size)
{
-#if GTK_CHECK_VERSION (3, 0, 0)
GtkRequisition req;
int max_height;
@@ -1029,12 +1010,6 @@ setup_list_size_constraint (GtkWidget *widget,
gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (widget),
MIN (req.height, max_height));
-#else
- g_signal_connect (G_OBJECT (widget),
- "size-request",
- G_CALLBACK (constrain_list_size),
- to_size);
-#endif
}
static void
@@ -1048,11 +1023,7 @@ gvc_sound_theme_chooser_init (GvcSoundThemeChooser *chooser)
chooser->priv = GVC_SOUND_THEME_CHOOSER_GET_PRIVATE (chooser);
-#if GTK_CHECK_VERSION (3, 0, 0)
chooser->priv->theme_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-#else
- chooser->priv->theme_box = gtk_hbox_new (FALSE, 0);
-#endif
gtk_box_pack_start (GTK_BOX (chooser),
chooser->priv->theme_box, FALSE, FALSE, 0);