summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/fix_sync_funcname.patch
blob: 25d08eda8bcc0d21881be0a5ce5ffdd8810b3835 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
Rename function sync to sync_applet to avoid conflict.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>

diff -ruN matchbox-panel-2-orig/applets/showdesktop/showdesktop.c matchbox-panel-2/applets/showdesktop/showdesktop.c
--- matchbox-panel-2-orig/applets/showdesktop/showdesktop.c	2010-11-17 20:59:46.000000000 +0800
+++ matchbox-panel-2/applets/showdesktop/showdesktop.c	2010-11-17 21:00:11.000000000 +0800
@@ -57,7 +57,7 @@
 
 /* Sync @applet with the _NET_SHOWING_DESKTOP root window property */
 static void
-sync (ShowDesktopApplet *applet)
+sync_applet (ShowDesktopApplet *applet)
 {
         GdkDisplay *display;
         Atom type;
@@ -103,7 +103,7 @@
         if (xev->type == PropertyNotify) {
                 if (xev->xproperty.atom == applet->atom) {
                         /* _NET_SHOWING_DESKTOP changed */
-                        sync (applet);
+                        sync_applet (applet);
                 }
         }
 
@@ -145,7 +145,7 @@
                                applet);
 
         /* Sync */
-        sync (applet);
+        sync_applet (applet);
 }
 
 /* Button clicked */