summaryrefslogtreecommitdiffstats
path: root/src/Applet
diff options
context:
space:
mode:
authordnovotny <danny@rawhide.localdomain>2009-09-14 09:40:28 -0400
committerdnovotny <danny@rawhide.localdomain>2009-09-14 09:40:28 -0400
commit648a9cd08da32494227c4d36a4401fd877d6e03a (patch)
tree40e6bd7ef22051ada9437ef22da9d2436a3fd358 /src/Applet
parent814506ae62986c3c3b667afdae7a33fe6b9e690f (diff)
parentac72b4b35e15c0823dc8c1f68684349a5e34c72a (diff)
Merge branch 'master' of git://git.fedorahosted.org/git/abrt
Diffstat (limited to 'src/Applet')
-rw-r--r--src/Applet/CCApplet.cpp9
-rw-r--r--src/Applet/CCApplet.h2
-rw-r--r--src/Applet/Makefile.am4
-rw-r--r--src/Applet/popup.GtkBuilder1
4 files changed, 10 insertions, 6 deletions
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>