From cbff26a9c43c7d8722670aee04715a9edfb2e904 Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 22 Nov 2014 15:55:13 +0100 Subject: Gtk3: window-list Don't use deprecated size-allocate signal Take an additional change from gnome-panel that was not in MATE commit: 77a45f0abf8d0db41bb4b99e08dfbdd968cb6be8 From: Carlos Garcia Campos --- applets/wncklet/window-list.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c index 1f1c6c2e..76011c6b 100644 --- a/applets/wncklet/window-list.c +++ b/applets/wncklet/window-list.c @@ -342,16 +342,16 @@ static void applet_size_request(GtkWidget* widget, GtkRequisition* requisition, { int len; const int* size_hints; -#if !GTK_CHECK_VERSION (3, 0, 0) +#if GTK_CHECK_VERSION (3, 0, 0) + size_hints = wnck_tasklist_get_size_hint_list (WNCK_TASKLIST (tasklist->tasklist), &len); +#else GtkRequisition child_req; -#endif WnckTasklist* wncktl = WNCK_TASKLIST(tasklist->tasklist); -#if !GTK_CHECK_VERSION (3, 0, 0) gtk_widget_get_child_requisition(tasklist->applet, &child_req); -#endif size_hints = wnck_tasklist_get_size_hint_list(wncktl, &len); +#endif g_assert(len % 2 == 0); mate_panel_applet_set_size_hints(MATE_PANEL_APPLET(tasklist->applet), size_hints, len, 0); -- cgit v1.2.1