Merge branch 'master' of git://git.fedorahosted.org/git/abrt

9 files changed, 26 insertions, 15 deletions

diff --git a/lib/CommLayer/Makefile.am b/lib/CommLayer/Makefile.am
index 74b3aa5..be0c52b 100644
--- a/lib/CommLayer/Makefile.am
+++ b/lib/CommLayer/Makefile.am
@@ -3,7 +3,6 @@ lib_LTLIBRARIES = libABRTCommLayer.la
 libABRTCommLayer_la_SOURCES = \
     DBusClientProxy.h DBusClientProxy.cpp \
     CommLayerInner.h CommLayerInner.cpp \
-    CommLayerClientDBus.h CommLayerClientDBus.cpp \
     Observer.h \
     DBusCommon.h
 libABRTCommLayer_la_LIBADD = \
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 =
     <property name=\"copyright\" translatable=\"yes\">Copyright &#xA9; 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 &lt;http://www.gnu.org/licenses/&gt;.</property>\
     <property name=\"authors\">Jiri Moskovcak  &lt;jmoskovc@redhat.com&gt;</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 dccd70b..90a79e2 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 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/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 &lt;http://www.gnu.org/licenses/&gt;.</property>
     <property name="authors">Jiri Moskovcak  &lt;jmoskovc@redhat.com&gt;</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/lib/CommLayer/CommLayerClientDBus.cpp b/src/CLI/CommLayerClientDBus.cpp
index 7798346..7798346 100644
--- a/lib/CommLayer/CommLayerClientDBus.cpp
+++ b/src/CLI/CommLayerClientDBus.cpp
diff --git a/lib/CommLayer/CommLayerClientDBus.h b/src/CLI/CommLayerClientDBus.h
index 9e63f58..9e63f58 100644
--- a/lib/CommLayer/CommLayerClientDBus.h
+++ b/src/CLI/CommLayerClientDBus.h
diff --git a/src/CLI/Makefile.am b/src/CLI/Makefile.am
index 6900bda..be89602 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 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)