Merge lp:~3v1n0/bamf/distros-compile-fixes into lp:bamf

[Marco Trevisan (Treviño)]

BamfDaemon, LibBamf: Fix compilation errors out from ubuntu

Other distros such as Arch Linux have troubles to compile BAMF due to different CFLAGS parameters or to missing glib declarations, fixing this.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:545
http://jenkins.qa.ubuntu.com/job/bamf-ci/44/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/25
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/25/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/bamf-ci/44/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Merges and compiles cleanly. LGTM!

review: Approve

[Christopher Townsend (townsend)]

I see the arm CI failed because of the -Wcast-align flag. Let's see what this is about before merging this.

[lp:~3v1n0/bamf/distros-compile-fixes]

546. By Marco Trevisan (Treviño) on 2013-06-10

configure.ac: don't bother about cast-align or the generated code won't work as expected in ARM buidlds.

[Marco Trevisan (Treviño) (3v1n0)]

> I see the arm CI failed because of the -Wcast-align flag. Let's see what this
> is about before merging this.

Mh, weird... However since that problem is into some generated code, the only thing we can do for now is not use the Wcast-align flag :(

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'configure.ac'
--- configure.ac	2013-06-07 07:36:18 +0000
+++ configure.ac	2013-06-10 21:28:23 +0000
@@ -153,7 +153,7 @@
 AM_PATH_GTK_3_0
 
 dnl CFLAGS
-CFLAGS="$CFLAGS -Wall -Werror -lm"
+CFLAGS="$CFLAGS -Wall -Werror -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration -lm"
 
 AC_SUBST(BAMFDAEMON_CFLAGS)
 AC_SUBST(BAMFDAEMON_LIBS)

=== modified file 'lib/libbamf/bamf-application.c'
--- lib/libbamf/bamf-application.c	2013-06-07 07:36:18 +0000
+++ lib/libbamf/bamf-application.c	2013-06-10 21:28:23 +0000
@@ -291,7 +291,7 @@
     {
       view = l->data;
 
-      if (BAMF_IS_WINDOW (view));
+      if (BAMF_IS_WINDOW (view))
         {
           windows = g_list_prepend (windows, view);
         }
@@ -641,6 +641,11 @@
 
   name = g_strdup (g_app_info_get_name (G_APP_INFO (desktop_info)));
 
+/* GLib doesn't provide this by default */
+#ifndef G_KEY_FILE_DESKTOP_KEY_FULLNAME
+#define G_KEY_FILE_DESKTOP_KEY_FULLNAME "X-GNOME-FullName"
+#endif
+
   /* Grab the better name if its available */
   fullname = g_key_file_get_locale_string (keyfile, G_KEY_FILE_DESKTOP_GROUP,
                                            G_KEY_FILE_DESKTOP_KEY_FULLNAME, NULL, NULL);

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2013-06-07 07:36:18 +0000
+++ src/bamf-matcher.c	2013-06-10 21:28:23 +0000
@@ -23,6 +23,7 @@
 #include "bamf-matcher.h"
 #include "bamf-matcher-private.h"
 #include "bamf-application.h"
+#include "bamf-tab.h"
 #include "bamf-window.h"
 #include "bamf-legacy-screen.h"
 

=== modified file 'src/bamf-tab.h'
--- src/bamf-tab.h	2013-06-07 07:36:18 +0000
+++ src/bamf-tab.h	2013-06-10 21:28:23 +0000
@@ -40,7 +40,7 @@
 struct _BamfTabClass
 {
   BamfViewClass parent;
-  
+
   void (*raise) (BamfTab *self);
   void (*close) (BamfTab *self);
   void (*request_preview) (BamfTab *self, BamfTabPreviewReadyCallback callback, gpointer user_data);