diff options
author | Sorokin Alexei <sor.alexei@meowr.ru> | 2016-06-16 18:09:25 +0300 |
---|---|---|
committer | raveit65 <chat-to-me@raveit.de> | 2016-06-29 18:42:12 +0200 |
commit | 225702b3c6a609065465c66f0f2739fc1d2184a9 (patch) | |
tree | 08c677b952074a8a79b93c9d895950bdbd85799d /applets/wncklet | |
parent | de1be3467a6ff1b350fc286025364650c8d51d1e (diff) | |
download | mate-panel-225702b3c6a609065465c66f0f2739fc1d2184a9.tar.bz2 mate-panel-225702b3c6a609065465c66f0f2739fc1d2184a9.tar.xz |
fix some warnings and deprecations
Diffstat (limited to 'applets/wncklet')
-rw-r--r-- | applets/wncklet/window-list.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c index f7fa1390..0a7a6d19 100644 --- a/applets/wncklet/window-list.c +++ b/applets/wncklet/window-list.c @@ -332,24 +332,13 @@ static void setup_gsettings(TasklistData* tasklist) tasklist); } -#if GTK_CHECK_VERSION (3, 0, 0) static void applet_size_allocate(GtkWidget *widget, GtkAllocation *allocation, TasklistData *tasklist) -#else -static void applet_size_request(GtkWidget* widget, GtkRequisition* requisition, TasklistData* tasklist) -#endif { int len; const int* size_hints; -#if GTK_CHECK_VERSION (3, 0, 0) - size_hints = wnck_tasklist_get_size_hint_list (WNCK_TASKLIST (tasklist->tasklist), &len); -#else - GtkRequisition child_req; - WnckTasklist* wncktl = WNCK_TASKLIST(tasklist->tasklist); - gtk_widget_get_child_requisition(tasklist->applet, &child_req); + size_hints = wnck_tasklist_get_size_hint_list (WNCK_TASKLIST (tasklist->tasklist), &len); - 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); @@ -457,11 +446,7 @@ gboolean window_list_applet_fill(MatePanelApplet* applet) g_signal_connect(G_OBJECT(tasklist->tasklist), "destroy", G_CALLBACK(destroy_tasklist), tasklist); -#if GTK_CHECK_VERSION (3, 0, 0) g_signal_connect(G_OBJECT(tasklist->applet), "size_allocate", G_CALLBACK(applet_size_allocate), tasklist); -#else - g_signal_connect(G_OBJECT(tasklist->applet), "size_request", G_CALLBACK(applet_size_request), tasklist); -#endif tasklist_update(tasklist); gtk_widget_show(tasklist->tasklist); |