replace old project name by new one

4 files changed, 69 insertions, 69 deletions

diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index 114400c0..cc0960a8 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -1,22 +1,22 @@
-/* 
-    Copyright (C) 2009  Jiri Moskovcak (jmoskovc@redhat.com) 
-    Copyright (C) 2009  RedHat 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., 
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+/*
+    Copyright (C) 2009  Jiri Moskovcak (jmoskovc@redhat.com)
+    Copyright (C) 2009  RedHat 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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     */
-    
+
 #include "CrashWatcher.h"
 #include <unistd.h>
 #include <iostream>
@@ -62,7 +62,7 @@ gboolean CCrashWatcher::handle_event_cb(GIOChannel *gio, GIOCondition condition,
 #ifdef DEBUG
         std::cout << "Created file: " << name << std::endl;
 #endif /*DEBUG*/
-     
+
         /* we want to ignore the lock files */
         if(event->mask & IN_ISDIR)
         {
@@ -109,7 +109,7 @@ CCrashWatcher::CCrashWatcher(const std::string& pPath,DBus::Connection &connecti
         exit(-1);
     }
     if((watch = inotify_add_watch(m_nFd, pPath.c_str(), IN_CREATE)) == -1){
-        
+
         throw std::string("Add watch failed:") + pPath.c_str();
     }
     m_pGio = g_io_channel_unix_new(m_nFd);
@@ -126,7 +126,7 @@ CCrashWatcher::~CCrashWatcher()
 dbus_vector_crash_infos_t CCrashWatcher::GetCrashInfos(const std::string &pUID)
 {
     dbus_vector_crash_infos_t retval;
-    vector_crash_infos_t crash_info; 
+    vector_crash_infos_t crash_info;
     m_pMW->GetCrashInfos("501");
     for (vector_crash_infos_t::iterator it = crash_info.begin(); it!=crash_info.end(); ++it) {
         std::cerr << it->m_sExecutable << std::endl;
@@ -214,8 +214,8 @@ bool CCrashWatcher::DeleteDebugDump(const std::string& pUUID, const std::string&
 }
 void CCrashWatcher::Lock()
 {
-    int lfp = open("crashcatcher.lock",O_RDWR|O_CREAT,0640);
-	if (lfp < 0) 
+    int lfp = open("abrt.lock",O_RDWR|O_CREAT,0640);
+	if (lfp < 0)
         throw std::string("CCrashWatcher.cpp:can not open lock file");
 	if (lockf(lfp,F_TLOCK,0) < 0)
         throw std::string("CCrashWatcher.cpp:Lock:cannot create lock on lockfile");
@@ -237,7 +237,7 @@ void CCrashWatcher::StartWatch()
         len = read(m_nFd,buff,INOTIFY_BUFF_SIZE);
         while(i < len){
             pevent = (struct inotify_event *)&buff[i];
-            if (pevent->len) 
+            if (pevent->len)
                 std::strcpy(action, pevent->name);
             else
                 std::strcpy(action, m_sTarget.c_str());
diff --git a/src/Daemon/DBusCommon.h b/src/Daemon/DBusCommon.h
index 1e26e392..7582541c 100644
--- a/src/Daemon/DBusCommon.h
+++ b/src/Daemon/DBusCommon.h
@@ -17,9 +17,9 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     */
 
-#define CC_DBUS_NAME "com.redhat.crash_catcher"
-#define CC_DBUS_PATH "/com/redhat/crash_catcher"
-#define CC_DBUS_IFACE "com.redhat.crash_catcher"
+#define CC_DBUS_NAME "com.redhat.abrt"
+#define CC_DBUS_PATH "/com/redhat/abrt"
+#define CC_DBUS_IFACE "com.redhat.abrt"
 
 //typedef std::vector<crash_info_t> vector_crash_infos_t;
 typedef std::vector< std::vector<std::string> > dbus_vector_crash_infos_t;
diff --git a/src/Daemon/DBusServerProxy.h b/src/Daemon/DBusServerProxy.h
index 6a76f2c6..e844f0fd 100644
--- a/src/Daemon/DBusServerProxy.h
+++ b/src/Daemon/DBusServerProxy.h
@@ -1,20 +1,20 @@
-/* 
-    Copyright (C) 2009  Jiri Moskovcak (jmoskovc@redhat.com) 
-    Copyright (C) 2009  RedHat 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., 
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+/*
+    Copyright (C) 2009  Jiri Moskovcak (jmoskovc@redhat.com)
+    Copyright (C) 2009  RedHat 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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     */
 
 #include <dbus-c++/dbus.h>
@@ -37,7 +37,7 @@ public:
     }
 /* reveal Interface introspection when we stabilize the API */
 /*
-    DBus::IntrospectedInterface *const introspect() const 
+    DBus::IntrospectedInterface *const introspect() const
     {
         static DBus::IntrospectedArgument GetCrashInfos_args[] =
         {
@@ -45,30 +45,30 @@ public:
             { "info", "a{ss}", false },
             { 0, 0, 0 }
         };
-        static DBus::IntrospectedArgument Crash_args[] = 
+        static DBus::IntrospectedArgument Crash_args[] =
         {
             { "package", "s", false },
             { 0, 0, 0 }
         };
-        static DBus::IntrospectedMethod CDBusServer_adaptor_methods[] = 
+        static DBus::IntrospectedMethod CDBusServer_adaptor_methods[] =
         {
             { "GetCrashInfos", GetCrashInfos_args },
             { 0, 0 },
             { "GetCrashInfosMap", GetCrashInfos_args },
             { 0, 0 }
         };
-        static DBus::IntrospectedMethod CDBusServer_adaptor_signals[] = 
+        static DBus::IntrospectedMethod CDBusServer_adaptor_signals[] =
         {
             { "Crash", Crash_args },
             { 0, 0 }
         };
-        static DBus::IntrospectedProperty CDBusServer_adaptor_properties[] = 
+        static DBus::IntrospectedProperty CDBusServer_adaptor_properties[] =
         {
             { 0, 0, 0, 0 }
         };
-        static DBus::IntrospectedInterface CDBusServer_adaptor_interface = 
+        static DBus::IntrospectedInterface CDBusServer_adaptor_interface =
         {
-            "com.redhat.CrashCatcher",
+            "com.redhat.abrt",
             CDBusServer_adaptor_methods,
             CDBusServer_adaptor_signals,
             CDBusServer_adaptor_properties
@@ -113,8 +113,8 @@ public:
         wi << arg1;
         emit_signal(sig);
     }
-     
-     
+
+
 private:
 
     /* unmarshalers (to unpack the DBus message before calling the actual interface method)
@@ -122,7 +122,7 @@ private:
     DBus::Message _GetCrashInfos_stub(const DBus::CallMessage &call)
     {
         DBus::MessageIter ri = call.reader();
-        
+
         std::string argin1; ri >> argin1;
         dbus_vector_crash_infos_t argout1 = GetCrashInfos(argin1);
         DBus::ReturnMessage reply(call);
@@ -130,11 +130,11 @@ private:
         wi << argout1;
         return reply;
     }
-    
+
     DBus::Message _CreateReport_stub(const DBus::CallMessage &call)
     {
         DBus::MessageIter ri = call.reader();
-        
+
         std::string argin1; ri >> argin1;
         dbus_map_report_info_t argout1 = CreateReport(argin1,call.sender());
         DBus::ReturnMessage reply(call);
@@ -142,11 +142,11 @@ private:
         wi << argout1;
         return reply;
     }
-    
+
     DBus::Message _GetCrashInfosMap_stub(const DBus::CallMessage &call)
     {
         DBus::MessageIter ri = call.reader();
-        
+
         //std::string argin1; ri >> argin1;
         dbus_vector_map_crash_infos_t argout1 = GetCrashInfosMap(call.sender());
         DBus::ReturnMessage reply(call);
@@ -154,11 +154,11 @@ private:
         wi << argout1;
         return reply;
     }
-    
+
     DBus::Message _Report_stub(const DBus::CallMessage &call)
     {
         DBus::MessageIter ri = call.reader();
-        
+
         dbus_map_report_info_t argin1; ri >> argin1;
         bool argout1 = Report(argin1);
         DBus::ReturnMessage reply(call);
@@ -166,11 +166,11 @@ private:
         wi << argout1;
         return reply;
     }
-    
+
     DBus::Message _DeleteDebugDump_stub(const DBus::CallMessage &call)
     {
         DBus::MessageIter ri = call.reader();
-        
+
         std::string argin1; ri >> argin1;
         bool argout1 = DeleteDebugDump(argin1,call.sender());
         DBus::ReturnMessage reply(call);
diff --git a/src/Daemon/dbus-abrt.conf b/src/Daemon/dbus-abrt.conf
index 75c9a6d0..11b2a111 100644
--- a/src/Daemon/dbus-abrt.conf
+++ b/src/Daemon/dbus-abrt.conf
@@ -1,5 +1,5 @@
 <!-- This configuration file specifies the required security policies
-     for CrashCatcher core daemon to work. -->
+     for abrt core daemon to work. -->
 
 <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
@@ -8,18 +8,18 @@
   <!-- ../system.conf have denied everything, so we just punch some holes -->
 
   <policy user="root">
-    <allow own="com.redhat.crash_catcher"/>
-    <allow send_destination="com.redhat.crash_catcher"/>
-    <allow send_interface="com.redhat.crash_catcher"/>
+    <allow own="com.redhat.abrt"/>
+    <allow send_destination="com.redhat.abrt"/>
+    <allow send_interface="com.redhat.abrt"/>
   </policy>
 
   <policy at_console="true">
-    <allow send_destination="com.redhat.crash_catcher"/>
+    <allow send_destination="com.redhat.abrt"/>
   </policy>
 
-  <!-- Allow anyone to invoke methods on crash-catcher server -->
+  <!-- Allow anyone to invoke methods on abrt server -->
   <policy context="default">
-    <allow send_destination="com.redhat.crash_catcher"/>
+    <allow send_destination="com.redhat.abrt"/>
   </policy>
 
 </busconfig>