summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/libsdl2/libsdl2_2.30.2.bb
blob: f9dacb288c7b4ccf7f6587fa9d484d66e0c28ad3 (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
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
SUMMARY = "Simple DirectMedia Layer"
DESCRIPTION = "Simple DirectMedia Layer is a cross-platform multimedia \
library designed to provide low level access to audio, keyboard, mouse, \
joystick, 3D hardware via OpenGL, and 2D video framebuffer."
HOMEPAGE = "http://www.libsdl.org"
BUGTRACKER = "http://bugzilla.libsdl.org/"

SECTION = "libs"

LICENSE = "Zlib & BSD-2-Clause"
LIC_FILES_CHKSUM = "\
    file://LICENSE.txt;md5=25231a5b96ccdd8f39eb53c07717be64 \
    file://src/hidapi/LICENSE.txt;md5=7c3949a631240cb6c31c50f3eb696077 \
    file://src/hidapi/LICENSE-bsd.txt;md5=b5fa085ce0926bb50d0621620a82361f \
    file://src/video/yuv2rgb/LICENSE;md5=79f8f3418d91531e05f0fc94ca67e071 \
"

# arm-neon adds MIT license
LICENSE:append = " ${@bb.utils.contains('PACKAGECONFIG', 'arm-neon', '& MIT', '', d)}"
LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'arm-neon', 'file://src/video/arm/pixman-arm-neon-asm.h;md5=9a9cc1e51abbf1da58f4d9528ec9d49b;beginline=1;endline=24', '', d)}"

PROVIDES = "virtual/libsdl2"

SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz"

S = "${WORKDIR}/SDL2-${PV}"

SRC_URI[sha256sum] = "891d66ac8cae51361d3229e3336ebec1c407a8a2a063b61df14f5fdf3ab5ac31"

inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even

BINCONFIG = "${bindir}/sdl2-config"

CVE_PRODUCT = "simple_directmedia_layer sdl"

EXTRA_OECMAKE = "-DSDL_OSS=OFF -DSDL_ESD=OFF -DSDL_ARTS=OFF \
                 -DSDL_DISKAUDIO=OFF -DSDL_NAS=OFF -DSDL_ESD_SHARED=OFF \
                 -DSDL_DUMMYVIDEO=OFF \
                 -DSDL_RPI=OFF \
                 -DSDL_PTHREADS=ON \
                 -DSDL_RPATH=OFF \
                 -DSDL_SNDIO=OFF \
                 -DSDL_X11_XCURSOR=OFF \
                 -DSDL_X11_XDBE=OFF \
                 -DSDL_X11_XFIXES=OFF \
                 -DSDL_X11_XINPUT=OFF \
                 -DSDL_X11_XRANDR=OFF \
                 -DSDL_X11_XSCRNSAVER=OFF \
                 -DSDL_X11_XSHAPE=OFF \
"

# opengl packageconfig factored out to make it easy for distros
# and BSP layers to pick either (desktop) opengl, gles2, or no GL
PACKAGECONFIG_GL ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"

PACKAGECONFIG:class-native = "x11 ${PACKAGECONFIG_GL}"
PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} ${PACKAGECONFIG_GL}"
PACKAGECONFIG ??= " \
    ${PACKAGECONFIG_GL} \
    ${@bb.utils.filter('DISTRO_FEATURES', 'alsa directfb pulseaudio pipewire x11 vulkan', d)} \
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland gles2', '', d)} \
    ${@bb.utils.contains("TUNE_FEATURES", "neon","arm-neon","",d)} \
"
PACKAGECONFIG[alsa]       = "-DSDL_ALSA=ON,-DSDL_ALSA=OFF,alsa-lib,"
PACKAGECONFIG[arm-neon]   = "-DSDL_ARMNEON=ON,-DSDL_ARMNEON=OFF"
PACKAGECONFIG[directfb]   = "-DSDL_DIRECTFB=ON,-DSDL_DIRECTFB=OFF,directfb,directfb"
PACKAGECONFIG[gles2]      = "-DSDL_OPENGLES=ON,-DSDL_OPENGLES=OFF,virtual/libgles2"
PACKAGECONFIG[jack]       = "-DSDL_JACK=ON,-DSDL_JACK=OFF,jack"
PACKAGECONFIG[kmsdrm]     = "-DSDL_KMSDRM=ON,-DSDL_KMSDRM=OFF,libdrm virtual/libgbm"
# The hidraw support doesn't catch Xbox, PS4 and Nintendo controllers,
#  so we'll just use libusb when it's available.
PACKAGECONFIG[libusb] = ",,libusb1"
PACKAGECONFIG[libdecor] = "-DSDL_WAYLAND_LIBDECOR=ON,-DSDL_WAYLAND_LIBDECOR=OFF,libdecor,libdecor"
PACKAGECONFIG[opengl]     = "-DSDL_OPENGL=ON,-DSDL_OPENGL=OFF,virtual/egl"
PACKAGECONFIG[pipewire] = "-DSDL_PIPEWIRE_SHARED=ON,-DSDL_PIPEWIRE_SHARED=OFF,pipewire"
PACKAGECONFIG[pulseaudio] = "-DSDL_PULSEAUDIO=ON,-DSDL_PULSEAUDIO=OFF,pulseaudio"
PACKAGECONFIG[vulkan]    = "-DSDL_VULKAN=ON,-DSDL_VULKAN=OFF"
PACKAGECONFIG[wayland]    = "-DSDL_WAYLAND=ON,-DSDL_WAYLAND=OFF,wayland-native wayland wayland-protocols libxkbcommon"
PACKAGECONFIG[x11]        = "-DSDL_X11=ON,-DSDL_X11=OFF,virtual/libx11 libxext libxrandr libxrender"

CFLAGS:append:class-native = " -DNO_SHARED_MEMORY"

FILES:${PN} += "${datadir}/licenses/SDL2/LICENSE.txt"

BBCLASSEXTEND = "native nativesdk"
id='n640' href='#n640'>640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281
From 0a4fe802edbd2e8a016161f08283e4b467c6762e Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Tue, 21 Jun 2011 12:48:39 +0200
Subject: [PATCH] Remove user switch applet

This hasn't been updated to work with gnome-panel > 2.30.0, so just drop it

Upstream-Status: unacceptable, backport

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 configure.ac                                       |    8 -
 gui/Makefile.am                                    |    2 -
 .../GNOME_FastUserSwitchApplet.server.in.in        |   38 -
 .../GNOME_FastUserSwitchApplet.xml                 |   20 -
 gui/user-switch-applet/Makefile.am                 |   67 -
 gui/user-switch-applet/applet.c                    | 1662 --------------------
 gui/user-switch-applet/gdm-entry-menu-item.c       |  304 ----
 gui/user-switch-applet/gdm-entry-menu-item.h       |   51 -
 po/POTFILES.in                                     |    4 -
 po/POTFILES.skip                                   |    1 -
 10 files changed, 0 insertions(+), 2157 deletions(-)
 delete mode 100644 gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
 delete mode 100644 gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
 delete mode 100644 gui/user-switch-applet/Makefile.am
 delete mode 100644 gui/user-switch-applet/applet.c
 delete mode 100644 gui/user-switch-applet/gdm-entry-menu-item.c
 delete mode 100644 gui/user-switch-applet/gdm-entry-menu-item.h

diff --git a/configure.ac b/configure.ac
index 841efe0..a834110 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,13 +149,6 @@ PKG_CHECK_MODULES(SIMPLE_CHOOSER,
 AC_SUBST(SIMPLE_CHOOSER_CFLAGS)
 AC_SUBST(SIMPLE_CHOOSER_LIBS)
 
-PKG_CHECK_MODULES(APPLET,
-        dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-        gtk+-2.0 >= $GTK_REQUIRED_VERSION
-        libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED_VERSION)
-AC_SUBST(APPLET_CFLAGS)
-AC_SUBST(APPLET_LIBS)
-
 PLUGIN_LIBTOOL_FLAGS="-export_dynamic -module -avoid-version"
 AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
 
@@ -1340,7 +1333,6 @@ gui/Makefile
 gui/simple-greeter/Makefile
 gui/simple-greeter/libnotificationarea/Makefile
 gui/simple-chooser/Makefile
-gui/user-switch-applet/Makefile
 utils/Makefile
 data/gdm.conf
 data/Makefile
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 326239f..bda3f7a 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -2,7 +2,6 @@ NULL =
 
 SUBDIRS =			\
 	simple-greeter		\
-	user-switch-applet	\
 	$(NULL)
 
 if XDMCP_SUPPORT
@@ -12,5 +11,4 @@ endif
 DIST_SUBDIRS =			\
 	simple-chooser		\
 	simple-greeter		\
-	user-switch-applet	\
 	$(NULL)
diff --git a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in b/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
deleted file mode 100644
index a9b775f..0000000
--- a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
+++ /dev/null
@@ -1,38 +0,0 @@
-<oaf_info>
-  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet_Factory" type="exe"
-              location="@LIBEXECDIR@/gdm-user-switch-applet">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:Bonobo/GenericFactory:1.0"/>
-      <item value="IDL:Bonobo/Unknown:1.0"/>
-    </oaf_attribute>
-    <oaf_attribute name="name" type="string" _value="User Switcher Applet Factory"/>
-    <oaf_attribute name="description" type="string" _value="User Switcher Applet Factory"/>
-    <oaf_attribute name="bonobo:environment" type="stringv">
-       <item value="DBUS_SESSION_BUS_ADDRESS"/>
-     <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
-     <oaf_attribute name="bugzilla:product" type="string" value="gdm"/>
-     <oaf_attribute name="bugzilla:component" type="string" value="general"/>
-     <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
-     <oaf_attribute name="bugzilla:other_binaries" type="string" value="gdm-user-switch-applet"/>
-    </oaf_attribute>
-  </oaf_server>
-
-  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet" type="factory"
-              location="OAFIID:GNOME_FastUserSwitchApplet_Factory">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
-      <item value="IDL:Bonobo/Control:1.0"/>
-      <item value="IDL:Bonobo/Unknown:1.0"/>
-    </oaf_attribute>
-    <oaf_attribute name="name" type="string" _value="User Switcher"/>
-    <oaf_attribute name="description" type="string" _value="A menu to quickly switch between users"/>
-    <oaf_attribute name="panel:icon" type="string" value="stock_people"/>
-    <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
-    <oaf_attribute name="bugzilla:product" type="string" value="gdm"/>
-    <oaf_attribute name="bugzilla:component" type="string" value="general"/>
-    <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
-    <oaf_attribute name="bugzilla:other_binaries" type="string" value="gdm-user-switch-applet"/>
-  </oaf_server>
-</oaf_info>
diff --git a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml b/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
deleted file mode 100644
index e1845c8..0000000
--- a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-  <popups>
-    <popup name="button3">
-      <menuitem
-       name="About Me Item"
-       verb="GdmAboutMe"
-       _label="Edit Personal _Information"/>
-      <menuitem
-       name="Users and Groups Admin Item"
-       verb="GdmUsersGroupsAdmin"
-       _label="_Edit Users and Groups"/>
-      <menuitem
-       name="About Item"
-       verb="GdmAbout"
-       _label="_About"
-       pixtype="stock"
-       pixname="gtk-about"/>
-    </popup>
-  </popups>
-</Root>
diff --git a/gui/user-switch-applet/Makefile.am b/gui/user-switch-applet/Makefile.am
deleted file mode 100644
index 2d2cdc0..0000000
--- a/gui/user-switch-applet/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-NULL =
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/gui/simple-greeter		\
-	-I$(top_srcdir)/common				\
-	-DPREFIX=\""$(prefix)"\" 			\
-	-DLIBDIR=\""$(libdir)"\" 			\
-	-DDATADIR=\""$(datadir)"\"		 	\
-	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
-	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"	\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-DGLADEDIR=\""$(pkgdatadir)"\" 			\
-	-DLIBEXECDIR=\""$(libexecdir)"\" 		\
-	-DSBINDIR=\""$(sbindir)"\"		 	\
-	-DGDMCONFDIR=\"$(gdmconfdir)\"			\
-	$(GTK_CFLAGS)					\
-	$(APPLET_CFLAGS)				\
-	$(NULL)
-
-libexec_PROGRAMS =			\
-	gdm-user-switch-applet		\
-	$(NULL)
-
-gdm_user_switch_applet_SOURCES =  	\
-	applet.c 			\
-	gdm-entry-menu-item.h		\
-	gdm-entry-menu-item.c		\
-	$(NULL)
-
-gdm_user_switch_applet_LDADD = 		\
-	$(top_builddir)/gui/simple-greeter/libgdmuser.la	\
-	$(top_builddir)/common/libgdmcommon.la		\
-	$(COMMON_LIBS)					\
-	$(APPLET_LIBS)					\
-	$(NULL)
-
-# Bonobo UI
-uidir =	$(datadir)/gnome-2.0/ui
-ui_DATA =					\
-	GNOME_FastUserSwitchApplet.xml		\
-	$(NULL)
-
-# Bonobo .server
-serverdir = $(libdir)/bonobo/servers
-server_in_files =				\
-	GNOME_FastUserSwitchApplet.server.in	\
-	$(NULL)
-server_DATA = $(server_in_files:.server.in=.server)
-
-$(server_in_files): $(server_in_files:.server.in=.server.in.in)
-	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
-
-@INTLTOOL_SERVER_RULE@
-
-EXTRA_DIST = 			\
-	$(ui_DATA)		\
-	GNOME_FastUserSwitchApplet.server.in.in	\
-	$(NULL)
-
-DISTCLEANFILES =                        \
-	$(server_in_files)		\
-	$(server_DATA)			\
-        $(NULL)
-
-MAINTAINERCLEANFILES =                  \
-        *~                              \
-        Makefile.in
diff --git a/gui/user-switch-applet/applet.c b/gui/user-switch-applet/applet.c
deleted file mode 100644
index b4f944c..0000000
--- a/gui/user-switch-applet/applet.c
+++ /dev/null
@@ -1,1662 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>.
- * Copyright (C) 2008      Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "config.h"
-
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-#include <glib/gi18n.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-
-#include <dbus/dbus-glib.h>
-
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-ui-util.h>
-
-#include <panel-applet.h>
-#include <panel-applet-gconf.h>
-
-#include "gdm-user-manager.h"
-#include "gdm-entry-menu-item.h"
-#include "gdm-settings-client.h"
-
-#define LOCKDOWN_DIR    "/desktop/gnome/lockdown"
-#define LOCKDOWN_USER_SWITCHING_KEY LOCKDOWN_DIR "/disable_user_switching"
-#define LOCKDOWN_LOCK_SCREEN_KEY    LOCKDOWN_DIR "/disable_lock_screen"
-#define LOCKDOWN_COMMAND_LINE_KEY   LOCKDOWN_DIR "/disable_command_line"
-
-typedef enum {
-        GSM_PRESENCE_STATUS_AVAILABLE = 0,
-        GSM_PRESENCE_STATUS_INVISIBLE,
-        GSM_PRESENCE_STATUS_BUSY,
-        GSM_PRESENCE_STATUS_IDLE,
-} GsmPresenceStatus;
-
-typedef struct _GdmAppletData
-{
-        PanelApplet    *applet;
-
-        GConfClient    *client;
-        GdmUserManager *manager;
-        GdmUser        *user;
-
-        GtkWidget      *menubar;
-        GtkWidget      *menuitem;
-        GtkWidget      *menu;
-#ifdef BUILD_PRESENSE_STUFF
-        GtkWidget      *user_item;
-#endif
-        GtkWidget      *control_panel_item;
-        GtkWidget      *account_item;
-        GtkWidget      *lock_screen_item;
-        GtkWidget      *login_screen_item;
-        GtkWidget      *quit_session_item;
-
-        guint           client_notify_lockdown_id;
-
-        guint           current_status;
-        guint           user_loaded_notify_id;
-        guint           user_changed_notify_id;
-        gint8           pixel_size;
-        gint            panel_size;
-        GtkIconSize     icon_size;
-#ifdef BUILD_PRESENSE_STUFF
-        DBusGProxy     *presence_proxy;
-#endif
-} GdmAppletData;
-
-typedef struct _SelectorResponseData
-{
-        GdmAppletData  *adata;
-        GtkRadioButton *radio;
-} SelectorResponseData;
-
-static void reset_icon   (GdmAppletData *adata);
-static void update_label (GdmAppletData *adata);
-
-static gboolean applet_factory (PanelApplet   *applet,
-                                const char    *iid,
-                                gpointer       data);
-
-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FastUserSwitchApplet_Factory",
-                             PANEL_TYPE_APPLET,
-                             "gdm-user-switch-applet", "0",
-                             (PanelAppletFactoryCallback)applet_factory,
-                             NULL)
-
-static void
-about_me_cb (BonoboUIComponent *ui_container,
-             gpointer           data,
-             const char        *cname)
-{
-        GError *err;
-
-        err = NULL;
-        if (! g_spawn_command_line_async ("gnome-about-me", &err)) {
-                g_critical ("Could not run `gnome-about-me': %s",
-                            err->message);
-                g_error_free (err);
-                bonobo_ui_component_set_prop (ui_container,
-                                              "/commands/GdmAboutMe",
-                                              "hidden", "1",
-                                              NULL);
-        }
-}
-
-/*
- * gnome-panel/applets/wncklet/window-menu.c:window_filter_button_press()
- *
- * Copyright (C) 2005 James M. Cape.
- * Copyright (C) 2003 Sun Microsystems, Inc.
- * Copyright (C) 2001 Free Software Foundation, Inc.
- * Copyright (C) 2000 Helix Code, Inc.
- */
-static gboolean
-menubar_button_press_event_cb (GtkWidget      *menubar,
-                               GdkEventButton *event,
-                               GdmAppletData  *adata)
-{
-        if (event->button != 1) {
-                g_signal_stop_emission_by_name (menubar, "button-press-event");
-                /* Reset the login window item */
-        }
-
-        return FALSE;
-}
-
-static void
-about_cb (BonoboUIComponent *ui_container,
-          gpointer           data,
-          const char        *cname)
-{
-        static const char *authors[] = {
-                "James M. Cape <jcape@ignore-your.tv>",
-                "Thomas Thurman <thomas@thurman.org.uk>",
-                "William Jon McCann <jmccann@redhat.com>",
-                NULL
-        };
-        static char *license[] = {
-                N_("The User Switch Applet is free software; you can redistribute it and/or modify "
-                   "it under the terms of the GNU General Public License as published by "
-                   "the Free Software Foundation; either version 2 of the License, or "
-                   "(at your option) any later version."),
-                N_("This program is distributed in the hope that it will be useful, "
-                   "but WITHOUT ANY WARRANTY; without even the implied warranty of "
-                   "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the "
-                   "GNU General Public License for more details."),
-                N_("You should have received a copy of the GNU General Public License "
-                   "along with this program; if not, write to the Free Software "
-                   "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA "),
-                NULL
-        };
-        char *license_i18n;
-
-        license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL); 
-
-        gtk_show_about_dialog (NULL,
-                               "version", VERSION,
-                               "copyright", "Copyright \xc2\xa9 2004-2005 James M. Cape.\n"
-                               "Copyright \xc2\xa9 2006 Thomas Thurman.\n"
-                               "Copyright \xc2\xa9 2008 Red Hat, Inc.",
-                               "comments", _("A menu to quickly switch between users."),
-                               "authors", authors,
-                               "license", license_i18n,
-                               "wrap-license", TRUE,
-                               "translator-credits", _("translator-credits"),
-                               "logo-icon-name", "stock_people",
-                               NULL);
-
-        g_free (license_i18n);
-}
-
-
-static void
-admin_cb (BonoboUIComponent *ui_container,
-          gpointer           data,
-          const char        *cname)
-{
-#ifdef USERS_ADMIN
-        char   **args;
-        gboolean res;
-        GError  *err;
-
-        err = NULL;
-        if (!g_shell_parse_argv (USERS_ADMIN, NULL, &args, &err)) {
-                g_critical ("Could not parse users and groups management command line `%s': %s",
-                            USERS_ADMIN, err->message);
-                return;
-        }
-
-        res = g_spawn_async (g_get_home_dir (),
-                             args,
-                             NULL,
-                             (G_SPAWN_STDOUT_TO_DEV_NULL |
-                              G_SPAWN_STDERR_TO_DEV_NULL |
-                              G_SPAWN_SEARCH_PATH),
-                             NULL,
-                             NULL,
-                             NULL,
-                             &err);
-        if (! res) {
-                g_critical ("Could not run `%s' to manage users and groups: %s",
-                            USERS_ADMIN, err->message);
-                g_error_free (err);
-        }
-        g_strfreev (args);
-#endif /* USERS_ADMIN */
-}
-
-static void
-set_menuitem_icon (BonoboUIComponent *component,
-                   const char        *item_path,
-                   GtkIconTheme      *theme,
-                   const char        *icon_name,
-                   gint               icon_size)
-{
-        GdkPixbuf *pixbuf;
-        int        width;
-        int        height;
-
-        pixbuf = gtk_icon_theme_load_icon (theme, icon_name, icon_size, 0, NULL);
-        if (pixbuf == NULL) {
-                return;
-        }
-
-        width = gdk_pixbuf_get_width (pixbuf);
-        height = gdk_pixbuf_get_height (pixbuf);
-        if (width > icon_size + 4 || height > icon_size + 4) {
-                GdkPixbuf *tmp;
-                if (height > width) {
-                        width *= (gdouble) icon_size / (gdouble) height;
-                        height = icon_size;
-                } else {
-                        height *= (gdouble) icon_size / (gdouble) width;
-                        width = icon_size;
-                }
-                tmp = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR);
-                g_object_unref (pixbuf);
-                pixbuf = tmp;
-        }
-
-        bonobo_ui_util_set_pixbuf (component, item_path, pixbuf, NULL);
-        g_object_unref (pixbuf);
-}
-
-static void
-applet_style_set_cb (GtkWidget *widget,
-                     GtkStyle  *old_style,
-                     gpointer   data)
-{
-        BonoboUIComponent *component;
-        GdkScreen         *screen;
-        GtkIconTheme      *theme;
-        int                width;
-        int                height;
-        int                icon_size;
-
-        if (gtk_widget_has_screen (widget)) {
-                screen = gtk_widget_get_screen (widget);
-        } else {
-                screen = gdk_screen_get_default ();
-        }
-
-        if (gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen),
-                                               GTK_ICON_SIZE_MENU, &width, &height)) {
-                icon_size = MAX (width, height);
-        } else {
-                icon_size = 16;
-        }
-
-        theme = gtk_icon_theme_get_for_screen (screen);
-        component = panel_applet_get_popup_component (PANEL_APPLET (widget));
-
-        set_menuitem_icon (component,
-                           "/commands/GdmAboutMe",
-                           theme,
-                           "user-info",
-                           icon_size);
-        set_menuitem_icon (component,
-                           "/commands/GdmUsersGroupsAdmin",
-                           theme,
-                           "stock_people",
-                           icon_size);
-}
-
-static void
-applet_change_background_cb (PanelApplet               *applet,
-                             PanelAppletBackgroundType  type,
-                             GdkColor                  *color,
-                             GdkPixmap                 *pixmap,
-                             GdmAppletData             *adata)
-{
-        GtkRcStyle *rc_style;
-        GtkStyle   *style;
-
-        gtk_widget_set_style (adata->menubar, NULL);
-        rc_style = gtk_rc_style_new ();
-        gtk_widget_modify_style (GTK_WIDGET (adata->menubar), rc_style);
-        g_object_unref (rc_style);
-
-        switch (type) {
-        case PANEL_NO_BACKGROUND:
-                break;
-        case PANEL_COLOR_BACKGROUND:
-                gtk_widget_modify_bg (adata->menubar, GTK_STATE_NORMAL, color);
-                break;
-        case PANEL_PIXMAP_BACKGROUND:
-                style = gtk_style_copy (gtk_widget_get_style (adata->menubar));
-                if (style->bg_pixmap[GTK_STATE_NORMAL]) {
-                        g_object_unref (style->bg_pixmap[GTK_STATE_NORMAL]);
-                }
-
-                style->bg_pixmap[GTK_STATE_NORMAL] = g_object_ref (pixmap);
-                gtk_widget_set_style (adata->menubar, style);
-                g_object_unref (style);
-                break;
-        }
-}
-
-/*
- * gnome-panel/applets/wncklet/window-menu.c:window_menu_key_press_event()
- *
- * Copyright (C) 2003 Sun Microsystems, Inc.
- * Copyright (C) 2001 Free Software Foundation, Inc.
- * Copyright (C) 2000 Helix Code, Inc.
- */
-static gboolean
-applet_key_press_event_cb (GtkWidget     *widget,
-                           GdkEventKey   *event,
-                           GdmAppletData *adata)
-{
-        GtkMenuShell *menu_shell;
-
-        switch (event->keyval) {
-        case GDK_KP_Enter:
-        case GDK_ISO_Enter:
-        case GDK_3270_Enter:
-        case GDK_Return:
-        case GDK_space:
-        case GDK_KP_Space:
-                menu_shell = GTK_MENU_SHELL (adata->menubar);
-                /*
-                 * We need to call _gtk_menu_shell_activate() here as is done in
-                 * window_key_press_handler in gtkmenubar.c which pops up menu
-                 * when F10 is pressed.
-                 *
-                 * As that function is private its code is replicated here.
-                 */
-                if (!menu_shell->active) {
-                        gtk_grab_add (GTK_WIDGET (menu_shell));
-                        menu_shell->have_grab = TRUE;
-                        menu_shell->active = TRUE;
-                }
-
-                gtk_menu_shell_select_first (menu_shell, FALSE);
-                return TRUE;
-        default:
-                break;
-        }
-
-        return FALSE;
-}
-
-static void
-set_item_text_angle_and_alignment (GtkWidget *item,
-                                   double     text_angle,
-                                   float      xalign,
-                                   float      yalign)
-{
-        GtkWidget *label;
-
-        label = gtk_bin_get_child (GTK_BIN (item));
-
-        gtk_label_set_angle (GTK_LABEL (label), text_angle);
-
-        gtk_misc_set_alignment (GTK_MISC (label), xalign, yalign);
-}
-
-/*
- * gnome-panel/applets/wncklet/window-menu.c:window_menu_size_allocate()
- *
- * Copyright (C) 2003 Sun Microsystems, Inc.
- * Copyright (C) 2001 Free Software Foundation, Inc.
- * Copyright (C) 2000 Helix Code, Inc.
- */
-static void
-applet_size_allocate_cb (GtkWidget     *widget,
-                         GtkAllocation *allocation,
-                         GdmAppletData *adata)
-{
-        GList            *children;
-        GtkWidget        *top_item;
-        PanelAppletOrient orient;
-        gint              pixel_size;
-        gdouble           text_angle;
-        GtkPackDirection  pack_direction;
-        float             text_xalign;
-        float             text_yalign;
-
-        pack_direction = GTK_PACK_DIRECTION_LTR;
-        text_angle = 0.0;
-        text_xalign = 0.0;
-        text_yalign = 0.5;
-
-        children = gtk_container_get_children (GTK_CONTAINER (adata->menubar));
-        top_item = GTK_WIDGET (children->data);
-        g_list_free (children);
-
-        orient = panel_applet_get_orient (PANEL_APPLET (widget));
-
-        switch (orient) {
-        case PANEL_APPLET_ORIENT_UP:
-        case PANEL_APPLET_ORIENT_DOWN:
-                gtk_widget_set_size_request (top_item, -1, allocation->height);
-                pixel_size = allocation->height - gtk_widget_get_style (top_item)->ythickness * 2;
-                break;
-        case PANEL_APPLET_ORIENT_LEFT:
-                gtk_widget_set_size_request (top_item, allocation->width, -1);
-                pixel_size = allocation->width - gtk_widget_get_style (top_item)->xthickness * 2;
-                pack_direction = GTK_PACK_DIRECTION_TTB;
-                text_angle = 270.0;
-                text_xalign = 0.5;
-                text_yalign = 0.0;
-                break;
-        case PANEL_APPLET_ORIENT_RIGHT:
-                gtk_widget_set_size_request (top_item, allocation->width, -1);
-                pixel_size = allocation->width - gtk_widget_get_style (top_item)->xthickness * 2;
-                pack_direction = GTK_PACK_DIRECTION_BTT;
-                text_angle = 90.0;
-                text_xalign = 0.5;
-                text_yalign = 0.0;
-                break;
-        default:
-                g_assert_not_reached ();
-                break;
-        }
-
-        gtk_menu_bar_set_pack_direction (GTK_MENU_BAR (adata->menubar),
-                                         pack_direction);
-        gtk_menu_bar_set_child_pack_direction (GTK_MENU_BAR (adata->menubar),
-                                               pack_direction);
-
-        set_item_text_angle_and_alignment (adata->menuitem,
-                                           text_angle,
-                                           text_xalign,
-                                           text_yalign);
-
-        if (adata->panel_size != pixel_size) {
-                adata->panel_size = pixel_size;
-                reset_icon (adata);
-        }
-}
-
-
-static void
-gdm_applet_data_free (GdmAppletData *adata)
-{
-        gconf_client_notify_remove (adata->client, adata->client_notify_lockdown_id);
-
-        if (adata->user_loaded_notify_id != 0) {
-                g_signal_handler_disconnect (adata->user, adata->user_loaded_notify_id);
-        }
-
-        if (adata->user_changed_notify_id != 0) {
-                g_signal_handler_disconnect (adata->user, adata->user_changed_notify_id);
-        }
-
-#ifdef BUILD_PRESENSE_STUFF
-        if (adata->presence_proxy != NULL) {
-                g_object_unref (adata->presence_proxy);
-        }
-#endif
-
-        if (adata->user != NULL) {
-                g_object_unref (adata->user);
-        }
-        g_object_unref (adata->client);
-        g_object_unref (adata->manager);
-
-        g_free (adata);
-}
-
-
-/*
- * gnome-panel/applets/wncklet/window-menu.c:window_menu_on_expose()
- *
- * Copyright (C) 2003 Sun Microsystems, Inc.
- * Copyright (C) 2001 Free Software Foundation, Inc.
- * Copyright (C) 2000 Helix Code, Inc.
- */
-static gboolean
-menubar_expose_event_cb (GtkWidget      *widget,
-                         GdkEventExpose *event,
-                         GdmAppletData  *adata)
-{
-        if (gtk_widget_has_focus (GTK_WIDGET (adata->applet)))
-                gtk_paint_focus (gtk_widget_get_style (widget),
-                                 gtk_widget_get_window (widget),
-                                 gtk_widget_get_state (widget),
-                                 NULL, widget, "menu-applet", 0, 0, -1, -1);
-
-        return FALSE;
-}
-
-static void
-menu_style_set_cb (GtkWidget     *menu,
-                   GtkStyle      *old_style,
-                   GdmAppletData *adata)
-{
-        GtkSettings *settings;
-        int          width;
-        int          height;
-
-        adata->icon_size = gtk_icon_size_from_name ("panel-menu");
-
-        if (adata->icon_size == GTK_ICON_SIZE_INVALID) {
-                adata->icon_size = gtk_icon_size_register ("panel-menu", 24, 24);
-        }
-
-        if (gtk_widget_has_screen (menu)) {
-                settings = gtk_settings_get_for_screen (gtk_widget_get_screen (menu));
-        } else {
-                settings = gtk_settings_get_default ();
-        }
-
-        if (!gtk_icon_size_lookup_for_settings (settings, adata->icon_size,
-                                                &width, &height)) {
-                adata->pixel_size = -1;
-        } else {
-                adata->pixel_size = MAX (width, height);
-        }
-}
-
-static void
-menuitem_style_set_cb (GtkWidget     *menuitem,
-                       GtkStyle      *old_style,
-                       GdmAppletData *adata)
-{
-        GtkWidget *image;
-
-        if (GDM_IS_ENTRY_MENU_ITEM (menuitem)) {
-        } else {
-                const char *icon_name;
-
-                if (menuitem == adata->login_screen_item) {
-                        icon_name = "system-users";
-                } else if (menuitem == adata->lock_screen_item) {
-                        icon_name = "system-lock-screen";
-                } else if (menuitem == adata->quit_session_item) {
-                        icon_name = "system-log-out";
-                } else if (menuitem == adata->account_item) {
-                        icon_name = "user-info";
-                } else if (menuitem == adata->control_panel_item) {
-                        icon_name = "preferences-desktop";
-                } else {
-                        icon_name = GTK_STOCK_MISSING_IMAGE;
-                }
-
-                image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (menuitem));
-                gtk_image_set_pixel_size (GTK_IMAGE (image), adata->pixel_size);
-                gtk_image_set_from_icon_name (GTK_IMAGE (image), icon_name,
-                                              adata->icon_size);
-        }
-}
-
-static void
-on_user_changed (GdmUser         *user,
-                 GdmAppletData   *adata)
-{
-        g_debug ("user changed");
-        update_label (adata);
-        reset_icon (adata);
-}
-
-/* Called every time the menu is displayed (and also for some reason
- * immediately it's created, which does no harm). All we have to do
- * here is kick off a request to GDM to let us know which users are
- * logged in, so we can display check marks next to their names.
- */
-static gboolean
-menu_expose_cb (GtkWidget *menu,
-                gpointer   data)
-{
-        char *program;
-        GdmAppletData *adata = data;
-
-        program = g_find_program_in_path ("gnome-control-center");
-        if (program != NULL) {
-                gtk_widget_show (adata->control_panel_item);
-        } else {
-                gtk_widget_hide (adata->control_panel_item);
-        }
-        g_free (program);
-        return FALSE;
-}
-
-static void
-maybe_lock_screen (GdmAppletData *adata)
-{
-        char      *args[3];
-        GError    *err;
-        GdkScreen *screen;
-        gboolean   use_gscreensaver = TRUE;
-        gboolean   res;
-
-        g_debug ("Attempting to lock screen");
-
-        args[0] = g_find_program_in_path ("gnome-screensaver-command");
-        if (args[0] == NULL) {
-                args[0] = g_find_program_in_path ("xscreensaver-command");
-                use_gscreensaver = FALSE;
-        }
-
-        if (args[0] == NULL) {
-                return;
-        }
-
-        if (use_gscreensaver) {
-                args[1] = "--lock";
-        } else {
-                args[1] = "-lock";
-        }
-        args[2] = NULL;
-
-        if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) {
-                screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet));
-        } else {
-                screen = gdk_screen_get_default ();
-        }
-
-        err = NULL;
-        res = gdk_spawn_on_screen (screen,
-                                   g_get_home_dir (),
-                                   args,
-                                   NULL,
-                                   0,
-                                   NULL,
-                                   NULL,
-                                   NULL,
-                                   &err);
-        if (! res) {
-                g_warning (_("Can't lock screen: %s"), err->message);
-                g_error_free (err);
-        }
-
-        if (use_gscreensaver) {
-                args[1] = "--throttle";
-        } else {
-                args[1] = "-throttle";
-        }
-
-        err = NULL;
-        res = gdk_spawn_on_screen (screen,
-                                   g_get_home_dir (),
-                                   args,
-                                   NULL,
-                                   (G_SPAWN_STDERR_TO_DEV_NULL
-                                   | G_SPAWN_STDOUT_TO_DEV_NULL),
-                                   NULL,
-                                   NULL,
-                                   NULL,
-                                   &err);
-        if (! res) {
-                g_warning (_("Can't temporarily set screensaver to blank screen: %s"),
-                           err->message);
-                g_error_free (err);
-        }
-
-        g_free (args[0]);
-}
-
-static void
-do_switch (GdmAppletData *adata,
-           GdmUser       *user)
-{
-        guint num_sessions;
-
-        g_debug ("Do user switch");
-
-        if (user == NULL) {
-                gdm_user_manager_goto_login_session (adata->manager);
-                goto out;
-        }
-
-        num_sessions = gdm_user_get_num_sessions (user);
-        if (num_sessions > 0) {
-                gdm_user_manager_activate_user_session (adata->manager, user);
-        } else {
-                gdm_user_manager_goto_login_session (adata->manager);
-        }
- out:
-        maybe_lock_screen (adata);
-}
-
-static void
-update_switch_user (GdmAppletData *adata)
-{
-        gboolean can_switch;
-        gboolean has_other_users;
-
-        can_switch = gdm_user_manager_can_switch (adata->manager);
-        g_object_get (adata->manager,
-                      "has-multiple-users", &has_other_users,
-                      NULL);
-
-        if (can_switch && has_other_users) {
-                gtk_widget_show (adata->login_screen_item);
-        } else {
-
-                gtk_widget_hide (adata->login_screen_item);
-        }
-}
-
-static void
-on_manager_is_loaded_changed (GdmUserManager *manager,
-                              GParamSpec     *pspec,
-                              GdmAppletData  *adata)
-{
-        update_switch_user (adata);
-}
-
-static void
-on_manager_has_multiple_users_changed (GdmUserManager       *manager,
-                                       GParamSpec           *pspec,
-                                       GdmAppletData        *adata)
-{
-        update_switch_user (adata);
-}
-
-#ifdef BUILD_PRESENSE_STUFF
-static void
-on_user_item_activate (GtkMenuItem   *item,
-                       GdmAppletData *adata)
-{
-        g_signal_stop_emission_by_name (item, "activate");
-}
-#endif
-
-static void
-on_control_panel_activate (GtkMenuItem   *item,
-                           GdmAppletData *adata)
-{
-        char      *args[2];
-        GError    *error;
-        GdkScreen *screen;
-        gboolean   res;
-
-        args[0] = g_find_program_in_path ("gnome-control-center");
-        if (args[0] == NULL) {
-                return;
-        }
-        args[1] = NULL;
-
-        if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) {
-                screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet));
-        } else {
-                screen = gdk_screen_get_default ();
-        }
-
-        error = NULL;
-        res = gdk_spawn_on_screen (screen,
-                                   g_get_home_dir (),
-                                   args,
-                                   NULL,
-                                   0,
-                                   NULL,
-                                   NULL,
-                                   NULL,
-                                   &error);
-        if (! res) {
-                g_warning (_("Can't lock screen: %s"), error->message);
-                g_error_free (error);
-        }
-
-        g_free (args[0]);
-}
-
-static void
-on_account_activate (GtkMenuItem   *item,
-                     GdmAppletData *adata)
-{
-        char      *args[2];
-        GError    *error;
-        GdkScreen *screen;
-        gboolean   res;
-
-        args[0] = g_find_program_in_path ("accounts-dialog");
-        if (args[0] == NULL) {
-                args[0] = g_find_program_in_path ("gnome-about-me");
-                if (args[0] == NULL) {
-                        return;
-                }
-        }
-        args[1] = NULL;
-
-        if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) {
-                screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet));
-        } else {
-                screen = gdk_screen_get_default ();
-        }
-
-        error = NULL;
-        res = gdk_spawn_on_screen (screen,
-                                   g_get_home_dir (),
-                                   args,
-                                   NULL,
-                                   0,
-                                   NULL,
-                                   NULL,
-                                   NULL,
-                                   &error);
-        if (! res) {
-                g_warning (_("Can't lock screen: %s"), error->message);
-                g_error_free (error);
-        }
-
-        g_free (args[0]);
-}
-
-static void
-on_lock_screen_activate (GtkMenuItem   *item,
-                         GdmAppletData *adata)
-{
-        maybe_lock_screen (adata);
-}
-
-static void
-on_login_screen_activate (GtkMenuItem   *item,
-                          GdmAppletData *adata)
-{
-        GdmUser *user;
-
-        user = NULL;
-
-        do_switch (adata, user);
-}
-
-static void
-on_quit_session_activate (GtkMenuItem   *item,
-                          GdmAppletData *adata)
-{
-        char      *args[3];
-        GError    *error;
-        GdkScreen *screen;
-        gboolean   res;
-
-        args[0] = g_find_program_in_path ("gnome-session-save");
-        if (args[0] == NULL) {
-                return;
-        }
-
-        args[1] = "--logout-dialog";
-        args[2] = NULL;
-
-        if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) {
-                screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet));
-        } else {
-                screen = gdk_screen_get_default ();
-        }
-
-        error = NULL;
-        res = gdk_spawn_on_screen (screen,
-                                   g_get_home_dir (),
-                                   args,
-                                   NULL,
-                                   0,
-                                   NULL,
-                                   NULL,
-                                   NULL,
-                                   &error);
-        if (! res) {
-                g_warning (_("Can't log out: %s"), error->message);
-                g_error_free (error);
-        }
-
-        g_free (args[0]);
-}
-
-#ifdef BUILD_PRESENSE_STUFF
-static gboolean
-on_menu_key_press_event (GtkWidget     *widget,
-                         GdkEventKey   *event,
-                         GdmAppletData *adata)
-{
-        GtkWidget *entry;
-
-        entry = gdm_entry_menu_item_get_entry (GDM_ENTRY_MENU_ITEM (adata->user_item));
-
-        if (GTK_WIDGET_HAS_FOCUS (entry)) {
-                gtk_widget_event (entry, (GdkEvent *)event);
-                return TRUE;
-        } else {
-                return FALSE;
-        }
-}
-
-static void
-save_status (GdmAppletData *adata,
-             guint          status)
-{
-        if (adata->current_status != status) {
-                GError *error;
-
-                adata->current_status = status;
-
-                g_debug ("Saving status: %u", status);
-                error = NULL;
-                dbus_g_proxy_call (adata->presence_proxy,
-                                   "SetStatus",
-                                   &error,
-                                   G_TYPE_UINT, status,
-                                   G_TYPE_INVALID,
-                                   G_TYPE_INVALID);
-
-                if (error != NULL) {
-                        g_warning ("Couldn't save presence status: %s", error->message);
-                        g_error_free (error);
-                }
-        }
-}
-
-static void
-on_status_available_activate (GtkWidget     *widget,
-                              GdmAppletData *adata)
-{
-
-        if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) {
-                save_status (adata, GSM_PRESENCE_STATUS_AVAILABLE);
-        }
-}
-
-static void
-on_status_busy_activate (GtkWidget     *widget,
-                         GdmAppletData *adata)
-{
-         if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) {
-                 save_status (adata, GSM_PRESENCE_STATUS_BUSY);
-         }
-}
-
-static void
-on_status_invisible_activate (GtkWidget     *widget,
-                              GdmAppletData *adata)
-{
-         if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) {
-                 save_status (adata, GSM_PRESENCE_STATUS_INVISIBLE);
-         }
-}
-
-static struct {
-        char      *icon_name;
-        char      *display_name;
-        void      *menu_callback;
-        GtkWidget *widget;
-} statuses[] = {
-        { "user-online", N_("Available"), on_status_available_activate, NULL },
-        { "user-invisible", N_("Invisible"), on_status_invisible_activate, NULL },
-        { "user-busy", N_("Busy"), on_status_busy_activate, NULL },
-        { "user-away", N_("Away"), NULL, NULL },
-};
-#endif
-
-static void
-update_label (GdmAppletData *adata)
-{
-        GtkWidget *label;
-        char      *markup;
-
-        label = gtk_bin_get_child (GTK_BIN (adata->menuitem));
-
-#ifdef BUILD_PRESENSE_STUFF
-        markup = g_strdup_printf ("<b>%s</b> <small>(%s)</small>",
-                                  gdm_user_get_real_name (GDM_USER (adata->user)),
-                                  _(statuses[adata->current_status].display_name));
-#else
-        markup = g_strdup_printf ("<b>%s</b>",
-                                  gdm_user_get_real_name (GDM_USER (adata->user)));
-#endif
-        gtk_label_set_markup (GTK_LABEL (label), markup);
-        g_free (markup);
-}
-
-#ifdef BUILD_PRESENSE_STUFF
-static void
-save_status_text (GdmAppletData *adata)
-{
-        GtkWidget     *entry;
-        GtkTextBuffer *buffer;
-        char          *escaped_text;
-        char          *text;
-        GtkTextIter    start, end;
-
-        entry = gdm_entry_menu_item_get_entry (GDM_ENTRY_MENU_ITEM (adata->user_item));
-        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry));
-        gtk_text_buffer_get_bounds (buffer, &start, &end);
-        text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-        escaped_text = g_markup_escape_text (text, -1);
-
-        if (escaped_text != NULL) {
-                GError *error;
-
-                error = NULL;
-                dbus_g_proxy_call (adata->presence_proxy,
-                                   "SetStatusText",
-                                   &error,
-                                   G_TYPE_STRING, escaped_text,
-                                   G_TYPE_INVALID,
-                                   G_TYPE_INVALID);
-
-                if (error != NULL) {
-                        g_warning ("Couldn't set presence status text: %s", error->message);
-                        g_error_free (error);
-                }
-        }
-
-        g_free (text);
-        g_free (escaped_text);
-}
-
-static void
-on_user_item_deselect (GtkWidget     *item,
-                       GdmAppletData *adata)
-{
-        save_status_text (adata);
-}
-#endif
-
-static void
-create_sub_menu (GdmAppletData *adata)
-{
-        GtkWidget *item;
-#ifdef BUILD_PRESENSE_STUFF
-        int        i;
-        GSList    *radio_group;
-#endif
-
-        adata->menu = gtk_menu_new ();
-#ifdef BUILD_PRESENSE_STUFF
-        g_signal_connect (adata->menu,
-                          "key-press-event",
-                          G_CALLBACK (on_menu_key_press_event),
-                          adata);
-#endif
-        gtk_menu_item_set_submenu (GTK_MENU_ITEM (adata->menuitem), adata->menu);
-        g_signal_connect (adata->menu, "style-set",
-                          G_CALLBACK (menu_style_set_cb), adata);
-        g_signal_connect (adata->menu, "show",
-                          G_CALLBACK (menu_expose_cb), adata);
-
-#ifdef BUILD_PRESENSE_STUFF
-        adata->user_item = gdm_entry_menu_item_new ();
-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
-                               adata->user_item);
-        gtk_widget_show (adata->user_item);
-        g_signal_connect (adata->user_item, "activate",
-                          G_CALLBACK (on_user_item_activate), adata);
-        g_signal_connect (adata->user_item,
-                          "deselect",
-                          G_CALLBACK (on_user_item_deselect),
-                          adata);
-
-        item = gtk_separator_menu_item_new ();
-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), item);
-        gtk_widget_show (item);
-
-        radio_group = NULL;
-        for (i = 0; i < G_N_ELEMENTS (statuses); i++) {
-                GtkWidget *hbox;
-                GtkWidget *label;
-                GtkWidget *image;
-                GtkWidget *item;
-
-                if (statuses[i].menu_callback == NULL) {
-                        continue;
-                }
-
-                item = gtk_radio_menu_item_new (radio_group);
-                radio_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
-                hbox = gtk_hbox_new (FALSE, 3);
-                label = gtk_label_new (_(statuses[i].display_name));
-                gtk_label_set_justify (GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-                gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-                gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
-                gtk_widget_show (label);
-                image = gtk_image_new_from_icon_name (statuses[i].icon_name, GTK_ICON_SIZE_MENU);
-                gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0);
-                gtk_widget_show (image);
-                gtk_widget_show (hbox);
-                gtk_container_add (GTK_CONTAINER (item), hbox);
-
-                gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
-                                       item);
-                g_signal_connect (item, "activate",
-                                  G_CALLBACK (statuses[i].menu_callback), adata);
-                gtk_widget_show (item);
-
-                statuses[i].widget = item;
-        }
-
-        item = gtk_separator_menu_item_new ();
-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), item);
-        gtk_widget_show (item);
-#endif
-
-        adata->account_item = gtk_image_menu_item_new_with_label (_("Account Information"));
-        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->account_item),
-                                       gtk_image_new ());
-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
-                               adata->account_item);
-        g_signal_connect (adata->account_item, "style-set",
-                          G_CALLBACK (menuitem_style_set_cb), adata);
-        g_signal_connect (adata->account_item, "activate",
-                          G_CALLBACK (on_account_activate), adata);
-        gtk_widget_show (adata->account_item);
-
-
-        adata->control_panel_item = gtk_image_menu_item_new_with_label (_("System Preferences"));
-        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->control_panel_item),
-                                       gtk_image_new ());
-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
-                               adata->control_panel_item);
-        g_signal_connect (adata->control_panel_item, "style-set",
-                          G_CALLBACK (menuitem_style_set_cb), adata);
-        g_signal_connect (adata->control_panel_item, "activate",
-                          G_CALLBACK (on_control_panel_activate), adata);
-
-        item = gtk_separator_menu_item_new ();
-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), item);
-        gtk_widget_show (item);
-
-        adata->lock_screen_item = gtk_image_menu_item_new_with_label (_("Lock Screen"));
-        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->lock_screen_item),
-                                       gtk_image_new ());
-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
-                               adata->lock_screen_item);
-        g_signal_connect (adata->lock_screen_item, "style-set",
-                          G_CALLBACK (menuitem_style_set_cb), adata);
-        g_signal_connect (adata->lock_screen_item, "activate",
-                          G_CALLBACK (on_lock_screen_activate), adata);
-        /* Only show if not locked down */
-
-        adata->login_screen_item = gtk_image_menu_item_new_with_label (_("Switch User"));
-        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->login_screen_item),
-                                       gtk_image_new ());
-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
-                               adata->login_screen_item);
-        g_signal_connect (adata->login_screen_item, "style-set",
-                          G_CALLBACK (menuitem_style_set_cb), adata);
-        g_signal_connect (adata->login_screen_item, "activate",
-                          G_CALLBACK (on_login_screen_activate), adata);
-        /* Only show switch user if there are other users */
-
-        adata->quit_session_item = gtk_image_menu_item_new_with_label (_("Quit…"));
-        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->quit_session_item),
-                                       gtk_image_new ());
-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
-                               adata->quit_session_item);
-        g_signal_connect (adata->quit_session_item, "style-set",
-                          G_CALLBACK (menuitem_style_set_cb), adata);
-        g_signal_connect (adata->quit_session_item, "activate",
-                          G_CALLBACK (on_quit_session_activate), adata);
-        gtk_widget_show (adata->quit_session_item);
-        gtk_widget_show (adata->menu);
-}
-
-static void
-destroy_sub_menu (GdmAppletData *adata)
-{
-        gtk_menu_item_set_submenu (GTK_MENU_ITEM (adata->menuitem), NULL);
-}
-
-static void
-set_menu_visibility (GdmAppletData *adata,
-                     gboolean       visible)
-{
-
-        if (visible) {
-                create_sub_menu (adata);
-        } else {
-                destroy_sub_menu (adata);
-        }
-}
-
-static void
-client_notify_lockdown_func (GConfClient   *client,
-                             guint          cnxn_id,
-                             GConfEntry    *entry,
-                             GdmAppletData *adata)
-{
-        GConfValue *value;
-        const char *key;
-
-        value = gconf_entry_get_value (entry);
-        key = gconf_entry_get_key (entry);
-
-        if (value == NULL || key == NULL) {
-                return;
-        }
-
-        if (strcmp (key, LOCKDOWN_USER_SWITCHING_KEY) == 0) {
-                if (gconf_value_get_bool (value)) {
-                        set_menu_visibility (adata, FALSE);
-                } else {
-                        set_menu_visibility (adata, TRUE);
-                }
-        } else if (strcmp (key, LOCKDOWN_LOCK_SCREEN_KEY) == 0) {
-                if (gconf_value_get_bool (value)) {
-                        gtk_widget_hide (adata->lock_screen_item);
-                } else {
-                        gtk_widget_show (adata->lock_screen_item);
-                }
-        }
-}
-
-static void
-reset_icon (GdmAppletData *adata)
-{
-        GdkPixbuf *pixbuf;
-        GtkWidget *image;
-
-        if (adata->user == NULL || !gtk_widget_has_screen (GTK_WIDGET (adata->menuitem))) {
-                return;
-        }
-
-#ifdef BUILD_PRESENSE_STUFF
-        if (adata->user_item != NULL) {
-                image = gdm_entry_menu_item_get_image (GDM_ENTRY_MENU_ITEM (adata->user_item));
-                pixbuf = gdm_user_render_icon (adata->user, adata->panel_size * 3);
-                if (pixbuf == NULL) {
-                        return;
-                }
-
-                gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
-                g_object_unref (pixbuf);
-        }
-#else
-        pixbuf = gdm_user_render_icon (adata->user, adata->panel_size);
-
-        if (pixbuf == NULL) {
-                return;
-        }
-
-        image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (adata->menuitem));
-        gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
-        g_object_unref (pixbuf);
-#endif
-}
-
-static void
-setup_current_user_now (GdmAppletData *adata)
-{
-        g_assert (adata->user != NULL);
-
-        if (adata->user_loaded_notify_id != 0) {
-                g_signal_handler_disconnect (adata->user, adata->user_loaded_notify_id);
-        }
-        adata->user_loaded_notify_id = 0;
-
-        update_label (adata);
-        reset_icon (adata);
-        adata->user_changed_notify_id =
-            g_signal_connect (adata->user,
-                              "changed",
-                              G_CALLBACK (on_user_changed),
-                              adata);
-}
-
-static void
-on_current_user_loaded (GdmUser       *user,
-                        GParamSpec    *pspec,
-                        GdmAppletData *adata)
-{
-        if (!gdm_user_is_loaded (user)) {
-                return;
-        }
-
-        setup_current_user_now (adata);
-}
-
-static void
-setup_current_user (GdmAppletData *adata)
-{
-        adata->user = gdm_user_manager_get_user_by_uid (adata->manager, getuid ());
-
-        if (adata->user == NULL) {
-                g_warning ("Could not setup current user");
-                return;
-        }
-
-        g_object_ref (adata->user);
-
-        adata->menuitem = gtk_image_menu_item_new_with_label ("");
-#ifndef BUILD_PRESENSE_STUFF
-        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->menuitem),
-                                       gtk_image_new ());
-#endif
-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menubar), adata->menuitem);
-        gtk_widget_show (adata->menuitem);
-
-        if (gdm_user_is_loaded (adata->user)) {
-                setup_current_user_now (adata);
-                return;
-        }
-
-        adata->user_loaded_notify_id = g_signal_connect (adata->user,
-                                                         "notify::is-loaded",
-                                                         G_CALLBACK (on_current_user_loaded),
-                                                         adata);
-}
-
-#ifdef BUILD_PRESENSE_STUFF
-static void
-set_status (GdmAppletData *adata,
-            guint status)
-{
-        int i;
-
-        g_debug ("Setting current status: %u", status);
-        adata->current_status = status;
-        for (i = 0; i < G_N_ELEMENTS (statuses); i++) {
-                if (statuses[i].widget == NULL) {
-                        continue;
-                }
-                if (i == status) {
-                        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (statuses[i].widget),
-                                                        TRUE);
-                }
-        }
-
-        update_label (adata);
-}
-
-static void
-on_presence_status_changed (DBusGProxy    *presence_proxy,
-                            guint          status,
-                            GdmAppletData *adata)
-{
-        g_debug ("Status changed: %u", status);
-
-        set_status (adata, status);
-}
-
-static void
-set_status_text (GdmAppletData *adata,
-                 const char    *status_text)
-{
-        GtkWidget     *entry;
-        GtkTextBuffer *buffer;
-
-        g_debug ("Status text changed: %s", status_text);
-
-        entry = gdm_entry_menu_item_get_entry (GDM_ENTRY_MENU_ITEM (adata->user_item));
-        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry));
-        gtk_text_buffer_set_text (buffer, status_text, -1);
-}
-
-static void
-on_presence_status_text_changed (DBusGProxy    *presence_proxy,
-                                 const char    *status_text,
-                                 GdmAppletData *adata)
-{
-        set_status_text (adata, status_text);
-}
-#endif
-
-static gboolean
-fill_applet (PanelApplet *applet)
-{
-        static const BonoboUIVerb menu_verbs[] = {
-                BONOBO_UI_VERB ("GdmAboutMe", about_me_cb),
-                BONOBO_UI_VERB ("GdmUsersGroupsAdmin", admin_cb),
-                BONOBO_UI_VERB ("GdmAbout", about_cb),
-                BONOBO_UI_VERB_END
-        };
-        static gboolean    first_time = FALSE;
-        char              *tmp;
-        BonoboUIComponent *popup_component;
-        GdmAppletData     *adata;
-        GError            *error;
-        DBusGConnection   *bus;
-
-        if (!first_time) {
-                first_time = TRUE;
-
-                /* Do this here so it's only done once. */
-                gtk_rc_parse_string ("style \"gdm-user-switch-menubar-style\"\n"
-                                     "{\n"
-                                     "GtkMenuBar::shadow-type = none\n"
-                                     "GtkMenuBar::internal-padding = 0\n"
-                                     "}\n"
-                                     "style \"gdm-user-switch-applet-style\"\n"
-                                     "{\n"
-                                     "GtkWidget::focus-line-width = 0\n"
-                                     "GtkWidget::focus-padding = 0\n"
-                                     "}\n"
-                                     "widget \"*.gdm-user-switch-menubar\" style \"gdm-user-switch-menubar-style\"\n"
-                                     "widget \"*.gdm-user-switch-applet\" style \"gdm-user-switch-applet-style\"\n");
-                gtk_window_set_default_icon_name ("stock_people");
-                g_set_application_name (_("User Switch Applet"));
-
-                if (! gdm_settings_client_init (DATADIR "/gdm/gdm.schemas", "/")) {
-                        g_critical ("Unable to initialize settings client");
-                        exit (1);
-                }
-
-        }
-
-        adata = g_new0 (GdmAppletData, 1);
-        adata->applet = applet;
-        adata->panel_size = 24;
-
-        adata->client = gconf_client_get_default ();
-
-        gtk_widget_set_tooltip_text (GTK_WIDGET (applet), _("Change account settings and status"));
-        gtk_container_set_border_width (GTK_CONTAINER (applet), 0);
-        gtk_widget_set_name (GTK_WIDGET (applet), "gdm-user-switch-applet");
-        panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
-        panel_applet_setup_menu_from_file (applet, NULL,
-                                           DATADIR "/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml",
-                                           NULL, menu_verbs, adata);
-
-        popup_component = panel_applet_get_popup_component (applet);
-
-        /* Hide the admin context menu items if locked down or no cmd-line */
-        if (gconf_client_get_bool (adata->client,
-                                   LOCKDOWN_COMMAND_LINE_KEY,
-                                   NULL) ||
-            panel_applet_get_locked_down (applet)) {
-                bonobo_ui_component_set_prop (popup_component,
-                                              "/popups/button3/GdmSeparator",
-                                              "hidden", "1", NULL);
-                bonobo_ui_component_set_prop (popup_component,
-                                              "/commands/GdmUsersGroupsAdmin",
-                                              "hidden", "1", NULL);
-        } else {
-#ifndef USERS_ADMIN
-#  ifdef GDM_SETUP
-                bonobo_ui_component_set_prop (popup_component,
-                                              "/popups/button3/GdmSeparator",
-                                              "hidden", "1",
-                                              NULL);
-#  endif /* !GDM_SETUP */
-                bonobo_ui_component_set_prop (popup_component,
-                                              "/commands/GdmUsersGroupsAdmin",
-                                              "hidden", "1",
-                                              NULL);
-#endif /* !USERS_ADMIN */
-        }
-
-        /* Hide the gdmphotosetup item if it can't be found in the path. */
-        tmp = g_find_program_in_path ("gnome-about-me");
-        if (!tmp) {
-                bonobo_ui_component_set_prop (popup_component,
-                                              "/commands/GdmAboutMe",
-                                              "hidden", "1",
-                                              NULL);
-        } else {
-                g_free (tmp);
-        }
-
-        g_signal_connect (adata->applet,
-                          "style-set",
-                          G_CALLBACK (applet_style_set_cb), adata);
-        g_signal_connect (applet,
-                          "change-background",
-                          G_CALLBACK (applet_change_background_cb), adata);
-        g_signal_connect (applet,
-                          "size-allocate",
-                          G_CALLBACK (applet_size_allocate_cb), adata);
-        g_signal_connect (applet,
-                          "key-press-event",
-                          G_CALLBACK (applet_key_press_event_cb), adata);
-        g_signal_connect_after (applet,
-                                "focus-in-event",
-                                G_CALLBACK (gtk_widget_queue_draw), NULL);
-        g_signal_connect_after (applet,
-                                "focus-out-event",
-                                G_CALLBACK (gtk_widget_queue_draw), NULL);
-        g_object_set_data_full (G_OBJECT (applet),
-                                "gdm-applet-data",
-                                adata,
-                                (GDestroyNotify) gdm_applet_data_free);
-
-        adata->menubar = gtk_menu_bar_new ();
-        gtk_widget_set_name (adata->menubar, "gdm-user-switch-menubar");
-        gtk_widget_set_can_focus (adata->menubar, TRUE);
-        g_signal_connect (adata->menubar, "button-press-event",
-                          G_CALLBACK (menubar_button_press_event_cb), adata);
-        g_signal_connect_after (adata->menubar, "expose-event",
-                                G_CALLBACK (menubar_expose_event_cb), adata);
-        gtk_container_add (GTK_CONTAINER (applet), adata->menubar);
-        gtk_widget_show (adata->menubar);
-
-        adata->manager = gdm_user_manager_ref_default ();
-        g_object_set (adata->manager, "include-all", TRUE, NULL);
-        g_signal_connect (adata->manager,
-                          "notify::is-loaded",
-                          G_CALLBACK (on_manager_is_loaded_changed),
-                          adata);
-        g_signal_connect (adata->manager,
-                          "notify::has-multiple-users",
-                          G_CALLBACK (on_manager_has_multiple_users_changed),
-                          adata);
-
-        gdm_user_manager_queue_load (adata->manager);
-        setup_current_user (adata);
-
-        gconf_client_add_dir (adata->client,
-                              LOCKDOWN_DIR,
-                              GCONF_CLIENT_PRELOAD_ONELEVEL,
-                              NULL);
-
-        adata->client_notify_lockdown_id = gconf_client_notify_add (adata->client,
-                                                                    LOCKDOWN_DIR,
-                                                                    (GConfClientNotifyFunc)client_notify_lockdown_func,
-                                                                    adata,
-                                                                    NULL,
-                                                                    NULL);
-
-        if (gconf_client_get_bool (adata->client, LOCKDOWN_USER_SWITCHING_KEY, NULL)) {
-                set_menu_visibility (adata, FALSE);
-        } else {
-                set_menu_visibility (adata, TRUE);
-        }
-        if (gconf_client_get_bool (adata->client, LOCKDOWN_LOCK_SCREEN_KEY, NULL)) {
-                        gtk_widget_hide (adata->lock_screen_item);
-        } else {
-                        gtk_widget_show (adata->lock_screen_item);
-        }
-
-        error = NULL;
-        bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-        if (bus == NULL) {
-                g_warning ("Unable to get session bus: %s", error->message);
-                g_error_free (error);
-                goto done;
-        }
-
-#ifdef BUILD_PRESENSE_STUFF
-        adata->presence_proxy = dbus_g_proxy_new_for_name (bus,
-                                                          "org.gnome.SessionManager",
-                                                          "/org/gnome/SessionManager/Presence",
-                                                          "org.gnome.SessionManager.Presence");
-        if (adata->presence_proxy != NULL) {
-                DBusGProxy *proxy;
-
-                dbus_g_proxy_add_signal (adata->presence_proxy,
-                                         "StatusChanged",
-                                         G_TYPE_UINT,
-                                         G_TYPE_INVALID);
-                dbus_g_proxy_connect_signal (adata->presence_proxy,
-                                             "StatusChanged",
-                                             G_CALLBACK (on_presence_status_changed),
-                                             adata,
-                                             NULL);
-                dbus_g_proxy_add_signal (adata->presence_proxy,
-                                         "StatusTextChanged",
-                                         G_TYPE_STRING,
-                                         G_TYPE_INVALID);
-                dbus_g_proxy_connect_signal (adata->presence_proxy,
-                                             "StatusTextChanged",
-                                             G_CALLBACK (on_presence_status_text_changed),
-                                             adata,
-                                             NULL);
-
-
-                proxy = dbus_g_proxy_new_from_proxy (adata->presence_proxy,
-                                                     "org.freedesktop.DBus.Properties",
-                                                     "/org/gnome/SessionManager/Presence");
-                if (proxy != NULL) {
-                        guint       status;
-                        const char *status_text;
-                        GValue      value = { 0, };
-
-                        status = 0;
-                        status_text = NULL;
-
-                        error = NULL;
-                        dbus_g_proxy_call (proxy,
-                                           "Get",
-                                           &error,
-                                           G_TYPE_STRING, "org.gnome.SessionManager.Presence",
-                                           G_TYPE_STRING, "status",
-                                           G_TYPE_INVALID,
-                                           G_TYPE_VALUE, &value,
-                                           G_TYPE_INVALID);
-
-                        if (error != NULL) {
-                                g_warning ("Couldn't get presence status: %s", error->message);
-                                g_error_free (error);
-                        } else {
-                                status = g_value_get_uint (&value);
-                        }
-
-                        g_value_unset (&value);
-
-                        error = NULL;
-                        dbus_g_proxy_call (proxy,
-                                           "Get",
-                                           &error,
-                                           G_TYPE_STRING, "org.gnome.SessionManager.Presence",
-                                           G_TYPE_STRING, "status-text",
-                                           G_TYPE_INVALID,
-                                           G_TYPE_VALUE, &value,
-                                           G_TYPE_INVALID);
-
-                        if (error != NULL) {
-                                g_warning ("Couldn't get presence status text: %s", error->message);
-                                g_error_free (error);
-                        } else {
-                                status_text = g_value_get_string (&value);
-                        }
-
-                        set_status (adata, status);
-                        set_status_text (adata, status_text);
-                }
-        } else {
-                g_warning ("Failed to get session presence proxy");
-        }
-#endif
-
- done:
-        gtk_widget_show (GTK_WIDGET (adata->applet));
-
-        return TRUE;
-}
-
-static gboolean
-applet_factory (PanelApplet   *applet,
-                const char    *iid,
-                gpointer       data)
-{
-        gboolean ret;
-        ret = FALSE;
-        if (strcmp (iid, "OAFIID:GNOME_FastUserSwitchApplet") == 0) {
-                ret = fill_applet (applet);
-        }
-        return ret;
-}
diff --git a/gui/user-switch-applet/gdm-entry-menu-item.c b/gui/user-switch-applet/gdm-entry-menu-item.c
deleted file mode 100644
index d657e7a..0000000
--- a/gui/user-switch-applet/gdm-entry-menu-item.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "config.h"
-
-#include <unistd.h>
-#include <sys/types.h>
-
-#include <string.h>
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include "gdm-entry-menu-item.h"
-
-/* same as twitter */
-#define TEXT_BUFFER_MAX_CHARS 64
-
-enum
-{
-        PROP_0,
-};
-
-struct _GdmEntryMenuItem
-{
-        GtkMenuItem      parent;
-
-        GtkWidget       *hbox;
-        GtkWidget       *image;
-        GtkWidget       *entry;
-};
-
-struct _GdmEntryMenuItemClass
-{
-        GtkMenuItemClass parent_class;
-};
-
-G_DEFINE_TYPE (GdmEntryMenuItem, gdm_entry_menu_item, GTK_TYPE_MENU_ITEM)
-
-static void
-gdm_entry_menu_item_set_property (GObject      *object,
-                                  guint         param_id,
-                                  const GValue *value,
-                                  GParamSpec   *pspec)
-{
-        GdmEntryMenuItem *item;
-
-        item = GDM_ENTRY_MENU_ITEM (object);
-
-        switch (param_id) {
-        default:
-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-                break;
-        }
-}
-
-static void
-gdm_entry_menu_item_get_property (GObject    *object,
-                                  guint       param_id,
-                                  GValue     *value,
-                                  GParamSpec *pspec)
-{
-        GdmEntryMenuItem *item;
-
-        item = GDM_ENTRY_MENU_ITEM (object);
-
-        switch (param_id) {
-        default:
-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-                break;
-        }
-}
-
-static void
-gdm_entry_menu_item_dispose (GObject *object)
-{
-
-        (*G_OBJECT_CLASS (gdm_entry_menu_item_parent_class)->dispose) (object);
-}
-
-static gboolean
-gdm_entry_menu_item_button_release (GtkWidget      *widget,
-                                    GdkEventButton *event)
-{
-        return TRUE;
-}
-
-/* Cut and paste from gtkwindow.c */
-static void
-send_focus_change (GtkWidget *widget,
-                   gboolean   in)
-{
-        GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE);
-
-        g_object_ref (widget);
-
-        gtk_widget_set_can_focus (widget, in);
-
-        fevent->focus_change.type = GDK_FOCUS_CHANGE;
-        fevent->focus_change.window = g_object_ref (gtk_widget_get_window (widget));
-        fevent->focus_change.in = in;
-
-        gtk_widget_event (widget, fevent);
-
-        g_object_notify (G_OBJECT (widget), "has-focus");
-
-        g_object_unref (widget);
-        gdk_event_free (fevent);
-}
-
-static gboolean
-gdm_entry_menu_item_button_press (GtkWidget      *widget,
-                                  GdkEventButton *event)
-{
-        GtkWidget *entry;
-
-        entry = GDM_ENTRY_MENU_ITEM (widget)->entry;
-
-        if (gtk_widget_get_window (entry) != NULL) {
-                gdk_window_raise (gtk_widget_get_window (entry));
-        }
-
-        if (!gtk_widget_has_focus (entry)) {
-                gtk_widget_grab_focus (entry);
-        }
-
-        return FALSE;
-}
-
-static void
-gdm_entry_menu_item_realize (GtkWidget *widget)
-{
-        if (GTK_WIDGET_CLASS (gdm_entry_menu_item_parent_class)->realize) {
-                GTK_WIDGET_CLASS (gdm_entry_menu_item_parent_class)->realize (widget);
-        }
-}
-
-static void
-gdm_entry_menu_item_select (GtkItem *item)
-{
-        g_return_if_fail (GDM_IS_ENTRY_MENU_ITEM (item));
-        send_focus_change (GTK_WIDGET (GDM_ENTRY_MENU_ITEM (item)->entry), TRUE);
-}
-
-static void
-gdm_entry_menu_item_deselect (GtkItem *item)
-{
-        g_return_if_fail (GDM_IS_ENTRY_MENU_ITEM (item));
-
-        send_focus_change (GTK_WIDGET (GDM_ENTRY_MENU_ITEM (item)->entry), FALSE);
-}
-
-static void
-gdm_entry_menu_item_class_init (GdmEntryMenuItemClass *klass)
-{
-        GObjectClass     *gobject_class;
-        GtkWidgetClass   *widget_class;
-        GtkMenuItemClass *menu_item_class;
-        GtkItemClass     *item_class;
-
-        gobject_class = G_OBJECT_CLASS (klass);
-        widget_class = GTK_WIDGET_CLASS (klass);
-        menu_item_class = GTK_MENU_ITEM_CLASS (klass);
-        item_class = GTK_ITEM_CLASS (klass);
-
-        gobject_class->set_property = gdm_entry_menu_item_set_property;
-        gobject_class->get_property = gdm_entry_menu_item_get_property;
-        gobject_class->dispose = gdm_entry_menu_item_dispose;
-
-        widget_class->button_release_event = gdm_entry_menu_item_button_release;
-        widget_class->button_press_event = gdm_entry_menu_item_button_press;
-        widget_class->realize = gdm_entry_menu_item_realize;
-
-        item_class->select = gdm_entry_menu_item_select;
-        item_class->deselect = gdm_entry_menu_item_deselect;
-
-        menu_item_class->hide_on_activate = FALSE;
-}
-
-static void
-on_entry_show (GtkWidget        *widget,
-               GdmEntryMenuItem *item)
-{
-        if (gtk_widget_get_window (widget) != NULL) {
-                gdk_window_raise (gtk_widget_get_window (widget));
-        }
-        send_focus_change (widget, TRUE);
-}
-
-static void
-on_text_buffer_changed (GtkTextBuffer    *buffer,
-                        GdmEntryMenuItem *item)
-{
-        int len;
-
-        len = gtk_text_buffer_get_char_count (buffer);
-        if (len > TEXT_BUFFER_MAX_CHARS) {
-                gdk_window_beep (gtk_widget_get_window (GTK_WIDGET (item)));
-        }
-}
-
-static void
-on_entry_move_focus (GtkWidget        *widget,
-                     GtkDirectionType  direction,
-                     GdmEntryMenuItem *item)
-{
-        g_debug ("focus move");
-        send_focus_change (GTK_WIDGET (GDM_ENTRY_MENU_ITEM (item)->entry), FALSE);
-        g_signal_emit_by_name (item,
-                               "move-focus",
-                               GTK_DIR_TAB_FORWARD);
-}
-
-static void
-gdm_entry_menu_item_init (GdmEntryMenuItem *item)
-{
-        PangoFontDescription *fontdesc;
-        PangoFontMetrics     *metrics;
-        PangoContext         *context;
-        PangoLanguage        *lang;
-        int                   ascent;
-        GtkTextBuffer        *buffer;
-
-        item->hbox = gtk_hbox_new (FALSE, 6);
-        gtk_container_add (GTK_CONTAINER (item), item->hbox);
-
-        item->image = gtk_image_new ();
-        gtk_box_pack_start (GTK_BOX (item->hbox), item->image, FALSE, FALSE, 0);
-
-        item->entry = gtk_text_view_new ();
-        gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (item->entry), FALSE);
-        gtk_text_view_set_editable (GTK_TEXT_VIEW (item->entry), TRUE);
-        gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (item->entry),
-                                     GTK_WRAP_WORD);
-        g_signal_connect (item->entry,
-                          "show",
-                          G_CALLBACK (on_entry_show),
-                          item);
-        g_signal_connect (item->entry,
-                          "move-focus",
-                          G_CALLBACK (on_entry_move_focus),
-                          item);
-
-        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (item->entry));
-        g_signal_connect (buffer,
-                          "changed",
-                          G_CALLBACK (on_text_buffer_changed),
-                          item);
-
-        /* get the font ascent for the current font and language */
-        context = gtk_widget_get_pango_context (item->entry);
-        fontdesc = pango_context_get_font_description (context);
-        lang = pango_context_get_language (context);
-        metrics = pango_context_get_metrics (context, fontdesc, lang);
-        ascent = pango_font_metrics_get_ascent (metrics) * 1.5 / PANGO_SCALE;
-        pango_font_metrics_unref (metrics);
-
-        /* size our progress bar to be five ascents long */
-        gtk_widget_set_size_request (item->entry, ascent * 5, -1);
-
-        gtk_box_pack_start (GTK_BOX (item->hbox), item->entry, TRUE, TRUE, 0);
-
-        gtk_widget_show (item->hbox);
-        gtk_widget_show (item->image);
-        gtk_widget_show (item->entry);
-}
-
-GtkWidget *
-gdm_entry_menu_item_new (void)
-{
-        return g_object_new (GDM_TYPE_ENTRY_MENU_ITEM, NULL);
-}
-
-GtkWidget *
-gdm_entry_menu_item_get_entry (GdmEntryMenuItem *item)
-{
-        g_return_val_if_fail (GDM_IS_ENTRY_MENU_ITEM (item), NULL);
-
-        return item->entry;
-}
-
-GtkWidget *
-gdm_entry_menu_item_get_image (GdmEntryMenuItem *item)
-{
-        g_return_val_if_fail (GDM_IS_ENTRY_MENU_ITEM (item), NULL);
-
-        return item->image;
-}
diff --git a/gui/user-switch-applet/gdm-entry-menu-item.h b/gui/user-switch-applet/gdm-entry-menu-item.h
deleted file mode 100644
index 3031609..0000000
--- a/gui/user-switch-applet/gdm-entry-menu-item.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __GDM_ENTRY_MENU_ITEM__
-#define __GDM_ENTRY_MENU_ITEM__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GDM_TYPE_ENTRY_MENU_ITEM \
-  (gdm_entry_menu_item_get_type ())
-#define GDM_ENTRY_MENU_ITEM(object) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((object), GDM_TYPE_ENTRY_MENU_ITEM, GdmEntryMenuItem))
-#define GDM_ENTRY_MENU_ITEM_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GDM_TYPE_ENTRY_MENU_ITEM, GdmEntryMenuItemClass))
-#define GDM_IS_ENTRY_MENU_ITEM(object) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDM_TYPE_ENTRY_MENU_ITEM))
-#define GDM_IS_ENTRY_MENU_ITEM_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GDM_TYPE_ENTRY_MENU_ITEM))
-#define GDM_ENTRY_MENU_ITEM_GET_CLASS(object) \
-  (G_TYPE_INSTANCE_GET_CLASS ((object), GDM_TYPE_ENTRY_MENU_ITEM, GdmEntryMenuItemClass))
-
-typedef struct _GdmEntryMenuItem GdmEntryMenuItem;
-typedef struct _GdmEntryMenuItemClass GdmEntryMenuItemClass;
-
-GType      gdm_entry_menu_item_get_type      (void) G_GNUC_CONST;
-
-GtkWidget *gdm_entry_menu_item_new           (void);
-GtkWidget *gdm_entry_menu_item_get_entry     (GdmEntryMenuItem *item);
-GtkWidget *gdm_entry_menu_item_get_image     (GdmEntryMenuItem *item);
-
-G_END_DECLS
-
-#endif /* __GDM_ENTRY_MENU_ITEM__ */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1fccb90..cc1a3fd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -84,10 +84,6 @@ gui/simple-greeter/gdm-timer.c
 gui/simple-greeter/gdm-user.c
 gui/simple-greeter/gdm-user-chooser-widget.c
 gui/simple-greeter/greeter-main.c
-gui/user-switch-applet/applet.c
-gui/user-switch-applet/gdm-entry-menu-item.c
-gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
-gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
 utils/gdmflexiserver.c
 utils/gdm-screenshot.c
 
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 0269a0f..ee3d753 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -7,7 +7,6 @@
 # remove these unless you fix "make distcheck" a different way.
 #
 data/gdm.schemas.in
-gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in
 data/greeter-autostart/at-spi-registryd-wrapper.desktop.in
 data/greeter-autostart/gdm-simple-greeter.desktop.in
 data/greeter-autostart/gnome-power-manager.desktop.in
-- 
1.6.6.1