Merge lp:~3v1n0/bamf/use-bigger-icons into lp:bamf

[Marco Trevisan (Treviño)]

BamfLegacyScreen: use bigger icons size by default

libwnck would just use 32 and 16 sized icons, while we can safely use bigger versions.

This needs new libwnck (3.4.7 or https://git.gnome.org/browse/libwnck/commit/?id=7b9f3a3) about to land in ubuntu soon.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:592
http://jenkins.qa.ubuntu.com/job/bamf-ci/88/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/70/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:592
http://jenkins.qa.ubuntu.com/job/bamf-ci/89/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/70
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/71

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

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/bamf-autolanding/53/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-autolanding/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-autolanding/44/console
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/1566/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:593
http://jenkins.qa.ubuntu.com/job/bamf-ci/90/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/72/console

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

review: Needs Fixing (continuous-integration)

[lp:~3v1n0/bamf/use-bigger-icons]

594. By Marco Trevisan (Treviño) on 2013-08-21

Merging with trunk

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'configure.ac'
--- configure.ac	2013-06-13 18:40:56 +0000
+++ configure.ac	2013-08-21 15:11:36 +0000
@@ -55,7 +55,7 @@
 #
 # libwnck
 #
-PKG_CHECK_MODULES(WNCK, libwnck-3.0 >= 3.4.5)
+PKG_CHECK_MODULES(WNCK, libwnck-3.0 >= 3.4.7)
 
 #
 # libgtop

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-12 06:06:23 +0000
+++ debian/changelog	2013-08-21 15:11:36 +0000
@@ -4,6 +4,7 @@
   * Remove deprecated and never used BamfTabSource
   * Bump SONAME
   * Update the package version to libbamf3-2
+  * debian/control: depend on libwnck-3 3.4.7
 
   [ Stephen M. Webb ]
   * directly include bamf-tab.h in libbamf.h.

=== modified file 'debian/control'
--- debian/control	2013-08-09 15:24:39 +0000
+++ debian/control	2013-08-21 15:11:36 +0000
@@ -12,7 +12,7 @@
                libgtop2-dev,
                libgtk-3-dev (>= 3.0.0),
                libunity-webapps-dev (>= 2.3.3),
-               libwnck-3-dev (>= 3.4.5),
+               libwnck-3-dev (>= 3.4.7),
                libgirepository1.0-dev,
                python-libxslt1,
                valac,

=== modified file 'lib/libbamf-private/bamf-private.h'
--- lib/libbamf-private/bamf-private.h	2013-07-20 14:57:45 +0000
+++ lib/libbamf-private/bamf-private.h	2013-08-21 15:11:36 +0000
@@ -31,6 +31,9 @@
 
 #define BAMF_DBUS_DEFAULT_TIMEOUT 500
 
+#define BAMF_DEFAULT_ICON_SIZE 128
+#define BAMF_DEFAULT_MINI_ICON_SIZE 24
+
 /* GLib doesn't provide this by default */
 #ifndef G_KEY_FILE_DESKTOP_KEY_FULLNAME
 #define G_KEY_FILE_DESKTOP_KEY_FULLNAME "X-GNOME-FullName"

=== modified file 'src/bamf-legacy-screen.c'
--- src/bamf-legacy-screen.c	2013-06-13 18:40:56 +0000
+++ src/bamf-legacy-screen.c	2013-08-21 15:11:36 +0000
@@ -372,6 +372,7 @@
   if (self->priv->stream)
     g_object_unref (self->priv->stream);
 
+  wnck_shutdown ();
   static_screen = NULL;
 
   G_OBJECT_CLASS (bamf_legacy_screen_parent_class)->finalize (object);
@@ -441,6 +442,9 @@
   if (g_strcmp0 (g_getenv ("BAMF_TEST_MODE"), "TRUE") == 0)
     return static_screen;
 
+  wnck_set_default_icon_size (BAMF_DEFAULT_ICON_SIZE);
+  wnck_set_default_mini_icon_size (BAMF_DEFAULT_MINI_ICON_SIZE);
+
   self->priv->legacy_screen = wnck_screen_get_default ();
 
   g_signal_connect (G_OBJECT (self->priv->legacy_screen), "window-opened",