diff options
author | dnovotny <danny@rawhide.localdomain> | 2009-09-14 09:40:28 -0400 |
---|---|---|
committer | dnovotny <danny@rawhide.localdomain> | 2009-09-14 09:40:28 -0400 |
commit | 648a9cd08da32494227c4d36a4401fd877d6e03a (patch) | |
tree | 40e6bd7ef22051ada9437ef22da9d2436a3fd358 /src | |
parent | 814506ae62986c3c3b667afdae7a33fe6b9e690f (diff) | |
parent | ac72b4b35e15c0823dc8c1f68684349a5e34c72a (diff) | |
download | abrt-648a9cd08da32494227c4d36a4401fd877d6e03a.tar.gz abrt-648a9cd08da32494227c4d36a4401fd877d6e03a.tar.xz abrt-648a9cd08da32494227c4d36a4401fd877d6e03a.zip |
Merge branch 'master' of git://git.fedorahosted.org/git/abrt
Diffstat (limited to 'src')
-rw-r--r-- | src/Applet/CCApplet.cpp | 9 | ||||
-rw-r--r-- | src/Applet/CCApplet.h | 2 | ||||
-rw-r--r-- | src/Applet/Makefile.am | 4 | ||||
-rw-r--r-- | src/Applet/popup.GtkBuilder | 1 | ||||
-rw-r--r-- | src/CLI/CommLayerClientDBus.cpp | 14 | ||||
-rw-r--r-- | src/CLI/CommLayerClientDBus.h | 17 | ||||
-rw-r--r-- | src/CLI/Makefile.am | 18 | ||||
-rw-r--r-- | src/Daemon/Daemon.cpp | 6 |
8 files changed, 57 insertions, 14 deletions
diff --git a/src/Applet/CCApplet.cpp b/src/Applet/CCApplet.cpp index 52ce6191..0fb4c9ff 100644 --- a/src/Applet/CCApplet.cpp +++ b/src/Applet/CCApplet.cpp @@ -87,12 +87,13 @@ const gchar *CApplet::menu_xml = <property name=\"copyright\" translatable=\"yes\">Copyright © 2009 Red Hat, Inc</property>\ <property name=\"website\">https://fedorahosted.org/abrt/</property>\ <property name=\"website_label\" translatable=\"yes\">Website</property>\ - <property name=\"license\" translatable=\"yes\">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.\ -\ + <property name=\"license\" translatable=\"yes\">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/>.</property>\ <property name=\"authors\">Jiri Moskovcak <jmoskovc@redhat.com></property>\ + <property name=\"wrap_license\">True</property>\ <child internal-child=\"vbox\">\ <object class=\"GtkVBox\" id=\"dialog-vbox1\">\ <property name=\"visible\">True</property>\ diff --git a/src/Applet/CCApplet.h b/src/Applet/CCApplet.h index dccd70b7..90a79e26 100644 --- a/src/Applet/CCApplet.h +++ b/src/Applet/CCApplet.h @@ -24,7 +24,7 @@ #include <map> #include <string> #include <DBusClientProxy.h> -#include<libnotify/notify.h> +#include <libnotify/notify.h> class CApplet : public CDBusClient_proxy, diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am index 886102ff..5190649b 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/Applet/popup.GtkBuilder b/src/Applet/popup.GtkBuilder index baa5cf22..7a2ac2c4 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/>.</property> <property name="authors">Jiri Moskovcak <jmoskovc@redhat.com></property> + <property name="wrap_license">True</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> diff --git a/src/CLI/CommLayerClientDBus.cpp b/src/CLI/CommLayerClientDBus.cpp new file mode 100644 index 00000000..77983463 --- /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 00000000..9e63f58c --- /dev/null +++ b/src/CLI/CommLayerClientDBus.h @@ -0,0 +1,17 @@ +#include <DBusCommon.h> +#include <DBusClientProxy.h> +#include <iostream> + +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 6900bda1..be896020 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 diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp index 5e05be76..8c5f613b 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) |