diff -Nru libwnck-2.30.7/debian/changelog libwnck-2.30.7/debian/changelog --- libwnck-2.30.7/debian/changelog 2016-02-14 14:03:56.000000000 +0000 +++ libwnck-2.30.7/debian/changelog 2016-02-16 11:46:45.000000000 +0000 @@ -1,3 +1,11 @@ +libwnck (1:2.30.7-5ubuntu1) UNRELEASED; urgency=medium + + * Merge with Debian, remaining changes from Ubuntu are + debian/patches/02_moveresize_static_gravity.patch and + debian/patches/03_window_action_menu_dispose_events.patch + + -- Martin Wimpress Tue, 16 Feb 2016 11:33:19 +0000 + libwnck (2.30.7-5) unstable; urgency=medium * debian/control: diff -Nru libwnck-2.30.7/debian/control libwnck-2.30.7/debian/control --- libwnck-2.30.7/debian/control 2016-02-14 14:01:53.000000000 +0000 +++ libwnck-2.30.7/debian/control 2016-02-16 11:42:11.000000000 +0000 @@ -1,7 +1,8 @@ Source: libwnck Section: libs Priority: optional -Maintainer: Debian MATE Packaging Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian MATE Packaging Team Uploaders: Mike Gabriel , Martin Wimpress , Standards-Version: 3.9.6 @@ -91,7 +92,7 @@ Section: doc Architecture: all Depends: ${misc:Depends}, -Breaks: libwnck-dev (<< 2.30.7-3~), +Breaks: libwnck-dev (<< 1:2.30.7-0~), Conflicts: libwnck-1, Description: Window Navigator Construction Kit - documentation files A library to use for writing pagers and task lists. This variant diff -Nru libwnck-2.30.7/debian/libwnck22.symbols libwnck-2.30.7/debian/libwnck22.symbols --- libwnck-2.30.7/debian/libwnck22.symbols 2016-02-08 14:38:04.000000000 +0000 +++ libwnck-2.30.7/debian/libwnck22.symbols 2016-02-16 11:40:44.000000000 +0000 @@ -1,188 +1,188 @@ libwnck-1.so.22 libwnck22 #MINVER# - wnck_action_menu_get_type@Base 2.30.7 - wnck_action_menu_new@Base 2.30.7 - wnck_application_get@Base 2.30.7 - wnck_application_get_icon@Base 2.30.7 - wnck_application_get_icon_is_fallback@Base 2.30.7 - wnck_application_get_icon_name@Base 2.30.7 - wnck_application_get_mini_icon@Base 2.30.7 - wnck_application_get_n_windows@Base 2.30.7 - wnck_application_get_name@Base 2.30.7 - wnck_application_get_pid@Base 2.30.7 - wnck_application_get_startup_id@Base 2.30.7 - wnck_application_get_type@Base 2.30.7 - wnck_application_get_windows@Base 2.30.7 - wnck_application_get_xid@Base 2.30.7 - wnck_class_group_get@Base 2.30.7 - wnck_class_group_get_icon@Base 2.30.7 - wnck_class_group_get_mini_icon@Base 2.30.7 - wnck_class_group_get_name@Base 2.30.7 - wnck_class_group_get_res_class@Base 2.30.7 - wnck_class_group_get_type@Base 2.30.7 - wnck_class_group_get_windows@Base 2.30.7 - wnck_client_type_get_type@Base 2.30.7 - wnck_create_window_action_menu@Base 2.30.7 - wnck_gtk_window_set_dock_type@Base 2.30.7 - wnck_motion_direction_get_type@Base 2.30.7 - wnck_pager_accessible_factory_get_type@Base 2.30.7 - wnck_pager_accessible_factory_new@Base 2.30.7 - wnck_pager_accessible_get_type@Base 2.30.7 - wnck_pager_accessible_new@Base 2.30.7 - wnck_pager_display_mode_get_type@Base 2.30.7 - wnck_pager_get_type@Base 2.30.7 - wnck_pager_new@Base 2.30.7 - wnck_pager_set_display_mode@Base 2.30.7 - wnck_pager_set_n_rows@Base 2.30.7 - wnck_pager_set_orientation@Base 2.30.7 - wnck_pager_set_screen@Base 2.30.7 - wnck_pager_set_shadow_type@Base 2.30.7 - wnck_pager_set_show_all@Base 2.30.7 - wnck_pid_read_resource_usage@Base 2.30.7 - wnck_screen_calc_workspace_layout@Base 2.30.7 - wnck_screen_change_workspace_count@Base 2.30.7 - wnck_screen_force_update@Base 2.30.7 - wnck_screen_free_workspace_layout@Base 2.30.7 - wnck_screen_get@Base 2.30.7 - wnck_screen_get_active_window@Base 2.30.7 - wnck_screen_get_active_workspace@Base 2.30.7 - wnck_screen_get_background_pixmap@Base 2.30.7 - wnck_screen_get_default@Base 2.30.7 - wnck_screen_get_for_root@Base 2.30.7 - wnck_screen_get_height@Base 2.30.7 - wnck_screen_get_number@Base 2.30.7 - wnck_screen_get_previously_active_window@Base 2.30.7 - wnck_screen_get_showing_desktop@Base 2.30.7 - wnck_screen_get_type@Base 2.30.7 - wnck_screen_get_width@Base 2.30.7 - wnck_screen_get_window_manager_name@Base 2.30.7 - wnck_screen_get_windows@Base 2.30.7 - wnck_screen_get_windows_stacked@Base 2.30.7 - wnck_screen_get_workspace@Base 2.30.7 - wnck_screen_get_workspace_count@Base 2.30.7 - wnck_screen_get_workspace_index@Base 2.30.7 - wnck_screen_get_workspace_neighbor@Base 2.30.7 - wnck_screen_get_workspaces@Base 2.30.7 - wnck_screen_move_viewport@Base 2.30.7 - wnck_screen_net_wm_supports@Base 2.30.7 - wnck_screen_release_workspace_layout@Base 2.30.7 - wnck_screen_toggle_showing_desktop@Base 2.30.7 - wnck_screen_try_set_workspace_layout@Base 2.30.7 - wnck_selector_get_type@Base 2.30.7 - wnck_selector_new@Base 2.30.7 - wnck_set_client_type@Base 2.30.7 - wnck_tasklist_get_minimum_height@Base 2.30.7 - wnck_tasklist_get_minimum_width@Base 2.30.7 - wnck_tasklist_get_size_hint_list@Base 2.30.7 - wnck_tasklist_get_type@Base 2.30.7 - wnck_tasklist_grouping_type_get_type@Base 2.30.7 - wnck_tasklist_new@Base 2.30.7 - wnck_tasklist_set_button_relief@Base 2.30.7 - wnck_tasklist_set_grouping@Base 2.30.7 - wnck_tasklist_set_grouping_limit@Base 2.30.7 - wnck_tasklist_set_icon_loader@Base 2.30.7 - wnck_tasklist_set_include_all_workspaces@Base 2.30.7 - wnck_tasklist_set_minimum_height@Base 2.30.7 - wnck_tasklist_set_minimum_width@Base 2.30.7 - wnck_tasklist_set_orientation@Base 2.30.7 - wnck_tasklist_set_screen@Base 2.30.7 - wnck_tasklist_set_switch_workspace_on_unminimize@Base 2.30.7 - wnck_window_actions_get_type@Base 2.30.7 - wnck_window_activate@Base 2.30.7 - wnck_window_activate_transient@Base 2.30.7 - wnck_window_close@Base 2.30.7 - wnck_window_get@Base 2.30.7 - wnck_window_get_actions@Base 2.30.7 - wnck_window_get_application@Base 2.30.7 - wnck_window_get_class_group@Base 2.30.7 - wnck_window_get_client_window_geometry@Base 2.30.7 - wnck_window_get_geometry@Base 2.30.7 - wnck_window_get_group_leader@Base 2.30.7 - wnck_window_get_icon@Base 2.30.7 - wnck_window_get_icon_is_fallback@Base 2.30.7 - wnck_window_get_icon_name@Base 2.30.7 - wnck_window_get_mini_icon@Base 2.30.7 - wnck_window_get_name@Base 2.30.7 - wnck_window_get_pid@Base 2.30.7 - wnck_window_get_screen@Base 2.30.7 - wnck_window_get_session_id@Base 2.30.7 - wnck_window_get_session_id_utf8@Base 2.30.7 - wnck_window_get_sort_order@Base 2.30.7 - wnck_window_get_state@Base 2.30.7 - wnck_window_get_transient@Base 2.30.7 - wnck_window_get_type@Base 2.30.7 - wnck_window_get_window_type@Base 2.30.7 - wnck_window_get_workspace@Base 2.30.7 - wnck_window_get_xid@Base 2.30.7 - wnck_window_gravity_get_type@Base 2.30.7 - wnck_window_has_icon_name@Base 2.30.7 - wnck_window_has_name@Base 2.30.7 - wnck_window_is_above@Base 2.30.7 - wnck_window_is_active@Base 2.30.7 - wnck_window_is_below@Base 2.30.7 - wnck_window_is_fullscreen@Base 2.30.7 - wnck_window_is_in_viewport@Base 2.30.7 - wnck_window_is_maximized@Base 2.30.7 - wnck_window_is_maximized_horizontally@Base 2.30.7 - wnck_window_is_maximized_vertically@Base 2.30.7 - wnck_window_is_minimized@Base 2.30.7 - wnck_window_is_most_recently_activated@Base 2.30.7 - wnck_window_is_on_workspace@Base 2.30.7 - wnck_window_is_pinned@Base 2.30.7 - wnck_window_is_shaded@Base 2.30.7 - wnck_window_is_skip_pager@Base 2.30.7 - wnck_window_is_skip_tasklist@Base 2.30.7 - wnck_window_is_sticky@Base 2.30.7 - wnck_window_is_visible_on_workspace@Base 2.30.7 - wnck_window_keyboard_move@Base 2.30.7 - wnck_window_keyboard_size@Base 2.30.7 - wnck_window_make_above@Base 2.30.7 - wnck_window_make_below@Base 2.30.7 - wnck_window_maximize@Base 2.30.7 - wnck_window_maximize_horizontally@Base 2.30.7 - wnck_window_maximize_vertically@Base 2.30.7 - wnck_window_minimize@Base 2.30.7 - wnck_window_move_resize_mask_get_type@Base 2.30.7 - wnck_window_move_to_workspace@Base 2.30.7 - wnck_window_needs_attention@Base 2.30.7 - wnck_window_or_transient_needs_attention@Base 2.30.7 - wnck_window_pin@Base 2.30.7 - wnck_window_set_fullscreen@Base 2.30.7 - wnck_window_set_geometry@Base 2.30.7 - wnck_window_set_icon_geometry@Base 2.30.7 - wnck_window_set_skip_pager@Base 2.30.7 - wnck_window_set_skip_tasklist@Base 2.30.7 - wnck_window_set_sort_order@Base 2.30.7 - wnck_window_set_window_type@Base 2.30.7 - wnck_window_shade@Base 2.30.7 - wnck_window_state_get_type@Base 2.30.7 - wnck_window_stick@Base 2.30.7 - wnck_window_transient_is_most_recently_activated@Base 2.30.7 - wnck_window_type_get_type@Base 2.30.7 - wnck_window_unmake_above@Base 2.30.7 - wnck_window_unmake_below@Base 2.30.7 - wnck_window_unmaximize@Base 2.30.7 - wnck_window_unmaximize_horizontally@Base 2.30.7 - wnck_window_unmaximize_vertically@Base 2.30.7 - wnck_window_unminimize@Base 2.30.7 - wnck_window_unpin@Base 2.30.7 - wnck_window_unshade@Base 2.30.7 - wnck_window_unstick@Base 2.30.7 - wnck_workspace_accessible_factory_get_type@Base 2.30.7 - wnck_workspace_accessible_factory_new@Base 2.30.7 - wnck_workspace_accessible_get_type@Base 2.30.7 - wnck_workspace_accessible_new@Base 2.30.7 - wnck_workspace_activate@Base 2.30.7 - wnck_workspace_change_name@Base 2.30.7 - wnck_workspace_get_height@Base 2.30.7 - wnck_workspace_get_layout_column@Base 2.30.7 - wnck_workspace_get_layout_row@Base 2.30.7 - wnck_workspace_get_name@Base 2.30.7 - wnck_workspace_get_neighbor@Base 2.30.7 - wnck_workspace_get_number@Base 2.30.7 - wnck_workspace_get_screen@Base 2.30.7 - wnck_workspace_get_type@Base 2.30.7 - wnck_workspace_get_viewport_x@Base 2.30.7 - wnck_workspace_get_viewport_y@Base 2.30.7 - wnck_workspace_get_width@Base 2.30.7 - wnck_workspace_is_virtual@Base 2.30.7 - wnck_xid_read_resource_usage@Base 2.30.7 + wnck_action_menu_get_type@Base 1:2.30.7 + wnck_action_menu_new@Base 1:2.30.7 + wnck_application_get@Base 1:2.30.7 + wnck_application_get_icon@Base 1:2.30.7 + wnck_application_get_icon_is_fallback@Base 1:2.30.7 + wnck_application_get_icon_name@Base 1:2.30.7 + wnck_application_get_mini_icon@Base 1:2.30.7 + wnck_application_get_n_windows@Base 1:2.30.7 + wnck_application_get_name@Base 1:2.30.7 + wnck_application_get_pid@Base 1:2.30.7 + wnck_application_get_startup_id@Base 1:2.30.7 + wnck_application_get_type@Base 1:2.30.7 + wnck_application_get_windows@Base 1:2.30.7 + wnck_application_get_xid@Base 1:2.30.7 + wnck_class_group_get@Base 1:2.30.7 + wnck_class_group_get_icon@Base 1:2.30.7 + wnck_class_group_get_mini_icon@Base 1:2.30.7 + wnck_class_group_get_name@Base 1:2.30.7 + wnck_class_group_get_res_class@Base 1:2.30.7 + wnck_class_group_get_type@Base 1:2.30.7 + wnck_class_group_get_windows@Base 1:2.30.7 + wnck_client_type_get_type@Base 1:2.30.7 + wnck_create_window_action_menu@Base 1:2.30.7 + wnck_gtk_window_set_dock_type@Base 1:2.30.7 + wnck_motion_direction_get_type@Base 1:2.30.7 + wnck_pager_accessible_factory_get_type@Base 1:2.30.7 + wnck_pager_accessible_factory_new@Base 1:2.30.7 + wnck_pager_accessible_get_type@Base 1:2.30.7 + wnck_pager_accessible_new@Base 1:2.30.7 + wnck_pager_display_mode_get_type@Base 1:2.30.7 + wnck_pager_get_type@Base 1:2.30.7 + wnck_pager_new@Base 1:2.30.7 + wnck_pager_set_display_mode@Base 1:2.30.7 + wnck_pager_set_n_rows@Base 1:2.30.7 + wnck_pager_set_orientation@Base 1:2.30.7 + wnck_pager_set_screen@Base 1:2.30.7 + wnck_pager_set_shadow_type@Base 1:2.30.7 + wnck_pager_set_show_all@Base 1:2.30.7 + wnck_pid_read_resource_usage@Base 1:2.30.7 + wnck_screen_calc_workspace_layout@Base 1:2.30.7 + wnck_screen_change_workspace_count@Base 1:2.30.7 + wnck_screen_force_update@Base 1:2.30.7 + wnck_screen_free_workspace_layout@Base 1:2.30.7 + wnck_screen_get@Base 1:2.30.7 + wnck_screen_get_active_window@Base 1:2.30.7 + wnck_screen_get_active_workspace@Base 1:2.30.7 + wnck_screen_get_background_pixmap@Base 1:2.30.7 + wnck_screen_get_default@Base 1:2.30.7 + wnck_screen_get_for_root@Base 1:2.30.7 + wnck_screen_get_height@Base 1:2.30.7 + wnck_screen_get_number@Base 1:2.30.7 + wnck_screen_get_previously_active_window@Base 1:2.30.7 + wnck_screen_get_showing_desktop@Base 1:2.30.7 + wnck_screen_get_type@Base 1:2.30.7 + wnck_screen_get_width@Base 1:2.30.7 + wnck_screen_get_window_manager_name@Base 1:2.30.7 + wnck_screen_get_windows@Base 1:2.30.7 + wnck_screen_get_windows_stacked@Base 1:2.30.7 + wnck_screen_get_workspace@Base 1:2.30.7 + wnck_screen_get_workspace_count@Base 1:2.30.7 + wnck_screen_get_workspace_index@Base 1:2.30.7 + wnck_screen_get_workspace_neighbor@Base 1:2.30.7 + wnck_screen_get_workspaces@Base 1:2.30.7 + wnck_screen_move_viewport@Base 1:2.30.7 + wnck_screen_net_wm_supports@Base 1:2.30.7 + wnck_screen_release_workspace_layout@Base 1:2.30.7 + wnck_screen_toggle_showing_desktop@Base 1:2.30.7 + wnck_screen_try_set_workspace_layout@Base 1:2.30.7 + wnck_selector_get_type@Base 1:2.30.7 + wnck_selector_new@Base 1:2.30.7 + wnck_set_client_type@Base 1:2.30.7 + wnck_tasklist_get_minimum_height@Base 1:2.30.7 + wnck_tasklist_get_minimum_width@Base 1:2.30.7 + wnck_tasklist_get_size_hint_list@Base 1:2.30.7 + wnck_tasklist_get_type@Base 1:2.30.7 + wnck_tasklist_grouping_type_get_type@Base 1:2.30.7 + wnck_tasklist_new@Base 1:2.30.7 + wnck_tasklist_set_button_relief@Base 1:2.30.7 + wnck_tasklist_set_grouping@Base 1:2.30.7 + wnck_tasklist_set_grouping_limit@Base 1:2.30.7 + wnck_tasklist_set_icon_loader@Base 1:2.30.7 + wnck_tasklist_set_include_all_workspaces@Base 1:2.30.7 + wnck_tasklist_set_minimum_height@Base 1:2.30.7 + wnck_tasklist_set_minimum_width@Base 1:2.30.7 + wnck_tasklist_set_orientation@Base 1:2.30.7 + wnck_tasklist_set_screen@Base 1:2.30.7 + wnck_tasklist_set_switch_workspace_on_unminimize@Base 1:2.30.7 + wnck_window_actions_get_type@Base 1:2.30.7 + wnck_window_activate@Base 1:2.30.7 + wnck_window_activate_transient@Base 1:2.30.7 + wnck_window_close@Base 1:2.30.7 + wnck_window_get@Base 1:2.30.7 + wnck_window_get_actions@Base 1:2.30.7 + wnck_window_get_application@Base 1:2.30.7 + wnck_window_get_class_group@Base 1:2.30.7 + wnck_window_get_client_window_geometry@Base 1:2.30.7 + wnck_window_get_geometry@Base 1:2.30.7 + wnck_window_get_group_leader@Base 1:2.30.7 + wnck_window_get_icon@Base 1:2.30.7 + wnck_window_get_icon_is_fallback@Base 1:2.30.7 + wnck_window_get_icon_name@Base 1:2.30.7 + wnck_window_get_mini_icon@Base 1:2.30.7 + wnck_window_get_name@Base 1:2.30.7 + wnck_window_get_pid@Base 1:2.30.7 + wnck_window_get_screen@Base 1:2.30.7 + wnck_window_get_session_id@Base 1:2.30.7 + wnck_window_get_session_id_utf8@Base 1:2.30.7 + wnck_window_get_sort_order@Base 1:2.30.7 + wnck_window_get_state@Base 1:2.30.7 + wnck_window_get_transient@Base 1:2.30.7 + wnck_window_get_type@Base 1:2.30.7 + wnck_window_get_window_type@Base 1:2.30.7 + wnck_window_get_workspace@Base 1:2.30.7 + wnck_window_get_xid@Base 1:2.30.7 + wnck_window_gravity_get_type@Base 1:2.30.7 + wnck_window_has_icon_name@Base 1:2.30.7 + wnck_window_has_name@Base 1:2.30.7 + wnck_window_is_above@Base 1:2.30.7 + wnck_window_is_active@Base 1:2.30.7 + wnck_window_is_below@Base 1:2.30.7 + wnck_window_is_fullscreen@Base 1:2.30.7 + wnck_window_is_in_viewport@Base 1:2.30.7 + wnck_window_is_maximized@Base 1:2.30.7 + wnck_window_is_maximized_horizontally@Base 1:2.30.7 + wnck_window_is_maximized_vertically@Base 1:2.30.7 + wnck_window_is_minimized@Base 1:2.30.7 + wnck_window_is_most_recently_activated@Base 1:2.30.7 + wnck_window_is_on_workspace@Base 1:2.30.7 + wnck_window_is_pinned@Base 1:2.30.7 + wnck_window_is_shaded@Base 1:2.30.7 + wnck_window_is_skip_pager@Base 1:2.30.7 + wnck_window_is_skip_tasklist@Base 1:2.30.7 + wnck_window_is_sticky@Base 1:2.30.7 + wnck_window_is_visible_on_workspace@Base 1:2.30.7 + wnck_window_keyboard_move@Base 1:2.30.7 + wnck_window_keyboard_size@Base 1:2.30.7 + wnck_window_make_above@Base 1:2.30.7 + wnck_window_make_below@Base 1:2.30.7 + wnck_window_maximize@Base 1:2.30.7 + wnck_window_maximize_horizontally@Base 1:2.30.7 + wnck_window_maximize_vertically@Base 1:2.30.7 + wnck_window_minimize@Base 1:2.30.7 + wnck_window_move_resize_mask_get_type@Base 1:2.30.7 + wnck_window_move_to_workspace@Base 1:2.30.7 + wnck_window_needs_attention@Base 1:2.30.7 + wnck_window_or_transient_needs_attention@Base 1:2.30.7 + wnck_window_pin@Base 1:2.30.7 + wnck_window_set_fullscreen@Base 1:2.30.7 + wnck_window_set_geometry@Base 1:2.30.7 + wnck_window_set_icon_geometry@Base 1:2.30.7 + wnck_window_set_skip_pager@Base 1:2.30.7 + wnck_window_set_skip_tasklist@Base 1:2.30.7 + wnck_window_set_sort_order@Base 1:2.30.7 + wnck_window_set_window_type@Base 1:2.30.7 + wnck_window_shade@Base 1:2.30.7 + wnck_window_state_get_type@Base 1:2.30.7 + wnck_window_stick@Base 1:2.30.7 + wnck_window_transient_is_most_recently_activated@Base 1:2.30.7 + wnck_window_type_get_type@Base 1:2.30.7 + wnck_window_unmake_above@Base 1:2.30.7 + wnck_window_unmake_below@Base 1:2.30.7 + wnck_window_unmaximize@Base 1:2.30.7 + wnck_window_unmaximize_horizontally@Base 1:2.30.7 + wnck_window_unmaximize_vertically@Base 1:2.30.7 + wnck_window_unminimize@Base 1:2.30.7 + wnck_window_unpin@Base 1:2.30.7 + wnck_window_unshade@Base 1:2.30.7 + wnck_window_unstick@Base 1:2.30.7 + wnck_workspace_accessible_factory_get_type@Base 1:2.30.7 + wnck_workspace_accessible_factory_new@Base 1:2.30.7 + wnck_workspace_accessible_get_type@Base 1:2.30.7 + wnck_workspace_accessible_new@Base 1:2.30.7 + wnck_workspace_activate@Base 1:2.30.7 + wnck_workspace_change_name@Base 1:2.30.7 + wnck_workspace_get_height@Base 1:2.30.7 + wnck_workspace_get_layout_column@Base 1:2.30.7 + wnck_workspace_get_layout_row@Base 1:2.30.7 + wnck_workspace_get_name@Base 1:2.30.7 + wnck_workspace_get_neighbor@Base 1:2.30.7 + wnck_workspace_get_number@Base 1:2.30.7 + wnck_workspace_get_screen@Base 1:2.30.7 + wnck_workspace_get_type@Base 1:2.30.7 + wnck_workspace_get_viewport_x@Base 1:2.30.7 + wnck_workspace_get_viewport_y@Base 1:2.30.7 + wnck_workspace_get_width@Base 1:2.30.7 + wnck_workspace_is_virtual@Base 1:2.30.7 + wnck_xid_read_resource_usage@Base 1:2.30.7 diff -Nru libwnck-2.30.7/debian/patches/02_moveresize_static_gravity.patch libwnck-2.30.7/debian/patches/02_moveresize_static_gravity.patch --- libwnck-2.30.7/debian/patches/02_moveresize_static_gravity.patch 1970-01-01 01:00:00.000000000 +0100 +++ libwnck-2.30.7/debian/patches/02_moveresize_static_gravity.patch 2016-02-16 10:39:29.000000000 +0000 @@ -0,0 +1,65 @@ +From 512ee1283c66ddb39b5598b2d1654568508f3fbf Mon Sep 17 00:00:00 2001 +From: Sam Spilsbury +Date: Sun, 2 Jan 2011 11:57:56 +0800 +Subject: [PATCH] Use StaticGravity when sending _NET_MOVERESIZE_WINDOW requests to change vp's +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=638483 +Bug-Ubuntu: http://launchpad.net/bugs/691545 + +ForgetGravity will cause the window manager to use the default gravity which +will shift the window by the frame extents on vp switch. +--- + libwnck/window-action-menu.c | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/libwnck/window-action-menu.c b/libwnck/window-action-menu.c +index e687cff..405f597 100644 +--- a/libwnck/window-action-menu.c ++++ b/libwnck/window-action-menu.c +@@ -233,7 +233,7 @@ item_activated_callback (GtkWidget *menu_item, + width = wnck_screen_get_width (screen); + wnck_window_get_geometry (window, &xw, &yw, &ww, &hw); + wnck_window_unstick (window); +- wnck_window_set_geometry (window, 0, ++ wnck_window_set_geometry (window, WNCK_WINDOW_GRAVITY_STATIC, + WNCK_WINDOW_CHANGE_X | WNCK_WINDOW_CHANGE_Y, + xw - width, yw, + ww, hw); +@@ -254,7 +254,7 @@ item_activated_callback (GtkWidget *menu_item, + width = wnck_screen_get_width (screen); + wnck_window_get_geometry (window, &xw, &yw, &ww, &hw); + wnck_window_unstick (window); +- wnck_window_set_geometry (window, 0, ++ wnck_window_set_geometry (window, WNCK_WINDOW_GRAVITY_STATIC, + WNCK_WINDOW_CHANGE_X | WNCK_WINDOW_CHANGE_Y, + xw + width, yw, + ww, hw); +@@ -275,7 +275,7 @@ item_activated_callback (GtkWidget *menu_item, + height = wnck_screen_get_height (screen); + wnck_window_get_geometry (window, &xw, &yw, &ww, &hw); + wnck_window_unstick (window); +- wnck_window_set_geometry (window, 0, ++ wnck_window_set_geometry (window, WNCK_WINDOW_GRAVITY_STATIC, + WNCK_WINDOW_CHANGE_X | WNCK_WINDOW_CHANGE_Y, + xw, yw - height, + ww, hw); +@@ -296,7 +296,7 @@ item_activated_callback (GtkWidget *menu_item, + height = wnck_screen_get_height (screen); + wnck_window_get_geometry (window, &xw, &yw, &ww, &hw); + wnck_window_unstick (window); +- wnck_window_set_geometry (window, 0, ++ wnck_window_set_geometry (window, WNCK_WINDOW_GRAVITY_STATIC, + WNCK_WINDOW_CHANGE_X | WNCK_WINDOW_CHANGE_Y, + xw, yw + height, + ww, hw); +@@ -340,7 +340,7 @@ item_activated_callback (GtkWidget *menu_item, + viewport_y = wnck_workspace_get_viewport_y (workspace); + + wnck_window_unstick (window); +- wnck_window_set_geometry (window, 0, ++ wnck_window_set_geometry (window, WNCK_WINDOW_GRAVITY_STATIC, + WNCK_WINDOW_CHANGE_X | WNCK_WINDOW_CHANGE_Y, + xw + new_viewport_x - viewport_x, + yw + new_viewport_y - viewport_y, +-- +1.7.2.3 + diff -Nru libwnck-2.30.7/debian/patches/03_window_action_menu_dispose_events.patch libwnck-2.30.7/debian/patches/03_window_action_menu_dispose_events.patch --- libwnck-2.30.7/debian/patches/03_window_action_menu_dispose_events.patch 1970-01-01 01:00:00.000000000 +0100 +++ libwnck-2.30.7/debian/patches/03_window_action_menu_dispose_events.patch 2016-02-16 10:43:12.000000000 +0000 @@ -0,0 +1,105 @@ +Description: WindowActionMenu: unset window and stop async events on dispose + Finalize function can be never called on menu, so it's better to do this when + the widget gets destroyed. + +Origin: upstream, https://git.gnome.org/browse/libwnck/commit/?h=gtk2&id=9e17ab5b +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libwnck/+bug/1191853 +Forwarded: yes +Author: Marco Trevisan + +diff --git a/libwnck/window-action-menu.c b/libwnck/window-action-menu.c +index e687cff..1e4b27e 100644 +--- a/libwnck/window-action-menu.c ++++ b/libwnck/window-action-menu.c +@@ -104,10 +104,8 @@ enum { + G_DEFINE_TYPE (WnckActionMenu, wnck_action_menu, GTK_TYPE_MENU); + #define WNCK_ACTION_MENU_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), WNCK_TYPE_ACTION_MENU, WnckActionMenuPrivate)) + +-static void wnck_action_menu_finalize (GObject *object); ++static void wnck_action_menu_dispose (GObject *object); + +-static void object_weak_notify (gpointer data, +- GObject *obj); + static void window_weak_notify (gpointer data, + GObject *window); + +@@ -118,23 +116,10 @@ static void + window_weak_notify (gpointer data, + GObject *window) + { +- g_object_weak_unref (G_OBJECT (data), +- object_weak_notify, +- window); +- ++ WNCK_ACTION_MENU(data)->priv->window = NULL; + gtk_widget_destroy (GTK_WIDGET (data)); + } + +- +-static void +-object_weak_notify (gpointer data, +- GObject *obj) +-{ +- g_object_weak_unref (G_OBJECT (data), +- window_weak_notify, +- obj); +-} +- + static WnckActionMenu* + get_action_menu (GtkWidget *widget) + { +@@ -1030,7 +1015,6 @@ wnck_action_menu_constructor (GType type, + } + + g_object_weak_ref (G_OBJECT (priv->window), window_weak_notify, menu); +- g_object_weak_ref (G_OBJECT (menu), object_weak_notify, priv->window); + + priv->minimize_item = make_menu_item (MINIMIZE); + +@@ -1181,7 +1165,7 @@ wnck_action_menu_class_init (WnckActionMenuClass *klass) + object_class->constructor = wnck_action_menu_constructor; + object_class->get_property = wnck_action_menu_get_property; + object_class->set_property = wnck_action_menu_set_property; +- object_class->finalize = wnck_action_menu_finalize; ++ object_class->dispose = wnck_action_menu_dispose; + + g_object_class_install_property (object_class, + PROP_WINDOW, +@@ -1192,17 +1176,30 @@ wnck_action_menu_class_init (WnckActionMenuClass *klass) + } + + static void +-wnck_action_menu_finalize (GObject *object) ++wnck_action_menu_dispose (GObject *object) + { + WnckActionMenu *menu; + + menu = WNCK_ACTION_MENU (object); + + if (menu->priv->idle_handler) +- g_source_remove (menu->priv->idle_handler); +- menu->priv->idle_handler = 0; ++ { ++ g_source_remove (menu->priv->idle_handler); ++ menu->priv->idle_handler = 0; ++ } ++ ++ if (WNCK_IS_WINDOW (menu->priv->window)) ++ { ++ g_object_weak_unref (G_OBJECT (menu->priv->window), window_weak_notify, menu); ++ g_signal_handlers_disconnect_by_data (menu->priv->window, menu); ++ ++ WnckScreen *screen = wnck_window_get_screen (menu->priv->window); ++ g_signal_handlers_disconnect_by_data (screen, menu); ++ ++ menu->priv->window = NULL; ++ } + +- G_OBJECT_CLASS (wnck_action_menu_parent_class)->finalize (object); ++ G_OBJECT_CLASS (wnck_action_menu_parent_class)->dispose (object); + } + + /** +-- +1.8.3.2 + diff -Nru libwnck-2.30.7/debian/patches/series libwnck-2.30.7/debian/patches/series --- libwnck-2.30.7/debian/patches/series 2016-02-08 12:10:09.000000000 +0000 +++ libwnck-2.30.7/debian/patches/series 2016-02-16 11:09:44.000000000 +0000 @@ -1,2 +1,4 @@ 01_tasklist_orientation.patch +02_moveresize_static_gravity.patch +03_window_action_menu_dispose_events.patch 99_ltmain_as-needed.patch