← Back to branch summary

~unity-team/unity/lucid

« back to all changes in this revision

Viewing changes to debian/patches/01_drop_mutter_req.patch

  • Committer: Didier Roche
  • Date: 2010-06-10 11:43:53 UTC
  • Revision ID: didier.roche@canonical.com-20100610114353-xn93pkifv4jurug3
removed patches integrated upstream:
debian/patches/01_drop_mutter_req.patch
debian/patches/02_make_perceptualdiff_optional.patch
debian/patches/03_use_new_mutter_plugin_init_order.patch
debian/patches/99_autoconf.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_drop_mutter_req.patch
1
 
diff -Nur -x '*.orig' -x '*~' unity-packaging//targets/mutter/main.c unity-packaging.new//targets/mutter/main.c
2
 
--- unity-packaging//targets/mutter/main.c      2010-05-27 16:41:15.180713000 +0200
3
 
+++ unity-packaging.new//targets/mutter/main.c  2010-06-07 12:42:02.071691919 +0200
4
 
@@ -92,10 +92,6 @@
5
 
 static gboolean unity_mutter_xevent_filter (MutterPlugin *self,
6
 
                                       XEvent      *event);
7
 
 
8
 
-static void unity_mutter_topmost_changed (MutterPlugin *plugin,
9
 
-                                          MutterWindow *old_window,
10
 
-                                          MutterWindow *new_window);
11
 
-
12
 
 static void on_restore_input_region (UnityPlugin *plugin, gboolean fullscreen);
13
 
 
14
 
 static const MutterPluginInfo * unity_mutter_plugin_info (MutterPlugin *self);
15
 
@@ -117,7 +113,6 @@
16
 
   mut_class->kill_effect      = unity_mutter_kill_effect;
17
 
   mut_class->xevent_filter    = unity_mutter_xevent_filter;
18
 
   mut_class->plugin_info      = unity_mutter_plugin_info;
19
 
-  mut_class->topmost_changed  = unity_mutter_topmost_changed;
20
 
 }
21
 
 
22
 
 static void
23
 
@@ -269,16 +264,6 @@
24
 
   unity_plugin_kill_effect (UNITY_MUTTER (self)->plugin, window, events);
25
 
 }
26
 
 
27
 
-static void
28
 
-unity_mutter_topmost_changed (MutterPlugin *self,
29
 
-                              MutterWindow *old_window,
30
 
-                              MutterWindow *new_window)
31
 
-{
32
 
-  unity_plugin_topmost_changed (UNITY_MUTTER (self)->plugin,
33
 
-                                old_window,
34
 
-                                new_window);
35
 
-}
36
 
-
37
 
 static gboolean
38
 
 unity_mutter_xevent_filter (MutterPlugin *self,
39
 
                             XEvent      *event)
40
 
diff -Nur -x '*.orig' -x '*~' unity-packaging//targets/mutter/plugin.vala unity-packaging.new//targets/mutter/plugin.vala
41
 
--- unity-packaging//targets/mutter/plugin.vala 2010-06-07 12:21:01.646437000 +0200
42
 
+++ unity-packaging.new//targets/mutter/plugin.vala     2010-06-07 12:42:02.071691919 +0200
43
 
@@ -834,30 +834,6 @@
44
 
       this.window_kill_effect (this, window, events);
45
 
     }
46
 
 
47
 
-    public void topmost_size_changed (Clutter.Actor           actor,
48
 
-                                      Clutter.ActorBox        box,
49
 
-                                      Clutter.AllocationFlags flags)
50
 
-    {
51
 
-      if (actor is Mutter.Window)
52
 
-        check_fullscreen_obstruction ();
53
 
-    }
54
 
-
55
 
-    public void topmost_changed (Mutter.Window old_window,
56
 
-                                 Mutter.Window new_window)
57
 
-    {
58
 
-      if (active_window is Mutter.Window)
59
 
-        active_window.allocation_changed.disconnect (topmost_size_changed);
60
 
-
61
 
-      active_window = new_window;
62
 
-
63
 
-      if (active_window is Mutter.Window)
64
 
-        {
65
 
-          active_window.allocation_changed.connect (topmost_size_changed);
66
 
-
67
 
-          check_fullscreen_obstruction ();
68
 
-        }
69
 
-    }
70
 
-
71
 
     public int get_panel_height ()
72
 
     {
73
 
       return this.PANEL_HEIGHT;