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
1=== modified file 'configure.ac'
2--- configure.ac 2013-06-13 18:40:56 +0000
3+++ configure.ac 2013-08-21 15:11:36 +0000
4@@ -55,7 +55,7 @@
5 #
6 # libwnck
7 #
8-PKG_CHECK_MODULES(WNCK, libwnck-3.0 >= 3.4.5)
9+PKG_CHECK_MODULES(WNCK, libwnck-3.0 >= 3.4.7)
10
11 #
12 # libgtop
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2013-08-12 06:06:23 +0000
16+++ debian/changelog 2013-08-21 15:11:36 +0000
17@@ -4,6 +4,7 @@
18 * Remove deprecated and never used BamfTabSource
19 * Bump SONAME
20 * Update the package version to libbamf3-2
21+ * debian/control: depend on libwnck-3 3.4.7
22
23 [ Stephen M. Webb ]
24 * directly include bamf-tab.h in libbamf.h.
25
26=== modified file 'debian/control'
27--- debian/control 2013-08-09 15:24:39 +0000
28+++ debian/control 2013-08-21 15:11:36 +0000
29@@ -12,7 +12,7 @@
30 libgtop2-dev,
31 libgtk-3-dev (>= 3.0.0),
32 libunity-webapps-dev (>= 2.3.3),
33- libwnck-3-dev (>= 3.4.5),
34+ libwnck-3-dev (>= 3.4.7),
35 libgirepository1.0-dev,
36 python-libxslt1,
37 valac,
38
39=== modified file 'lib/libbamf-private/bamf-private.h'
40--- lib/libbamf-private/bamf-private.h 2013-07-20 14:57:45 +0000
41+++ lib/libbamf-private/bamf-private.h 2013-08-21 15:11:36 +0000
42@@ -31,6 +31,9 @@
43
44 #define BAMF_DBUS_DEFAULT_TIMEOUT 500
45
46+#define BAMF_DEFAULT_ICON_SIZE 128
47+#define BAMF_DEFAULT_MINI_ICON_SIZE 24
48+
49 /* GLib doesn't provide this by default */
50 #ifndef G_KEY_FILE_DESKTOP_KEY_FULLNAME
51 #define G_KEY_FILE_DESKTOP_KEY_FULLNAME "X-GNOME-FullName"
52
53=== modified file 'src/bamf-legacy-screen.c'
54--- src/bamf-legacy-screen.c 2013-06-13 18:40:56 +0000
55+++ src/bamf-legacy-screen.c 2013-08-21 15:11:36 +0000
56@@ -372,6 +372,7 @@
57 if (self->priv->stream)
58 g_object_unref (self->priv->stream);
59
60+ wnck_shutdown ();
61 static_screen = NULL;
62
63 G_OBJECT_CLASS (bamf_legacy_screen_parent_class)->finalize (object);
64@@ -441,6 +442,9 @@
65 if (g_strcmp0 (g_getenv ("BAMF_TEST_MODE"), "TRUE") == 0)
66 return static_screen;
67
68+ wnck_set_default_icon_size (BAMF_DEFAULT_ICON_SIZE);
69+ wnck_set_default_mini_icon_size (BAMF_DEFAULT_MINI_ICON_SIZE);
70+
71 self->priv->legacy_screen = wnck_screen_get_default ();
72
73 g_signal_connect (G_OBJECT (self->priv->legacy_screen), "window-opened",

Subscribers

People subscribed via source and target branches