diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-07 23:11:00 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-07 23:11:00 +0100 |
| commit | 4169595397ba962f230033b921964cae1629736d (patch) | |
| tree | 94e0a25a1c6b32e8b2d475ba3ab02d7ba7eaf075 /src/Applet | |
| parent | 8569385a9a7f679e32febafda8e8bdcfdf0fa64a (diff) | |
| parent | 2ce0dac4d05ce449f4d054c4725a852a43aab428 (diff) | |
Merge branch 'master' into rhel6
Diffstat (limited to 'src/Applet')
| -rw-r--r-- | src/Applet/Applet.cpp | 13 | ||||
| -rw-r--r-- | src/Applet/CCApplet.cpp | 11 | ||||
| -rw-r--r-- | src/Applet/CCApplet.h | 3 |
3 files changed, 12 insertions, 15 deletions
diff --git a/src/Applet/Applet.cpp b/src/Applet/Applet.cpp index c29a164..9398e4b 100644 --- a/src/Applet/Applet.cpp +++ b/src/Applet/Applet.cpp @@ -15,22 +15,21 @@ 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 <dbus/dbus-shared.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> #if HAVE_CONFIG_H - #include <config.h> +# include <config.h> #endif #if HAVE_LOCALE_H - #include <locale.h> +# include <locale.h> #endif #if ENABLE_NLS - #include <libintl.h> - #define _(S) gettext(S) +# include <libintl.h> +# define _(S) gettext(S) #else - #define _(S) (S) +# define _(S) (S) #endif #include "abrtlib.h" #include "abrt_dbus.h" diff --git a/src/Applet/CCApplet.cpp b/src/Applet/CCApplet.cpp index 9817f41..13a6eb6 100644 --- a/src/Applet/CCApplet.cpp +++ b/src/Applet/CCApplet.cpp @@ -15,16 +15,15 @@ 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. - */ - +*/ #if HAVE_CONFIG_H - #include <config.h> +# include <config.h> #endif #if ENABLE_NLS - #include <libintl.h> - #define _(S) gettext(S) +# include <libintl.h> +# define _(S) gettext(S) #else - #define _(S) (S) +# define _(S) (S) #endif #include "abrtlib.h" #include "CCApplet.h" diff --git a/src/Applet/CCApplet.h b/src/Applet/CCApplet.h index 48dbabc..a14498e 100644 --- a/src/Applet/CCApplet.h +++ b/src/Applet/CCApplet.h @@ -15,8 +15,7 @@ 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. - */ - +*/ #ifndef CC_APPLET_H_ #define CC_APPLET_H_ |