diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Applet/Applet.cpp | 34 | ||||
| -rw-r--r-- | src/CLI/CLI.cpp | 2 | ||||
| -rw-r--r-- | src/Daemon/CrashWatcher.h | 4 | ||||
| -rw-r--r-- | src/Daemon/Makefile.am | 31 | ||||
| -rw-r--r-- | src/Daemon/abrt.8 | 2 | ||||
| -rw-r--r-- | src/Daemon/abrt.conf.5 | 8 | ||||
| -rw-r--r-- | src/Daemon/exported-symbols | 4 | ||||
| -rw-r--r-- | src/Hooks/abrt_exception_handler.py.in | 2 |
8 files changed, 49 insertions, 38 deletions
diff --git a/src/Applet/Applet.cpp b/src/Applet/Applet.cpp index adcfb47..53f0043 100644 --- a/src/Applet/Applet.cpp +++ b/src/Applet/Applet.cpp @@ -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 "CCApplet.h" diff --git a/src/CLI/CLI.cpp b/src/CLI/CLI.cpp index 251407b..aaaef5b 100644 --- a/src/CLI/CLI.cpp +++ b/src/CLI/CLI.cpp @@ -136,7 +136,7 @@ int main(int argc, char** argv) dispatcher.attach(NULL); DBus::default_dispatcher = &dispatcher; DBus::Connection conn = DBus::Connection::SystemBus(); - CCommLayerClientDBus ABRTDaemon(conn, CC_DBUS_PATH, CC_DBUS_NAME); + CCommLayerClientDBus ABRTDaemon(conn, CC_DBUS_PATH, CC_DBUS_NAME); if(!conn.has_name(CC_DBUS_NAME)){ std::cout << "Daemon is not running!" << std::endl; return -1; diff --git a/src/Daemon/CrashWatcher.h b/src/Daemon/CrashWatcher.h index 66ca71f..bc71269 100644 --- a/src/Daemon/CrashWatcher.h +++ b/src/Daemon/CrashWatcher.h @@ -69,7 +69,7 @@ class CCrashWatcher {} } cron_callback_data_t; - + typedef struct SThreadData{ pthread_t thread_id; char* UUID; @@ -77,7 +77,7 @@ class CCrashWatcher char *dest; CCrashWatcher *daemon; } thread_data_t; - + /** * Map to cache the results from CreateReport_t * <UID, <UUID, result>> diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am index b6a66f6..18fffc6 100644 --- a/src/Daemon/Makefile.am +++ b/src/Daemon/Makefile.am @@ -1,15 +1,26 @@ sbin_PROGRAMS = abrt -abrt_SOURCES = CrashWatcher.cpp CrashWatcher.h Daemon.cpp \ - DBusCommon.h Settings.h Settings.cpp -abrt_CPPFLAGS = -I$(srcdir)/../../lib/MiddleWare -I$(srcdir)/../../lib/CommLayer\ - -I$(srcdir)/../../inc -I$(srcdir)/../../lib/Utils \ - -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" $(GLIB_CFLAGS) $(DBUSCPP_CFLAGS) \ - -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ - -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ - -DCONF_DIR=\"$(CONF_DIR)\" \ - -DVAR_RUN=\"$(VAR_RUN)\" $(ENABLE_SOCKET_OR_DBUS) +abrt_SOURCES = \ + CrashWatcher.cpp CrashWatcher.h \ + Daemon.cpp \ + DBusCommon.h \ + Settings.h Settings.cpp +abrt_CPPFLAGS = \ + -I$(srcdir)/../../inc \ + -I$(srcdir)/../../lib/MiddleWare \ + -I$(srcdir)/../../lib/CommLayer \ + -I$(srcdir)/../../lib/Utils \ + -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ + -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ + -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ + -DCONF_DIR=\"$(CONF_DIR)\" \ + -DVAR_RUN=\"$(VAR_RUN)\" \ + $(GLIB_CFLAGS) $(DBUSCPP_CFLAGS) \ + $(ENABLE_SOCKET_OR_DBUS) +abrt_LDADD = \ + ../../lib/MiddleWare/libABRTMiddleWare.la \ + ../../lib/CommLayer/libABRTCommLayer.la \ + $(DL_LIBS) $(DBUSCPP_LIBS) $(RPM_LIBS) -abrt_LDADD = ../../lib/MiddleWare/libABRTMiddleWare.la ../../lib/CommLayer/libABRTCommLayer.la $(DL_LIBS) $(DBUSCPP_LIBS) $(RPM_LIBS) dbusabrtconfdir = ${sysconfdir}/dbus-1/system.d/ dist_dbusabrtconf_DATA = dbus-abrt.conf diff --git a/src/Daemon/abrt.8 b/src/Daemon/abrt.8 index f3ae127..b106041 100644 --- a/src/Daemon/abrt.8 +++ b/src/Daemon/abrt.8 @@ -27,7 +27,7 @@ to print more debugging information when the daemon is started. When you use some other crash-catching tool, specific for an application or an application type (for example BugBuddy for GNOME applications), crashes of this type will be handled by that tool and -not by \fIabrt\fP. If you want \fIabrt\fP to handle these crashes, +not by \fIabrt\fP. If you want \fIabrt\fP to handle these crashes, turn off the higher-level crash-catching tool. .SH "SEE ALSO" .IR abrt.conf (5), diff --git a/src/Daemon/abrt.conf.5 b/src/Daemon/abrt.conf.5 index edccb59..3b172bc 100644 --- a/src/Daemon/abrt.conf.5 +++ b/src/Daemon/abrt.conf.5 @@ -5,11 +5,11 @@ abrt.conf \- configuration file for abrt .P .I abrt is a daemon that watches for application crashes. When a crash occurs, -it collects the crash data and takes action according to +it collects the crash data and takes action according to its configuration. This manual page describes \fIabrt\fP's configuration file. .P -The configuration file consists of sections, each section contains +The configuration file consists of sections, each section contains several items in the format "Option = Value". A description of each section follows: .SS [Common] @@ -21,7 +21,7 @@ will report crashes only in GPG signed packages. When set to "no", it will report crashes also in unsigned packages. .TP .B OpenGPGPublicKeys = \fIfilename\fP , \fIfilename\fP ... -These are the trusted GPG keys with which packages have to be +These are the trusted GPG keys with which packages have to be signed for .I abrt to report them if "EnableOpenGPG = yes". @@ -35,7 +35,7 @@ will ignore packages in this list and will not handle their crashes. will only load plugins in this list. .TP .B Database = \fIdatabasePlugin\fP -This specifies which database plugin +This specifies which database plugin .I abrt uses to store metadata about the crash. .TP diff --git a/src/Daemon/exported-symbols b/src/Daemon/exported-symbols index 511b598..2810010 100644 --- a/src/Daemon/exported-symbols +++ b/src/Daemon/exported-symbols @@ -1,3 +1,3 @@ -{ - get_commlayer; +{ + get_commlayer; }; diff --git a/src/Hooks/abrt_exception_handler.py.in b/src/Hooks/abrt_exception_handler.py.in index 4643db6..1532357 100644 --- a/src/Hooks/abrt_exception_handler.py.in +++ b/src/Hooks/abrt_exception_handler.py.in @@ -200,7 +200,7 @@ def handleMyException((etype, value, tb)): progname - the name of the application version - the version of the application """ - + # restore original exception handler sys.excepthook = sys.__excepthook__ # pylint: disable-msg=E1101 |