From bae47abd09dde8e6700646a8911c3b0e0b470cd6 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Wed, 25 Oct 2006 00:12:46 +0200
Subject: [PATCH] s/groupchat/chat

---
 activities/Makefile.am                                      | 2 +-
 activities/chat/Makefile.am                                 | 6 ++++++
 activities/{groupchat => chat}/__init__.py                  | 0
 activities/chat/chat.activity                               | 6 ++++++
 .../GroupChatActivity.py => chat/chatactivity.py}           | 0
 activities/groupchat/Makefile.am                            | 6 ------
 activities/groupchat/groupchat.activity                     | 6 ------
 configure.ac                                                | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 activities/chat/Makefile.am
 rename activities/{groupchat => chat}/__init__.py (100%)
 create mode 100644 activities/chat/chat.activity
 rename activities/{groupchat/GroupChatActivity.py => chat/chatactivity.py} (100%)
 delete mode 100644 activities/groupchat/Makefile.am
 delete mode 100644 activities/groupchat/groupchat.activity

diff --git a/activities/Makefile.am b/activities/Makefile.am
index 87db00ef..6929f4f0 100644
--- a/activities/Makefile.am
+++ b/activities/Makefile.am
@@ -1 +1 @@
-SUBDIRS = groupchat terminal web sketch
+SUBDIRS = chat terminal web sketch
diff --git a/activities/chat/Makefile.am b/activities/chat/Makefile.am
new file mode 100644
index 00000000..e77c3452
--- /dev/null
+++ b/activities/chat/Makefile.am
@@ -0,0 +1,6 @@
+sugardir = $(pkgdatadir)/activities/chat
+sugar_PYTHON =			\
+	__init__.py		\
+	ChatActivity.py
+
+EXTRA_DIST = chat.activity
diff --git a/activities/groupchat/__init__.py b/activities/chat/__init__.py
similarity index 100%
rename from activities/groupchat/__init__.py
rename to activities/chat/__init__.py
diff --git a/activities/chat/chat.activity b/activities/chat/chat.activity
new file mode 100644
index 00000000..b0b8ea75
--- /dev/null
+++ b/activities/chat/chat.activity
@@ -0,0 +1,6 @@
+[Activity]
+name = GroupChat
+icon = activity-chat
+id = org.laptop.ChatActivity
+python_module = chat.chatactivity.ChatActivity
+show_launcher = no
diff --git a/activities/groupchat/GroupChatActivity.py b/activities/chat/chatactivity.py
similarity index 100%
rename from activities/groupchat/GroupChatActivity.py
rename to activities/chat/chatactivity.py
diff --git a/activities/groupchat/Makefile.am b/activities/groupchat/Makefile.am
deleted file mode 100644
index 66e99151..00000000
--- a/activities/groupchat/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-sugardir = $(pkgdatadir)/activities/groupchat
-sugar_PYTHON =			\
-	__init__.py		\
-	GroupChatActivity.py
-
-EXTRA_DIST = groupchat.activity
diff --git a/activities/groupchat/groupchat.activity b/activities/groupchat/groupchat.activity
deleted file mode 100644
index 54d9c171..00000000
--- a/activities/groupchat/groupchat.activity
+++ /dev/null
@@ -1,6 +0,0 @@
-[Activity]
-name = GroupChat
-icon = activity-groupchat
-id = com.redhat.Sugar.GroupChatActivity
-python_module = groupchat.GroupChatActivity.GroupChatActivity
-show_launcher = no
diff --git a/configure.ac b/configure.ac
index 7f430ef2..b57d73a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ Makefile
 dbus-installed.conf
 activities/Makefile
 activities/web/Makefile
-activities/groupchat/Makefile
+activities/chat/Makefile
 activities/terminal/Makefile
 activities/sketch/Makefile
 lib/Makefile