diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2010-11-19 19:24:20 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-22 10:25:35 +0000 |
commit | ea8a7e770482ceadd9ae88a5ee4ed4f9578ff26f (patch) | |
tree | 140b88b7f99c0d37662d25bd52974c001fc0823d /meta/recipes-sato/matchbox-panel-2/matchbox-panel-2 | |
parent | e0a2dfd36e4a092575dd3688b99b2536572de645 (diff) | |
download | poky-ea8a7e770482ceadd9ae88a5ee4ed4f9578ff26f.tar.gz |
matchbox-panel-2: Update to svn r2111
Also removed fix_sync_funcname.patch as we have it after update.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-sato/matchbox-panel-2/matchbox-panel-2')
-rw-r--r-- | meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/fix_sync_funcname.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/fix_sync_funcname.patch b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/fix_sync_funcname.patch deleted file mode 100644 index 25d08eda8b..0000000000 --- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/fix_sync_funcname.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | Rename function sync to sync_applet to avoid conflict. | ||
2 | |||
3 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | ||
4 | |||
5 | diff -ruN matchbox-panel-2-orig/applets/showdesktop/showdesktop.c matchbox-panel-2/applets/showdesktop/showdesktop.c | ||
6 | --- matchbox-panel-2-orig/applets/showdesktop/showdesktop.c 2010-11-17 20:59:46.000000000 +0800 | ||
7 | +++ matchbox-panel-2/applets/showdesktop/showdesktop.c 2010-11-17 21:00:11.000000000 +0800 | ||
8 | @@ -57,7 +57,7 @@ | ||
9 | |||
10 | /* Sync @applet with the _NET_SHOWING_DESKTOP root window property */ | ||
11 | static void | ||
12 | -sync (ShowDesktopApplet *applet) | ||
13 | +sync_applet (ShowDesktopApplet *applet) | ||
14 | { | ||
15 | GdkDisplay *display; | ||
16 | Atom type; | ||
17 | @@ -103,7 +103,7 @@ | ||
18 | if (xev->type == PropertyNotify) { | ||
19 | if (xev->xproperty.atom == applet->atom) { | ||
20 | /* _NET_SHOWING_DESKTOP changed */ | ||
21 | - sync (applet); | ||
22 | + sync_applet (applet); | ||
23 | } | ||
24 | } | ||
25 | |||
26 | @@ -145,7 +145,7 @@ | ||
27 | applet); | ||
28 | |||
29 | /* Sync */ | ||
30 | - sync (applet); | ||
31 | + sync_applet (applet); | ||
32 | } | ||
33 | |||
34 | /* Button clicked */ | ||