GNOME.org
 

[gnome-panel] modules: remove unneeded subdir

commit cabbd895f1e99fd68541c6311b29448b8db72b54
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Jul 31 12:44:57 2017 +0300

    modules: remove unneeded subdir

 configure.ac                                       |   13 ++---
 modules/Makefile.am                                |    6 ++-
 modules/{external => }/clock/Makefile.am           |    0
 modules/{external => }/clock/calendar-client.c     |    0
 modules/{external => }/clock/calendar-client.h     |    0
 modules/{external => }/clock/calendar-debug.h      |    0
 modules/{external => }/clock/calendar-sources.c    |    0
 modules/{external => }/clock/calendar-sources.h    |    0
 modules/{external => }/clock/calendar-window.c     |    0
 modules/{external => }/clock/calendar-window.h     |    0
 modules/{external => }/clock/clock-applet.c        |    0
 modules/{external => }/clock/clock-applet.h        |    0
 modules/{external => }/clock/clock-face.c          |    0
 modules/{external => }/clock/clock-face.h          |    0
 modules/{external => }/clock/clock-location-tile.c |    0
 modules/{external => }/clock/clock-location-tile.h |    0
 modules/{external => }/clock/clock-location.c      |    0
 modules/{external => }/clock/clock-location.h      |    0
 modules/{external => }/clock/clock-map.c           |    0
 modules/{external => }/clock/clock-map.h           |    0
 modules/{external => }/clock/clock-menu.ui         |    0
 modules/{external => }/clock/clock-module.c        |    0
 modules/{external => }/clock/clock-sunpos.c        |    0
 modules/{external => }/clock/clock-sunpos.h        |    0
 modules/{external => }/clock/clock-utils.c         |    0
 modules/{external => }/clock/clock-utils.h         |    0
 modules/{external => }/clock/clock.gresource.xml   |    0
 modules/{external => }/clock/clock.ui              |    0
 modules/{external => }/clock/pixmaps/Makefile.am   |    0
 .../clock/pixmaps/clock-face-large.svg             |    0
 .../clock/pixmaps/clock-face-small-day.svg         |    0
 .../clock/pixmaps/clock-face-small-evening.svg     |    0
 .../clock/pixmaps/clock-face-small-morning.svg     |    0
 .../clock/pixmaps/clock-face-small-night.svg       |    0
 .../clock/pixmaps/clock-face-small.svg             |    0
 .../clock/pixmaps/clock-map-location-current.png   |  Bin 379 -> 379 bytes
 .../clock/pixmaps/clock-map-location-hilight.png   |  Bin 346 -> 346 bytes
 .../clock/pixmaps/clock-map-location-marker.png    |  Bin 283 -> 283 bytes
 .../clock/pixmaps/clock-map-location-marker.svg    |    0
 modules/{external => }/clock/pixmaps/clock-map.png |  Bin 25244 -> 25244 bytes
 modules/{external => }/clock/pixmaps/clock-map.svg |    0
 modules/{external => }/clock/set-timezone.c        |    0
 modules/{external => }/clock/set-timezone.h        |    0
 modules/{external => }/clock/system-timezone.c     |    0
 modules/{external => }/clock/system-timezone.h     |    0
 modules/external/Makefile.am                       |   11 ----
 modules/{external => }/fish/Makefile.am            |    0
 modules/{external => }/fish/fish-applet.c          |    0
 modules/{external => }/fish/fish-applet.h          |    0
 modules/{external => }/fish/fish-menu.ui           |    0
 modules/{external => }/fish/fish-module.c          |    0
 modules/{external => }/fish/fish.gresource.xml     |    0
 modules/{external => }/fish/fish.ui                |    0
 modules/{external => }/fish/fishanim.fish          |    0
 modules/{external => }/fish/fishanim.png           |  Bin 4859 -> 4859 bytes
 modules/{external => }/fish/footguy.fish           |    0
 modules/{external => }/fish/footguy.png            |  Bin 176 -> 176 bytes
 modules/{external => }/fish/monkey.fish            |    0
 modules/{external => }/fish/monkey.png             |  Bin 5063 -> 5063 bytes
 modules/{external => }/fish/oldwanda.fish          |    0
 modules/{external => }/fish/oldwanda.png           |  Bin 12996 -> 12996 bytes
 modules/{external => }/fish/wanda.fish             |    0
 modules/{external => }/fish/wanda.png              |  Bin 13683 -> 13683 bytes
 modules/{external => }/fish/wanda.svg              |    0
 .../{external => }/notification-area/Makefile.am   |    0
 .../{external => }/notification-area/fixedtip.c    |    0
 .../{external => }/notification-area/fixedtip.h    |    0
 .../{external => }/notification-area/na-applet.c   |    0
 .../{external => }/notification-area/na-applet.h   |    0
 .../{external => }/notification-area/na-module.c   |    0
 .../notification-area/na-tray-child.c              |    0
 .../notification-area/na-tray-child.h              |    0
 .../notification-area/na-tray-manager.c            |    0
 .../notification-area/na-tray-manager.h            |    0
 modules/{external => }/notification-area/na-tray.c |    0
 modules/{external => }/notification-area/na-tray.h |    0
 modules/{external => }/status-notifier/Makefile.am |    0
 .../status-notifier/com.canonical.dbusmenu.xml     |    0
 .../status-notifier/org.kde.StatusNotifierHost.xml |    0
 .../status-notifier/org.kde.StatusNotifierItem.xml |    0
 .../org.kde.StatusNotifierWatcher.xml              |    0
 modules/{external => }/status-notifier/sn-applet.c |    0
 modules/{external => }/status-notifier/sn-applet.h |    0
 .../status-notifier/sn-dbus-menu-item.c            |    0
 .../status-notifier/sn-dbus-menu-item.h            |    0
 .../{external => }/status-notifier/sn-dbus-menu.c  |    0
 .../{external => }/status-notifier/sn-dbus-menu.h  |    0
 .../{external => }/status-notifier/sn-host-v0.c    |    0
 .../{external => }/status-notifier/sn-host-v0.h    |    0
 modules/{external => }/status-notifier/sn-host.c   |    0
 modules/{external => }/status-notifier/sn-host.h   |    0
 .../status-notifier/sn-image-menu-item.c           |    0
 .../status-notifier/sn-image-menu-item.h           |    0
 .../{external => }/status-notifier/sn-item-v0.c    |    0
 .../{external => }/status-notifier/sn-item-v0.h    |    0
 modules/{external => }/status-notifier/sn-item.c   |    0
 modules/{external => }/status-notifier/sn-item.h   |    0
 modules/{external => }/status-notifier/sn-module.c |    0
 modules/{external => }/wncklet/Makefile.am         |    0
 modules/{external => }/wncklet/showdesktop.c       |    0
 modules/{external => }/wncklet/showdesktop.h       |    0
 modules/{external => }/wncklet/window-list-menu.ui |    0
 modules/{external => }/wncklet/window-list.c       |    0
 modules/{external => }/wncklet/window-list.h       |    0
 modules/{external => }/wncklet/window-list.ui      |    0
 modules/{external => }/wncklet/window-menu.c       |    0
 modules/{external => }/wncklet/window-menu.h       |    0
 modules/{external => }/wncklet/wncklet-module.c    |    0
 modules/{external => }/wncklet/wncklet.c           |    0
 .../{external => }/wncklet/wncklet.gresource.xml   |    0
 modules/{external => }/wncklet/wncklet.h           |    0
 .../wncklet/workspace-switcher-menu.ui             |    0
 .../{external => }/wncklet/workspace-switcher.c    |    0
 .../{external => }/wncklet/workspace-switcher.h    |    0
 .../{external => }/wncklet/workspace-switcher.ui   |    0
 po/POTFILES.in                                     |   54 ++++++++++----------
 116 files changed, 38 insertions(+), 46 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 45ce086..f2931ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,14 +279,13 @@ AC_CONFIG_FILES([
   man/Makefile
 
   modules/Makefile
-  modules/external/Makefile
-  modules/external/clock/Makefile
-  modules/external/clock/pixmaps/Makefile
-  modules/external/fish/Makefile
-  modules/external/notification-area/Makefile
-  modules/external/status-notifier/Makefile
-  modules/external/wncklet/Makefile
+  modules/clock/Makefile
+  modules/clock/pixmaps/Makefile
+  modules/fish/Makefile
+  modules/notification-area/Makefile
   modules/separator/Makefile
+  modules/status-notifier/Makefile
+  modules/wncklet/Makefile
 
   po/Makefile.in
 ])
diff --git a/modules/Makefile.am b/modules/Makefile.am
index ceec5ae..0b9b43d 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,8 +1,12 @@
 NULL =
 
 SUBDIRS = \
-       external \
+       clock \
+       fish \
+       notification-area \
        separator \
+       status-notifier \
+       wncklet \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/external/clock/Makefile.am b/modules/clock/Makefile.am
similarity index 100%
rename from modules/external/clock/Makefile.am
rename to modules/clock/Makefile.am
diff --git a/modules/external/clock/calendar-client.c b/modules/clock/calendar-client.c
similarity index 100%
rename from modules/external/clock/calendar-client.c
rename to modules/clock/calendar-client.c
diff --git a/modules/external/clock/calendar-client.h b/modules/clock/calendar-client.h
similarity index 100%
rename from modules/external/clock/calendar-client.h
rename to modules/clock/calendar-client.h
diff --git a/modules/external/clock/calendar-debug.h b/modules/clock/calendar-debug.h
similarity index 100%
rename from modules/external/clock/calendar-debug.h
rename to modules/clock/calendar-debug.h
diff --git a/modules/external/clock/calendar-sources.c b/modules/clock/calendar-sources.c
similarity index 100%
rename from modules/external/clock/calendar-sources.c
rename to modules/clock/calendar-sources.c
diff --git a/modules/external/clock/calendar-sources.h b/modules/clock/calendar-sources.h
similarity index 100%
rename from modules/external/clock/calendar-sources.h
rename to modules/clock/calendar-sources.h
diff --git a/modules/external/clock/calendar-window.c b/modules/clock/calendar-window.c
similarity index 100%
rename from modules/external/clock/calendar-window.c
rename to modules/clock/calendar-window.c
diff --git a/modules/external/clock/calendar-window.h b/modules/clock/calendar-window.h
similarity index 100%
rename from modules/external/clock/calendar-window.h
rename to modules/clock/calendar-window.h
diff --git a/modules/external/clock/clock-applet.c b/modules/clock/clock-applet.c
similarity index 100%
rename from modules/external/clock/clock-applet.c
rename to modules/clock/clock-applet.c
diff --git a/modules/external/clock/clock-applet.h b/modules/clock/clock-applet.h
similarity index 100%
rename from modules/external/clock/clock-applet.h
rename to modules/clock/clock-applet.h
diff --git a/modules/external/clock/clock-face.c b/modules/clock/clock-face.c
similarity index 100%
rename from modules/external/clock/clock-face.c
rename to modules/clock/clock-face.c
diff --git a/modules/external/clock/clock-face.h b/modules/clock/clock-face.h
similarity index 100%
rename from modules/external/clock/clock-face.h
rename to modules/clock/clock-face.h
diff --git a/modules/external/clock/clock-location-tile.c b/modules/clock/clock-location-tile.c
similarity index 100%
rename from modules/external/clock/clock-location-tile.c
rename to modules/clock/clock-location-tile.c
diff --git a/modules/external/clock/clock-location-tile.h b/modules/clock/clock-location-tile.h
similarity index 100%
rename from modules/external/clock/clock-location-tile.h
rename to modules/clock/clock-location-tile.h
diff --git a/modules/external/clock/clock-location.c b/modules/clock/clock-location.c
similarity index 100%
rename from modules/external/clock/clock-location.c
rename to modules/clock/clock-location.c
diff --git a/modules/external/clock/clock-location.h b/modules/clock/clock-location.h
similarity index 100%
rename from modules/external/clock/clock-location.h
rename to modules/clock/clock-location.h
diff --git a/modules/external/clock/clock-map.c b/modules/clock/clock-map.c
similarity index 100%
rename from modules/external/clock/clock-map.c
rename to modules/clock/clock-map.c
diff --git a/modules/external/clock/clock-map.h b/modules/clock/clock-map.h
similarity index 100%
rename from modules/external/clock/clock-map.h
rename to modules/clock/clock-map.h
diff --git a/modules/external/clock/clock-menu.ui b/modules/clock/clock-menu.ui
similarity index 100%
rename from modules/external/clock/clock-menu.ui
rename to modules/clock/clock-menu.ui
diff --git a/modules/external/clock/clock-module.c b/modules/clock/clock-module.c
similarity index 100%
rename from modules/external/clock/clock-module.c
rename to modules/clock/clock-module.c
diff --git a/modules/external/clock/clock-sunpos.c b/modules/clock/clock-sunpos.c
similarity index 100%
rename from modules/external/clock/clock-sunpos.c
rename to modules/clock/clock-sunpos.c
diff --git a/modules/external/clock/clock-sunpos.h b/modules/clock/clock-sunpos.h
similarity index 100%
rename from modules/external/clock/clock-sunpos.h
rename to modules/clock/clock-sunpos.h
diff --git a/modules/external/clock/clock-utils.c b/modules/clock/clock-utils.c
similarity index 100%
rename from modules/external/clock/clock-utils.c
rename to modules/clock/clock-utils.c
diff --git a/modules/external/clock/clock-utils.h b/modules/clock/clock-utils.h
similarity index 100%
rename from modules/external/clock/clock-utils.h
rename to modules/clock/clock-utils.h
diff --git a/modules/external/clock/clock.gresource.xml b/modules/clock/clock.gresource.xml
similarity index 100%
rename from modules/external/clock/clock.gresource.xml
rename to modules/clock/clock.gresource.xml
diff --git a/modules/external/clock/clock.ui b/modules/clock/clock.ui
similarity index 100%
rename from modules/external/clock/clock.ui
rename to modules/clock/clock.ui
diff --git a/modules/external/clock/pixmaps/Makefile.am b/modules/clock/pixmaps/Makefile.am
similarity index 100%
rename from modules/external/clock/pixmaps/Makefile.am
rename to modules/clock/pixmaps/Makefile.am
diff --git a/modules/external/clock/pixmaps/clock-face-large.svg b/modules/clock/pixmaps/clock-face-large.svg
similarity index 100%
rename from modules/external/clock/pixmaps/clock-face-large.svg
rename to modules/clock/pixmaps/clock-face-large.svg
diff --git a/modules/external/clock/pixmaps/clock-face-small-day.svg 
b/modules/clock/pixmaps/clock-face-small-day.svg
similarity index 100%
rename from modules/external/clock/pixmaps/clock-face-small-day.svg
rename to modules/clock/pixmaps/clock-face-small-day.svg
diff --git a/modules/external/clock/pixmaps/clock-face-small-evening.svg 
b/modules/clock/pixmaps/clock-face-small-evening.svg
similarity index 100%
rename from modules/external/clock/pixmaps/clock-face-small-evening.svg
rename to modules/clock/pixmaps/clock-face-small-evening.svg
diff --git a/modules/external/clock/pixmaps/clock-face-small-morning.svg 
b/modules/clock/pixmaps/clock-face-small-morning.svg
similarity index 100%
rename from modules/external/clock/pixmaps/clock-face-small-morning.svg
rename to modules/clock/pixmaps/clock-face-small-morning.svg
diff --git a/modules/external/clock/pixmaps/clock-face-small-night.svg 
b/modules/clock/pixmaps/clock-face-small-night.svg
similarity index 100%
rename from modules/external/clock/pixmaps/clock-face-small-night.svg
rename to modules/clock/pixmaps/clock-face-small-night.svg
diff --git a/modules/external/clock/pixmaps/clock-face-small.svg b/modules/clock/pixmaps/clock-face-small.svg
similarity index 100%
rename from modules/external/clock/pixmaps/clock-face-small.svg
rename to modules/clock/pixmaps/clock-face-small.svg
diff --git a/modules/external/clock/pixmaps/clock-map-location-marker.svg 
b/modules/clock/pixmaps/clock-map-location-marker.svg
similarity index 100%
rename from modules/external/clock/pixmaps/clock-map-location-marker.svg
rename to modules/clock/pixmaps/clock-map-location-marker.svg
diff --git a/modules/external/clock/pixmaps/clock-map.svg b/modules/clock/pixmaps/clock-map.svg
similarity index 100%
rename from modules/external/clock/pixmaps/clock-map.svg
rename to modules/clock/pixmaps/clock-map.svg
diff --git a/modules/external/clock/set-timezone.c b/modules/clock/set-timezone.c
similarity index 100%
rename from modules/external/clock/set-timezone.c
rename to modules/clock/set-timezone.c
diff --git a/modules/external/clock/set-timezone.h b/modules/clock/set-timezone.h
similarity index 100%
rename from modules/external/clock/set-timezone.h
rename to modules/clock/set-timezone.h
diff --git a/modules/external/clock/system-timezone.c b/modules/clock/system-timezone.c
similarity index 100%
rename from modules/external/clock/system-timezone.c
rename to modules/clock/system-timezone.c
diff --git a/modules/external/clock/system-timezone.h b/modules/clock/system-timezone.h
similarity index 100%
rename from modules/external/clock/system-timezone.h
rename to modules/clock/system-timezone.h
diff --git a/modules/external/fish/Makefile.am b/modules/fish/Makefile.am
similarity index 100%
rename from modules/external/fish/Makefile.am
rename to modules/fish/Makefile.am
diff --git a/modules/external/fish/fish-applet.c b/modules/fish/fish-applet.c
similarity index 100%
rename from modules/external/fish/fish-applet.c
rename to modules/fish/fish-applet.c
diff --git a/modules/external/fish/fish-applet.h b/modules/fish/fish-applet.h
similarity index 100%
rename from modules/external/fish/fish-applet.h
rename to modules/fish/fish-applet.h
diff --git a/modules/external/fish/fish-menu.ui b/modules/fish/fish-menu.ui
similarity index 100%
rename from modules/external/fish/fish-menu.ui
rename to modules/fish/fish-menu.ui
diff --git a/modules/external/fish/fish-module.c b/modules/fish/fish-module.c
similarity index 100%
rename from modules/external/fish/fish-module.c
rename to modules/fish/fish-module.c
diff --git a/modules/external/fish/fish.gresource.xml b/modules/fish/fish.gresource.xml
similarity index 100%
rename from modules/external/fish/fish.gresource.xml
rename to modules/fish/fish.gresource.xml
diff --git a/modules/external/fish/fish.ui b/modules/fish/fish.ui
similarity index 100%
rename from modules/external/fish/fish.ui
rename to modules/fish/fish.ui
diff --git a/modules/external/fish/fishanim.fish b/modules/fish/fishanim.fish
similarity index 100%
rename from modules/external/fish/fishanim.fish
rename to modules/fish/fishanim.fish
diff --git a/modules/external/fish/footguy.fish b/modules/fish/footguy.fish
similarity index 100%
rename from modules/external/fish/footguy.fish
rename to modules/fish/footguy.fish
diff --git a/modules/external/fish/monkey.fish b/modules/fish/monkey.fish
similarity index 100%
rename from modules/external/fish/monkey.fish
rename to modules/fish/monkey.fish
diff --git a/modules/external/fish/oldwanda.fish b/modules/fish/oldwanda.fish
similarity index 100%
rename from modules/external/fish/oldwanda.fish
rename to modules/fish/oldwanda.fish
diff --git a/modules/external/fish/wanda.fish b/modules/fish/wanda.fish
similarity index 100%
rename from modules/external/fish/wanda.fish
rename to modules/fish/wanda.fish
diff --git a/modules/external/fish/wanda.svg b/modules/fish/wanda.svg
similarity index 100%
rename from modules/external/fish/wanda.svg
rename to modules/fish/wanda.svg
diff --git a/modules/external/notification-area/Makefile.am b/modules/notification-area/Makefile.am
similarity index 100%
rename from modules/external/notification-area/Makefile.am
rename to modules/notification-area/Makefile.am
diff --git a/modules/external/notification-area/fixedtip.c b/modules/notification-area/fixedtip.c
similarity index 100%
rename from modules/external/notification-area/fixedtip.c
rename to modules/notification-area/fixedtip.c
diff --git a/modules/external/notification-area/fixedtip.h b/modules/notification-area/fixedtip.h
similarity index 100%
rename from modules/external/notification-area/fixedtip.h
rename to modules/notification-area/fixedtip.h
diff --git a/modules/external/notification-area/na-applet.c b/modules/notification-area/na-applet.c
similarity index 100%
rename from modules/external/notification-area/na-applet.c
rename to modules/notification-area/na-applet.c
diff --git a/modules/external/notification-area/na-applet.h b/modules/notification-area/na-applet.h
similarity index 100%
rename from modules/external/notification-area/na-applet.h
rename to modules/notification-area/na-applet.h
diff --git a/modules/external/notification-area/na-module.c b/modules/notification-area/na-module.c
similarity index 100%
rename from modules/external/notification-area/na-module.c
rename to modules/notification-area/na-module.c
diff --git a/modules/external/notification-area/na-tray-child.c b/modules/notification-area/na-tray-child.c
similarity index 100%
rename from modules/external/notification-area/na-tray-child.c
rename to modules/notification-area/na-tray-child.c
diff --git a/modules/external/notification-area/na-tray-child.h b/modules/notification-area/na-tray-child.h
similarity index 100%
rename from modules/external/notification-area/na-tray-child.h
rename to modules/notification-area/na-tray-child.h
diff --git a/modules/external/notification-area/na-tray-manager.c 
b/modules/notification-area/na-tray-manager.c
similarity index 100%
rename from modules/external/notification-area/na-tray-manager.c
rename to modules/notification-area/na-tray-manager.c
diff --git a/modules/external/notification-area/na-tray-manager.h 
b/modules/notification-area/na-tray-manager.h
similarity index 100%
rename from modules/external/notification-area/na-tray-manager.h
rename to modules/notification-area/na-tray-manager.h
diff --git a/modules/external/notification-area/na-tray.c b/modules/notification-area/na-tray.c
similarity index 100%
rename from modules/external/notification-area/na-tray.c
rename to modules/notification-area/na-tray.c
diff --git a/modules/external/notification-area/na-tray.h b/modules/notification-area/na-tray.h
similarity index 100%
rename from modules/external/notification-area/na-tray.h
rename to modules/notification-area/na-tray.h
diff --git a/modules/external/status-notifier/Makefile.am b/modules/status-notifier/Makefile.am
similarity index 100%
rename from modules/external/status-notifier/Makefile.am
rename to modules/status-notifier/Makefile.am
diff --git a/modules/external/status-notifier/com.canonical.dbusmenu.xml 
b/modules/status-notifier/com.canonical.dbusmenu.xml
similarity index 100%
rename from modules/external/status-notifier/com.canonical.dbusmenu.xml
rename to modules/status-notifier/com.canonical.dbusmenu.xml
diff --git a/modules/external/status-notifier/org.kde.StatusNotifierHost.xml 
b/modules/status-notifier/org.kde.StatusNotifierHost.xml
similarity index 100%
rename from modules/external/status-notifier/org.kde.StatusNotifierHost.xml
rename to modules/status-notifier/org.kde.StatusNotifierHost.xml
diff --git a/modules/external/status-notifier/org.kde.StatusNotifierItem.xml 
b/modules/status-notifier/org.kde.StatusNotifierItem.xml
similarity index 100%
rename from modules/external/status-notifier/org.kde.StatusNotifierItem.xml
rename to modules/status-notifier/org.kde.StatusNotifierItem.xml
diff --git a/modules/external/status-notifier/org.kde.StatusNotifierWatcher.xml 
b/modules/status-notifier/org.kde.StatusNotifierWatcher.xml
similarity index 100%
rename from modules/external/status-notifier/org.kde.StatusNotifierWatcher.xml
rename to modules/status-notifier/org.kde.StatusNotifierWatcher.xml
diff --git a/modules/external/status-notifier/sn-applet.c b/modules/status-notifier/sn-applet.c
similarity index 100%
rename from modules/external/status-notifier/sn-applet.c
rename to modules/status-notifier/sn-applet.c
diff --git a/modules/external/status-notifier/sn-applet.h b/modules/status-notifier/sn-applet.h
similarity index 100%
rename from modules/external/status-notifier/sn-applet.h
rename to modules/status-notifier/sn-applet.h
diff --git a/modules/external/status-notifier/sn-dbus-menu-item.c 
b/modules/status-notifier/sn-dbus-menu-item.c
similarity index 100%
rename from modules/external/status-notifier/sn-dbus-menu-item.c
rename to modules/status-notifier/sn-dbus-menu-item.c
diff --git a/modules/external/status-notifier/sn-dbus-menu-item.h 
b/modules/status-notifier/sn-dbus-menu-item.h
similarity index 100%
rename from modules/external/status-notifier/sn-dbus-menu-item.h
rename to modules/status-notifier/sn-dbus-menu-item.h
diff --git a/modules/external/status-notifier/sn-dbus-menu.c b/modules/status-notifier/sn-dbus-menu.c
similarity index 100%
rename from modules/external/status-notifier/sn-dbus-menu.c
rename to modules/status-notifier/sn-dbus-menu.c
diff --git a/modules/external/status-notifier/sn-dbus-menu.h b/modules/status-notifier/sn-dbus-menu.h
similarity index 100%
rename from modules/external/status-notifier/sn-dbus-menu.h
rename to modules/status-notifier/sn-dbus-menu.h
diff --git a/modules/external/status-notifier/sn-host-v0.c b/modules/status-notifier/sn-host-v0.c
similarity index 100%
rename from modules/external/status-notifier/sn-host-v0.c
rename to modules/status-notifier/sn-host-v0.c
diff --git a/modules/external/status-notifier/sn-host-v0.h b/modules/status-notifier/sn-host-v0.h
similarity index 100%
rename from modules/external/status-notifier/sn-host-v0.h
rename to modules/status-notifier/sn-host-v0.h
diff --git a/modules/external/status-notifier/sn-host.c b/modules/status-notifier/sn-host.c
similarity index 100%
rename from modules/external/status-notifier/sn-host.c
rename to modules/status-notifier/sn-host.c
diff --git a/modules/external/status-notifier/sn-host.h b/modules/status-notifier/sn-host.h
similarity index 100%
rename from modules/external/status-notifier/sn-host.h
rename to modules/status-notifier/sn-host.h
diff --git a/modules/external/status-notifier/sn-image-menu-item.c 
b/modules/status-notifier/sn-image-menu-item.c
similarity index 100%
rename from modules/external/status-notifier/sn-image-menu-item.c
rename to modules/status-notifier/sn-image-menu-item.c
diff --git a/modules/external/status-notifier/sn-image-menu-item.h 
b/modules/status-notifier/sn-image-menu-item.h
similarity index 100%
rename from modules/external/status-notifier/sn-image-menu-item.h
rename to modules/status-notifier/sn-image-menu-item.h
diff --git a/modules/external/status-notifier/sn-item-v0.c b/modules/status-notifier/sn-item-v0.c
similarity index 100%
rename from modules/external/status-notifier/sn-item-v0.c
rename to modules/status-notifier/sn-item-v0.c
diff --git a/modules/external/status-notifier/sn-item-v0.h b/modules/status-notifier/sn-item-v0.h
similarity index 100%
rename from modules/external/status-notifier/sn-item-v0.h
rename to modules/status-notifier/sn-item-v0.h
diff --git a/modules/external/status-notifier/sn-item.c b/modules/status-notifier/sn-item.c
similarity index 100%
rename from modules/external/status-notifier/sn-item.c
rename to modules/status-notifier/sn-item.c
diff --git a/modules/external/status-notifier/sn-item.h b/modules/status-notifier/sn-item.h
similarity index 100%
rename from modules/external/status-notifier/sn-item.h
rename to modules/status-notifier/sn-item.h
diff --git a/modules/external/status-notifier/sn-module.c b/modules/status-notifier/sn-module.c
similarity index 100%
rename from modules/external/status-notifier/sn-module.c
rename to modules/status-notifier/sn-module.c
diff --git a/modules/external/wncklet/Makefile.am b/modules/wncklet/Makefile.am
similarity index 100%
rename from modules/external/wncklet/Makefile.am
rename to modules/wncklet/Makefile.am
diff --git a/modules/external/wncklet/showdesktop.c b/modules/wncklet/showdesktop.c
similarity index 100%
rename from modules/external/wncklet/showdesktop.c
rename to modules/wncklet/showdesktop.c
diff --git a/modules/external/wncklet/showdesktop.h b/modules/wncklet/showdesktop.h
similarity index 100%
rename from modules/external/wncklet/showdesktop.h
rename to modules/wncklet/showdesktop.h
diff --git a/modules/external/wncklet/window-list-menu.ui b/modules/wncklet/window-list-menu.ui
similarity index 100%
rename from modules/external/wncklet/window-list-menu.ui
rename to modules/wncklet/window-list-menu.ui
diff --git a/modules/external/wncklet/window-list.c b/modules/wncklet/window-list.c
similarity index 100%
rename from modules/external/wncklet/window-list.c
rename to modules/wncklet/window-list.c
diff --git a/modules/external/wncklet/window-list.h b/modules/wncklet/window-list.h
similarity index 100%
rename from modules/external/wncklet/window-list.h
rename to modules/wncklet/window-list.h
diff --git a/modules/external/wncklet/window-list.ui b/modules/wncklet/window-list.ui
similarity index 100%
rename from modules/external/wncklet/window-list.ui
rename to modules/wncklet/window-list.ui
diff --git a/modules/external/wncklet/window-menu.c b/modules/wncklet/window-menu.c
similarity index 100%
rename from modules/external/wncklet/window-menu.c
rename to modules/wncklet/window-menu.c
diff --git a/modules/external/wncklet/window-menu.h b/modules/wncklet/window-menu.h
similarity index 100%
rename from modules/external/wncklet/window-menu.h
rename to modules/wncklet/window-menu.h
diff --git a/modules/external/wncklet/wncklet-module.c b/modules/wncklet/wncklet-module.c
similarity index 100%
rename from modules/external/wncklet/wncklet-module.c
rename to modules/wncklet/wncklet-module.c
diff --git a/modules/external/wncklet/wncklet.c b/modules/wncklet/wncklet.c
similarity index 100%
rename from modules/external/wncklet/wncklet.c
rename to modules/wncklet/wncklet.c
diff --git a/modules/external/wncklet/wncklet.gresource.xml b/modules/wncklet/wncklet.gresource.xml
similarity index 100%
rename from modules/external/wncklet/wncklet.gresource.xml
rename to modules/wncklet/wncklet.gresource.xml
diff --git a/modules/external/wncklet/wncklet.h b/modules/wncklet/wncklet.h
similarity index 100%
rename from modules/external/wncklet/wncklet.h
rename to modules/wncklet/wncklet.h
diff --git a/modules/external/wncklet/workspace-switcher-menu.ui b/modules/wncklet/workspace-switcher-menu.ui
similarity index 100%
rename from modules/external/wncklet/workspace-switcher-menu.ui
rename to modules/wncklet/workspace-switcher-menu.ui
diff --git a/modules/external/wncklet/workspace-switcher.c b/modules/wncklet/workspace-switcher.c
similarity index 100%
rename from modules/external/wncklet/workspace-switcher.c
rename to modules/wncklet/workspace-switcher.c
diff --git a/modules/external/wncklet/workspace-switcher.h b/modules/wncklet/workspace-switcher.h
similarity index 100%
rename from modules/external/wncklet/workspace-switcher.h
rename to modules/wncklet/workspace-switcher.h
diff --git a/modules/external/wncklet/workspace-switcher.ui b/modules/wncklet/workspace-switcher.ui
similarity index 100%
rename from modules/external/wncklet/workspace-switcher.ui
rename to modules/wncklet/workspace-switcher.ui
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c42d071..c14cb13 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -45,31 +45,31 @@ gnome-panel/panel-stock-icons.c
 gnome-panel/panel-toplevel.c
 gnome-panel/panel-util.c
 libpanel-applet/panel-applet.c
-modules/external/clock/calendar-client.c
-modules/external/clock/calendar-window.c
-modules/external/clock/clock-applet.c
-modules/external/clock/clock-location.c
-modules/external/clock/clock-location-tile.c
-modules/external/clock/clock-module.c
-modules/external/clock/clock-menu.ui
-modules/external/clock/clock.ui
-modules/external/clock/clock-utils.c
-modules/external/fish/fish-applet.c
-modules/external/fish/fish-module.c
-modules/external/fish/fish-menu.ui
-modules/external/fish/fish.ui
-modules/external/notification-area/na-applet.c
-modules/external/notification-area/na-module.c
-modules/external/notification-area/na-tray-manager.c
-modules/external/status-notifier/sn-module.c
-modules/external/wncklet/showdesktop.c
-modules/external/wncklet/window-list.c
-modules/external/wncklet/window-list-menu.ui
-modules/external/wncklet/window-list.ui
-modules/external/wncklet/window-menu.c
-modules/external/wncklet/wncklet.c
-modules/external/wncklet/wncklet-module.c
-modules/external/wncklet/workspace-switcher.c
-modules/external/wncklet/workspace-switcher-menu.ui
-modules/external/wncklet/workspace-switcher.ui
+modules/clock/calendar-client.c
+modules/clock/calendar-window.c
+modules/clock/clock-applet.c
+modules/clock/clock-location.c
+modules/clock/clock-location-tile.c
+modules/clock/clock-module.c
+modules/clock/clock-menu.ui
+modules/clock/clock.ui
+modules/clock/clock-utils.c
+modules/fish/fish-applet.c
+modules/fish/fish-module.c
+modules/fish/fish-menu.ui
+modules/fish/fish.ui
+modules/notification-area/na-applet.c
+modules/notification-area/na-module.c
+modules/notification-area/na-tray-manager.c
 modules/separator/separator-module.c
+modules/status-notifier/sn-module.c
+modules/wncklet/showdesktop.c
+modules/wncklet/window-list.c
+modules/wncklet/window-list-menu.ui
+modules/wncklet/window-list.ui
+modules/wncklet/window-menu.c
+modules/wncklet/wncklet.c
+modules/wncklet/wncklet-module.c
+modules/wncklet/workspace-switcher.c
+modules/wncklet/workspace-switcher-menu.ui
+modules/wncklet/workspace-switcher.ui
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]