From cc83804e6fb6b9b6534ea58003cd73d31968ca27 Mon Sep 17 00:00:00 2001 From: Jiri Moskovcak Date: Mon, 14 Sep 2009 14:49:53 +0200 Subject: disabled sanitize_dump_dir_rights() in daemon, as it conflicts with python hook --- src/Daemon/Daemon.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp index 5e05be7..8c5f613 100644 --- a/src/Daemon/Daemon.cpp +++ b/src/Daemon/Daemon.cpp @@ -699,7 +699,11 @@ int main(int argc, char** argv) g_pMainloop = g_main_loop_new(NULL, FALSE); /* Watching DEBUG_DUMPS_DIR for new files... */ VERB1 log("Initializing inotify"); - sanitize_dump_dir_rights(); + /*FIXME: python hook runs with ordinary user privileges, + so it fails if everyone doesn't have write acces + to DEBUG_DUMPS_DIR + */ + //sanitize_dump_dir_rights(); errno = 0; int inotify_fd = inotify_init(); if (inotify_fd == -1) -- cgit From 13483daa13d1b366fa9c7222361c094d3726f03e Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 14 Sep 2009 14:57:55 +0200 Subject: move lib/CommLayer/CommLayerClientDBus.{h,cpp) -> src/CLI Signed-off-by: Denys Vlasenko --- src/Applet/CCApplet.h | 2 +- src/Applet/Makefile.am | 4 +++- src/CLI/CommLayerClientDBus.cpp | 14 ++++++++++++++ src/CLI/CommLayerClientDBus.h | 17 +++++++++++++++++ src/CLI/Makefile.am | 18 +++++++++++------- 5 files changed, 46 insertions(+), 9 deletions(-) create mode 100644 src/CLI/CommLayerClientDBus.cpp create mode 100644 src/CLI/CommLayerClientDBus.h (limited to 'src') diff --git a/src/Applet/CCApplet.h b/src/Applet/CCApplet.h index dccd70b..90a79e2 100644 --- a/src/Applet/CCApplet.h +++ b/src/Applet/CCApplet.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include class CApplet : public CDBusClient_proxy, diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am index 886102f..5190649 100644 --- a/src/Applet/Makefile.am +++ b/src/Applet/Makefile.am @@ -1,6 +1,8 @@ bin_PROGRAMS = abrt-applet -abrt_applet_SOURCES = Applet.cpp CCApplet.cpp CCApplet.h +abrt_applet_SOURCES = \ + Applet.cpp \ + CCApplet.h CCApplet.cpp abrt_applet_CPPFLAGS = \ -Wall -Werror \ -I../Daemon/ \ diff --git a/src/CLI/CommLayerClientDBus.cpp b/src/CLI/CommLayerClientDBus.cpp new file mode 100644 index 0000000..7798346 --- /dev/null +++ b/src/CLI/CommLayerClientDBus.cpp @@ -0,0 +1,14 @@ +#include "CommLayerClientDBus.h" +CCommLayerClientDBus::CCommLayerClientDBus(DBus::Connection &connection, const char *path, const char *name) +: CDBusClient_proxy(connection), + DBus::ObjectProxy(connection, path, name) +{ +} +CCommLayerClientDBus::~CCommLayerClientDBus() +{ +}; + +void Crash(std::string &value) +{ + std::cout << "Another Crash?" << std::endl; +} diff --git a/src/CLI/CommLayerClientDBus.h b/src/CLI/CommLayerClientDBus.h new file mode 100644 index 0000000..9e63f58 --- /dev/null +++ b/src/CLI/CommLayerClientDBus.h @@ -0,0 +1,17 @@ +#include +#include +#include + +class CCommLayerClientDBus +: public CDBusClient_proxy, + public DBus::IntrospectableProxy, + public DBus::ObjectProxy +{ + public: + CCommLayerClientDBus(DBus::Connection &connection, const char *path, const char *name); + ~CCommLayerClientDBus(); + void Crash(std::string &value) + { + std::cout << "Another Crash?" << std::endl; + } +}; diff --git a/src/CLI/Makefile.am b/src/CLI/Makefile.am index 6900bda..33daaae 100644 --- a/src/CLI/Makefile.am +++ b/src/CLI/Makefile.am @@ -3,11 +3,15 @@ #abrt_cli_CPPFLAGS = -I$(srcdir)/../../inc -DVAR_RUN=\"$(VAR_RUN)\" bin_PROGRAMS = abrt-cli -abrt_cli_SOURCES = CLI.cpp ABRTSocket.cpp ABRTSocket.h -abrt_cli_CPPFLAGS = $(DBUS_GLIB_CFLAGS) $(GTK_CFLAGS) $(DBUSCPP_CFLAGS) $(LIBNOTIFY_CFLAGS)\ - -I$(srcdir)/../../inc -DVAR_RUN=\"$(VAR_RUN)\" \ - -I$(srcdir)/../../lib/CommLayer \ - $(ENABLE_SOCKET_OR_DBUS) \ - -I../../lib/MiddleWare +abrt_cli_SOURCES = \ + CLI.cpp \ + ABRTSocket.h ABRTSocket.cpp \ + CommLayerClientDBus.h CommLayerClientDBus.cpp \ +abrt_cli_CPPFLAGS = \ + $(DBUS_GLIB_CFLAGS) $(GTK_CFLAGS) $(DBUSCPP_CFLAGS) $(LIBNOTIFY_CFLAGS)\ + -I$(srcdir)/../../inc -DVAR_RUN=\"$(VAR_RUN)\" \ + -I$(srcdir)/../../lib/CommLayer \ + $(ENABLE_SOCKET_OR_DBUS) \ + -I../../lib/MiddleWare -abrt_cli_LDADD = ../../lib/CommLayer/libABRTCommLayer.la \ No newline at end of file +abrt_cli_LDADD = ../../lib/CommLayer/libABRTCommLayer.la -- cgit From 753d66ef06752256f775aa29c07079aa57ad5389 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 14 Sep 2009 14:59:22 +0200 Subject: oops... remove stray trailing '\' Signed-off-by: Denys Vlasenko --- src/CLI/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/CLI/Makefile.am b/src/CLI/Makefile.am index 33daaae..be89602 100644 --- a/src/CLI/Makefile.am +++ b/src/CLI/Makefile.am @@ -6,9 +6,9 @@ bin_PROGRAMS = abrt-cli abrt_cli_SOURCES = \ CLI.cpp \ ABRTSocket.h ABRTSocket.cpp \ - CommLayerClientDBus.h CommLayerClientDBus.cpp \ + CommLayerClientDBus.h CommLayerClientDBus.cpp abrt_cli_CPPFLAGS = \ - $(DBUS_GLIB_CFLAGS) $(GTK_CFLAGS) $(DBUSCPP_CFLAGS) $(LIBNOTIFY_CFLAGS)\ + $(DBUS_GLIB_CFLAGS) $(GTK_CFLAGS) $(DBUSCPP_CFLAGS) $(LIBNOTIFY_CFLAGS) \ -I$(srcdir)/../../inc -DVAR_RUN=\"$(VAR_RUN)\" \ -I$(srcdir)/../../lib/CommLayer \ $(ENABLE_SOCKET_OR_DBUS) \ -- cgit From ac72b4b35e15c0823dc8c1f68684349a5e34c72a Mon Sep 17 00:00:00 2001 From: Jiri Moskovcak Date: Mon, 14 Sep 2009 15:39:57 +0200 Subject: APPLET: fixed licence wrapping --- src/Applet/CCApplet.cpp | 9 +++++---- src/Applet/popup.GtkBuilder | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Applet/CCApplet.cpp b/src/Applet/CCApplet.cpp index 52ce619..0fb4c9f 100644 --- a/src/Applet/CCApplet.cpp +++ b/src/Applet/CCApplet.cpp @@ -87,12 +87,13 @@ const gchar *CApplet::menu_xml = Copyright © 2009 Red Hat, Inc\ https://fedorahosted.org/abrt/\ Website\ - 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.\ -\ + 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.\n\ +\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\ +\n\ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.\ Jiri Moskovcak <jmoskovc@redhat.com>\ + True\ \ \ True\ diff --git a/src/Applet/popup.GtkBuilder b/src/Applet/popup.GtkBuilder index baa5cf2..7a2ac2c 100644 --- a/src/Applet/popup.GtkBuilder +++ b/src/Applet/popup.GtkBuilder @@ -48,6 +48,7 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. Jiri Moskovcak <jmoskovc@redhat.com> + True True -- cgit