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

Proposed by Marco Trevisan (Treviño) on 2013-08-20
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2013-08-21
Approved revision: 594
Merged at revision: 582
Proposed branch: lp:~3v1n0/bamf/use-bigger-icons
Merge into: lp:bamf
Diff against target: 73 lines (+10/-2)
5 files modified
configure.ac (+1/-1)
debian/changelog (+1/-0)
debian/control (+1/-1)
lib/libbamf-private/bamf-private.h (+3/-0)
src/bamf-legacy-screen.c (+4/-0)
To merge this branch: bzr merge lp:~3v1n0/bamf/use-bigger-icons
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-08-21
Andrea Azzarone (community) 2013-08-20 Approve on 2013-08-21
Review via email: mp+181073@code.launchpad.net

Commit message

BamfLegacyScreen: use bigger icons size by default

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

Description of the change

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

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Andrea Azzarone (azzar1) wrote :

LGTM.

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~3v1n0/bamf/use-bigger-icons updated on 2013-08-21
594. By Marco Trevisan (Treviño) on 2013-08-21

Merging with trunk

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
55#55#
56# libwnck56# libwnck
57#57#
58PKG_CHECK_MODULES(WNCK, libwnck-3.0 >= 3.4.5)58PKG_CHECK_MODULES(WNCK, libwnck-3.0 >= 3.4.7)
5959
60#60#
61# libgtop61# libgtop
6262
=== 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 @@
4 * Remove deprecated and never used BamfTabSource4 * Remove deprecated and never used BamfTabSource
5 * Bump SONAME5 * Bump SONAME
6 * Update the package version to libbamf3-26 * Update the package version to libbamf3-2
7 * debian/control: depend on libwnck-3 3.4.7
78
8 [ Stephen M. Webb ]9 [ Stephen M. Webb ]
9 * directly include bamf-tab.h in libbamf.h.10 * directly include bamf-tab.h in libbamf.h.
1011
=== 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 @@
12 libgtop2-dev,12 libgtop2-dev,
13 libgtk-3-dev (>= 3.0.0),13 libgtk-3-dev (>= 3.0.0),
14 libunity-webapps-dev (>= 2.3.3),14 libunity-webapps-dev (>= 2.3.3),
15 libwnck-3-dev (>= 3.4.5),15 libwnck-3-dev (>= 3.4.7),
16 libgirepository1.0-dev,16 libgirepository1.0-dev,
17 python-libxslt1,17 python-libxslt1,
18 valac,18 valac,
1919
=== 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 @@
3131
32#define BAMF_DBUS_DEFAULT_TIMEOUT 50032#define BAMF_DBUS_DEFAULT_TIMEOUT 500
3333
34#define BAMF_DEFAULT_ICON_SIZE 128
35#define BAMF_DEFAULT_MINI_ICON_SIZE 24
36
34/* GLib doesn't provide this by default */37/* GLib doesn't provide this by default */
35#ifndef G_KEY_FILE_DESKTOP_KEY_FULLNAME38#ifndef G_KEY_FILE_DESKTOP_KEY_FULLNAME
36#define G_KEY_FILE_DESKTOP_KEY_FULLNAME "X-GNOME-FullName"39#define G_KEY_FILE_DESKTOP_KEY_FULLNAME "X-GNOME-FullName"
3740
=== 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 @@
372 if (self->priv->stream)372 if (self->priv->stream)
373 g_object_unref (self->priv->stream);373 g_object_unref (self->priv->stream);
374374
375 wnck_shutdown ();
375 static_screen = NULL;376 static_screen = NULL;
376377
377 G_OBJECT_CLASS (bamf_legacy_screen_parent_class)->finalize (object);378 G_OBJECT_CLASS (bamf_legacy_screen_parent_class)->finalize (object);
@@ -441,6 +442,9 @@
441 if (g_strcmp0 (g_getenv ("BAMF_TEST_MODE"), "TRUE") == 0)442 if (g_strcmp0 (g_getenv ("BAMF_TEST_MODE"), "TRUE") == 0)
442 return static_screen;443 return static_screen;
443444
445 wnck_set_default_icon_size (BAMF_DEFAULT_ICON_SIZE);
446 wnck_set_default_mini_icon_size (BAMF_DEFAULT_MINI_ICON_SIZE);
447
444 self->priv->legacy_screen = wnck_screen_get_default ();448 self->priv->legacy_screen = wnck_screen_get_default ();
445449
446 g_signal_connect (G_OBJECT (self->priv->legacy_screen), "window-opened",450 g_signal_connect (G_OBJECT (self->priv->legacy_screen), "window-opened",

Subscribers

People subscribed via source and target branches