Merge lp:~muktupavels/metacity/adwaita-icon-theme-lp-1414613 into lp:ubuntu/vivid/metacity

Proposed by Alberts Muktupāvels on 2015-01-26
Status: Merged
Merged at revision: 140
Proposed branch: lp:~muktupavels/metacity/adwaita-icon-theme-lp-1414613
Merge into: lp:ubuntu/vivid/metacity
Diff against target: 86 lines (+34/-3)
5 files modified
.pc/applied-patches (+1/-0)
debian/control.in (+1/-1)
debian/patches/preview-widget-use-correct-name-for-missing-icon.patch (+29/-0)
debian/patches/series (+1/-0)
src/ui/preview-widget.c (+2/-2)
To merge this branch: bzr merge lp:~muktupavels/metacity/adwaita-icon-theme-lp-1414613
Reviewer Review Type Date Requested Status
Dmitry Shachnev 2015-01-26 Approve on 2015-01-31
Review via email: mp+247621@code.launchpad.net

Commit message

Update metacity deps, change gnome-icon-theme to adwaita-icon-theme.

Description of the change

Update metacity deps, change gnome-icon-theme to adwaita-icon-theme.

To post a comment you must log in.
Dmitry Shachnev (mitya57) wrote :

Thanks, uploaded. In future please subscribe myself directly to your merge proposals, so that I get a mail about them.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.pc/applied-patches'
2--- .pc/applied-patches 2015-01-08 18:28:54 +0000
3+++ .pc/applied-patches 2015-01-26 17:14:11 +0000
4@@ -1,3 +1,4 @@
5 05_raise_on_click_for_click_mode.patch
6 fix_switch_applications.patch
7 keycode_to_keysym.patch
8+preview-widget-use-correct-name-for-missing-icon.patch
9
10=== modified file 'debian/control.in'
11--- debian/control.in 2014-11-18 18:13:01 +0000
12+++ debian/control.in 2015-01-26 17:14:11 +0000
13@@ -37,7 +37,7 @@
14
15 Package: metacity
16 Architecture: any
17-Depends: gnome-icon-theme,
18+Depends: adwaita-icon-theme,
19 gsettings-desktop-schemas (>= 3.3.0),
20 metacity-common (= ${source:Version}),
21 zenity,
22
23=== added file 'debian/patches/preview-widget-use-correct-name-for-missing-icon.patch'
24--- debian/patches/preview-widget-use-correct-name-for-missing-icon.patch 1970-01-01 00:00:00 +0000
25+++ debian/patches/preview-widget-use-correct-name-for-missing-icon.patch 2015-01-26 17:14:11 +0000
26@@ -0,0 +1,29 @@
27+From 5f8df557b8dbe962f19e8b641c007073665ff878 Mon Sep 17 00:00:00 2001
28+From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
29+Date: Mon, 26 Jan 2015 18:54:30 +0200
30+Subject: [PATCH] preview-widget: use correct name for missing icon
31+
32+---
33+ src/ui/preview-widget.c | 4 ++--
34+ 1 file changed, 2 insertions(+), 2 deletions(-)
35+
36+--- a/src/ui/preview-widget.c
37++++ b/src/ui/preview-widget.c
38+@@ -441,7 +441,7 @@
39+ NULL);
40+ else
41+ default_icon = gtk_icon_theme_load_icon (theme,
42+- "gtk-missing-image",
43++ "image-missing",
44+ META_ICON_WIDTH,
45+ 0,
46+ NULL);
47+@@ -474,7 +474,7 @@
48+ NULL);
49+ else
50+ default_icon = gtk_icon_theme_load_icon (theme,
51+- "gtk-missing-image",
52++ "image-missing",
53+ META_MINI_ICON_WIDTH,
54+ 0,
55+ NULL);
56
57=== modified file 'debian/patches/series'
58--- debian/patches/series 2015-01-08 18:28:54 +0000
59+++ debian/patches/series 2015-01-26 17:14:11 +0000
60@@ -1,3 +1,4 @@
61 05_raise_on_click_for_click_mode.patch
62 fix_switch_applications.patch
63 keycode_to_keysym.patch
64+preview-widget-use-correct-name-for-missing-icon.patch
65
66=== modified file 'src/ui/preview-widget.c'
67--- src/ui/preview-widget.c 2015-01-08 16:56:52 +0000
68+++ src/ui/preview-widget.c 2015-01-26 17:14:11 +0000
69@@ -441,7 +441,7 @@
70 NULL);
71 else
72 default_icon = gtk_icon_theme_load_icon (theme,
73- "gtk-missing-image",
74+ "image-missing",
75 META_ICON_WIDTH,
76 0,
77 NULL);
78@@ -474,7 +474,7 @@
79 NULL);
80 else
81 default_icon = gtk_icon_theme_load_icon (theme,
82- "gtk-missing-image",
83+ "image-missing",
84 META_MINI_ICON_WIDTH,
85 0,
86 NULL);

Subscribers

People subscribed via source and target branches