Merge lp:~om26er/ubuntu/natty/totem/totem-fix-647607 into lp:~ubuntu-desktop/totem/ubuntu

Proposed by Omer Akram
Status: Merged
Merged at revision: 97
Proposed branch: lp:~om26er/ubuntu/natty/totem/totem-fix-647607
Merge into: lp:~ubuntu-desktop/totem/ubuntu
Diff against target: 290 lines (+138/-110)
7 files modified
debian/changelog (+8/-0)
debian/patches/71_add_show_tooltip_uri_property.patch (+84/-0)
debian/patches/72_dont_display_URIs_in_youtube_tooltips.patch (+25/-0)
debian/patches/73_show_video_title.patch (+18/-0)
debian/patches/add_show_tooltip_uri_property.patch (+0/-83)
debian/patches/dont_display_URIs_in_youtube_tooltips.patch (+0/-24)
debian/patches/series (+3/-3)
To merge this branch: bzr merge lp:~om26er/ubuntu/natty/totem/totem-fix-647607
Reviewer Review Type Date Requested Status
Jani Monoses (community) Approve
Review via email: mp+47903@code.launchpad.net

Description of the change

backported the fix for bug 647607 from upstream git. patch is named 73_show_video_title.patch

also renamed the existing two patches from me to 71_add_show_tooltip_uri_property.patch and 72_dont_display_URIs_in_youtube_tooltips.patch from add_show_tooltip_uri_property.patch and dont_display_URIs_in_youtube_tooltips.patch respectively and moved them up the series. also added an 'Author' field to those existing patches.

In summary the real change is only a one line fix :)

To post a comment you must log in.
Revision history for this message
Jani Monoses (jani) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-01-27 08:47:55 +0000
3+++ debian/changelog 2011-01-29 15:39:13 +0000
4@@ -1,3 +1,11 @@
5+totem (2.32.0-0ubuntu8) natty; urgency=low
6+
7+ * debian/patches/73_show_video_title.patch:
8+ - show youtube videos with their original title. (LP: #647607)
9+ * renamed and moved two existing patches up the series.
10+
11+ -- Omer Akram <om26er@ubuntu.com> Sat, 29 Jan 2011 19:52:24 +0500
12+
13 totem (2.32.0-0ubuntu7) natty; urgency=low
14
15 * debian/control.in: Drop unnecessary and obsolete libhal-dev build
16
17=== added file 'debian/patches/71_add_show_tooltip_uri_property.patch'
18--- debian/patches/71_add_show_tooltip_uri_property.patch 1970-01-01 00:00:00 +0000
19+++ debian/patches/71_add_show_tooltip_uri_property.patch 2011-01-29 15:39:13 +0000
20@@ -0,0 +1,84 @@
21+From: Omer Akram <om26er@ubuntu.com>
22+Author: Philip Withnall <philip@tecnocode.co.uk>
23+Subject: Add a TotemVideoList::show-tooltip-uri property.
24+Origin: http://git.gnome.org/browse/totem/commit/?id=19857f506a3ff83b14ce461072ce4edadd612557
25+Bug: https://bugs.gnome.org/629548
26+Bug-Ubuntu: https://launchpad.net/bugs/696171
27+
28+--- a/src/totem-video-list.c
29++++ b/src/totem-video-list.c
30+@@ -58,6 +58,7 @@ struct _TotemVideoListPrivate {
31+ GtkBuilder *xml;
32+ GtkActionGroup *action_group;
33+ GtkUIManager *ui_manager;
34++ gboolean show_tooltip_uri;
35+ };
36+
37+ #define TOTEM_VIDEO_LIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TOTEM_TYPE_VIDEO_LIST, TotemVideoListPrivate))
38+@@ -65,7 +66,8 @@ struct _TotemVideoListPrivate {
39+ enum {
40+ PROP_TOOLTIP_COLUMN = 1,
41+ PROP_MRL_COLUMN,
42+- PROP_TOTEM
43++ PROP_TOTEM,
44++ PROP_SHOW_TOOLTIP_URI
45+ };
46+
47+ enum {
48+@@ -156,6 +158,18 @@ totem_video_list_class_init (TotemVideoListClass *klass)
49+ TOTEM_TYPE_OBJECT, G_PARAM_READWRITE));
50+
51+ /**
52++ * TotemVideoList:show-tooltip-uri:
53++ *
54++ * If this is %TRUE, the URI of each video will be displayed in the tooltip for that video (or a message saying "No video URI" will be
55++ * displayed if the URI is unset); otherwise, the tooltip will only display the video name.
56++ *
57++ * Since: 2.90.6
58++ **/
59++ g_object_class_install_property (object_class, PROP_SHOW_TOOLTIP_URI,
60++ g_param_spec_boolean ("show-tooltip-uri", NULL, NULL,
61++ TRUE, G_PARAM_READWRITE));
62++
63++ /**
64+ * TotemVideoList::starting-video:
65+ * @video_list: the #TotemVideoList which received the signal
66+ * @tree_path: the #GtkTreePath of the video row about to be played
67+@@ -184,6 +198,7 @@ totem_video_list_init (TotemVideoList *self)
68+ self->priv->totem = NULL;
69+ self->priv->tooltip_column = -1;
70+ self->priv->mrl_column = -1;
71++ self->priv->show_tooltip_uri = TRUE;
72+
73+ /* Get the interface */
74+ self->priv->xml = totem_interface_load ("video-list.ui", TRUE, NULL, self);
75+@@ -246,6 +261,10 @@ totem_video_list_set_property (GObject *object, guint property_id, const GValue
76+ priv->totem = (Totem*) g_value_dup_object (value);
77+ g_object_notify (object, "totem");
78+ break;
79++ case PROP_SHOW_TOOLTIP_URI:
80++ priv->show_tooltip_uri = g_value_get_boolean (value);
81++ g_object_notify (object, "show-tooltip-uri");
82++ break;
83+ default:
84+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
85+ }
86+@@ -267,6 +286,9 @@ totem_video_list_get_property (GObject *object, guint property_id, GValue *value
87+ case PROP_TOTEM:
88+ g_value_set_object (value, G_OBJECT (priv->totem));
89+ break;
90++ case PROP_SHOW_TOOLTIP_URI:
91++ g_value_set_boolean (value, priv->show_tooltip_uri);
92++ break;
93+ default:
94+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
95+ }
96+@@ -292,7 +314,7 @@ query_tooltip_cb (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, Gtk
97+ &model, &path, &iter))
98+ return FALSE;
99+
100+- if (self->priv->mrl_column == -1) {
101++ if (self->priv->mrl_column == -1 || self->priv->show_tooltip_uri == FALSE) {
102+ gtk_tree_model_get (model, &iter, self->priv->tooltip_column, &tooltip_text, -1);
103+ gtk_tooltip_set_text (tooltip, tooltip_text);
104+ g_free (tooltip_text);
105
106=== added file 'debian/patches/72_dont_display_URIs_in_youtube_tooltips.patch'
107--- debian/patches/72_dont_display_URIs_in_youtube_tooltips.patch 1970-01-01 00:00:00 +0000
108+++ debian/patches/72_dont_display_URIs_in_youtube_tooltips.patch 2011-01-29 15:39:13 +0000
109@@ -0,0 +1,25 @@
110+From: Omer Akram <om26er@ubuntu.com>
111+Author: Philip Withnall <philip@tecnocode.co.uk>
112+Subject: Don't display URIs in YouTube tooltips.
113+Origin: http://git.gnome.org/browse/totem/commit/?id=b4d4d139629fca931a9b24fb71d9c1301ef903e5
114+Bug: https://bugs.gnome.org/629548
115+Bug-Ubuntu: https://launchpad.net/bugs/696171
116+
117+--- a/src/plugins/youtube/youtube.ui
118++++ b/src/plugins/youtube/youtube.ui
119+@@ -87,6 +87,7 @@
120+ <property name="tooltip-column">1</property>
121+ <property name="mrl-column">2</property>
122+ <property name="model">yt_list_store_search</property>
123++ <property name="show-tooltip-uri">False</property>
124+ <signal name="starting-video" handler="starting_video_cb"/>
125+ <child>
126+ <object class="GtkTreeViewColumn" id="yt_treeview_search_column">
127+@@ -133,6 +134,7 @@
128+ <property name="tooltip-column">1</property>
129+ <property name="mrl-column">2</property>
130+ <property name="model">yt_list_store_related</property>
131++ <property name="show-tooltip-uri">False</property>
132+ <signal name="starting-video" handler="starting_video_cb"/>
133+ <child>
134+ <object class="GtkTreeViewColumn" id="yt_treeview_related_column">
135
136=== added file 'debian/patches/73_show_video_title.patch'
137--- debian/patches/73_show_video_title.patch 1970-01-01 00:00:00 +0000
138+++ debian/patches/73_show_video_title.patch 2011-01-29 15:39:13 +0000
139@@ -0,0 +1,18 @@
140+From: Omer Akram <om26er@ubuntu.com>
141+Author: Philip Withnall <philip@tecnocode.co.uk>
142+Subject: Totem shows 'videoplayback' instead of the video title.
143+Origin: http://git.gnome.org/browse/totem/commit/?id=3bbc968ce21b0af0f586169cec87e60493d4af7c
144+Bug: https://bugs.gnome.org/638567
145+Bug-Ubuntu: https://launchpad.net/bugs/647607
146+
147+--- a/src/totem-object.c
148++++ b/src/totem-object.c
149+@@ -505,7 +505,7 @@ add_to_playlist_and_play_cb (TotemPlaylist *playlist, GAsyncResult *async_result
150+ playlist_changed = totem_playlist_add_mrl_finish (playlist, async_result);
151+
152+ if (data->add_to_recent != FALSE)
153+- gtk_recent_manager_add_item (data->totem->recent_manager, data->uri);
154++ totem_action_add_recent (data->totem, data->uri, data->display_name);
155+ end = totem_playlist_get_last (playlist);
156+
157+ totem_signal_unblock_by_data (playlist, data->totem);
158
159=== removed file 'debian/patches/add_show_tooltip_uri_property.patch'
160--- debian/patches/add_show_tooltip_uri_property.patch 2011-01-04 16:33:09 +0000
161+++ debian/patches/add_show_tooltip_uri_property.patch 1970-01-01 00:00:00 +0000
162@@ -1,83 +0,0 @@
163-From: Philip Withnall <philip@tecnocode.co.uk>
164-Subject: Add a TotemVideoList::show-tooltip-uri property.
165-Origin: http://git.gnome.org/browse/totem/commit/?id=19857f506a3ff83b14ce461072ce4edadd612557
166-Bug: https://bugs.gnome.org/629548
167-Bug-Ubuntu: https://launchpad.net/bugs/696171
168-
169---- a/src/totem-video-list.c
170-+++ b/src/totem-video-list.c
171-@@ -58,6 +58,7 @@ struct _TotemVideoListPrivate {
172- GtkBuilder *xml;
173- GtkActionGroup *action_group;
174- GtkUIManager *ui_manager;
175-+ gboolean show_tooltip_uri;
176- };
177-
178- #define TOTEM_VIDEO_LIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TOTEM_TYPE_VIDEO_LIST, TotemVideoListPrivate))
179-@@ -65,7 +66,8 @@ struct _TotemVideoListPrivate {
180- enum {
181- PROP_TOOLTIP_COLUMN = 1,
182- PROP_MRL_COLUMN,
183-- PROP_TOTEM
184-+ PROP_TOTEM,
185-+ PROP_SHOW_TOOLTIP_URI
186- };
187-
188- enum {
189-@@ -156,6 +158,18 @@ totem_video_list_class_init (TotemVideoListClass *klass)
190- TOTEM_TYPE_OBJECT, G_PARAM_READWRITE));
191-
192- /**
193-+ * TotemVideoList:show-tooltip-uri:
194-+ *
195-+ * If this is %TRUE, the URI of each video will be displayed in the tooltip for that video (or a message saying "No video URI" will be
196-+ * displayed if the URI is unset); otherwise, the tooltip will only display the video name.
197-+ *
198-+ * Since: 2.90.6
199-+ **/
200-+ g_object_class_install_property (object_class, PROP_SHOW_TOOLTIP_URI,
201-+ g_param_spec_boolean ("show-tooltip-uri", NULL, NULL,
202-+ TRUE, G_PARAM_READWRITE));
203-+
204-+ /**
205- * TotemVideoList::starting-video:
206- * @video_list: the #TotemVideoList which received the signal
207- * @tree_path: the #GtkTreePath of the video row about to be played
208-@@ -184,6 +198,7 @@ totem_video_list_init (TotemVideoList *self)
209- self->priv->totem = NULL;
210- self->priv->tooltip_column = -1;
211- self->priv->mrl_column = -1;
212-+ self->priv->show_tooltip_uri = TRUE;
213-
214- /* Get the interface */
215- self->priv->xml = totem_interface_load ("video-list.ui", TRUE, NULL, self);
216-@@ -246,6 +261,10 @@ totem_video_list_set_property (GObject *object, guint property_id, const GValue
217- priv->totem = (Totem*) g_value_dup_object (value);
218- g_object_notify (object, "totem");
219- break;
220-+ case PROP_SHOW_TOOLTIP_URI:
221-+ priv->show_tooltip_uri = g_value_get_boolean (value);
222-+ g_object_notify (object, "show-tooltip-uri");
223-+ break;
224- default:
225- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
226- }
227-@@ -267,6 +286,9 @@ totem_video_list_get_property (GObject *object, guint property_id, GValue *value
228- case PROP_TOTEM:
229- g_value_set_object (value, G_OBJECT (priv->totem));
230- break;
231-+ case PROP_SHOW_TOOLTIP_URI:
232-+ g_value_set_boolean (value, priv->show_tooltip_uri);
233-+ break;
234- default:
235- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
236- }
237-@@ -292,7 +314,7 @@ query_tooltip_cb (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, Gtk
238- &model, &path, &iter))
239- return FALSE;
240-
241-- if (self->priv->mrl_column == -1) {
242-+ if (self->priv->mrl_column == -1 || self->priv->show_tooltip_uri == FALSE) {
243- gtk_tree_model_get (model, &iter, self->priv->tooltip_column, &tooltip_text, -1);
244- gtk_tooltip_set_text (tooltip, tooltip_text);
245- g_free (tooltip_text);
246
247=== removed file 'debian/patches/dont_display_URIs_in_youtube_tooltips.patch'
248--- debian/patches/dont_display_URIs_in_youtube_tooltips.patch 2011-01-04 05:58:45 +0000
249+++ debian/patches/dont_display_URIs_in_youtube_tooltips.patch 1970-01-01 00:00:00 +0000
250@@ -1,24 +0,0 @@
251-From: Philip Withnall <philip@tecnocode.co.uk>
252-Subject: Don't display URIs in YouTube tooltips.
253-Origin: http://git.gnome.org/browse/totem/commit/?id=b4d4d139629fca931a9b24fb71d9c1301ef903e5
254-Bug: https://bugs.gnome.org/629548
255-Bug-Ubuntu: https://launchpad.net/bugs/696171
256-
257---- a/src/plugins/youtube/youtube.ui
258-+++ b/src/plugins/youtube/youtube.ui
259-@@ -87,6 +87,7 @@
260- <property name="tooltip-column">1</property>
261- <property name="mrl-column">2</property>
262- <property name="model">yt_list_store_search</property>
263-+ <property name="show-tooltip-uri">False</property>
264- <signal name="starting-video" handler="starting_video_cb"/>
265- <child>
266- <object class="GtkTreeViewColumn" id="yt_treeview_search_column">
267-@@ -133,6 +134,7 @@
268- <property name="tooltip-column">1</property>
269- <property name="mrl-column">2</property>
270- <property name="model">yt_list_store_related</property>
271-+ <property name="show-tooltip-uri">False</property>
272- <signal name="starting-video" handler="starting_video_cb"/>
273- <child>
274- <object class="GtkTreeViewColumn" id="yt_treeview_related_column">
275
276=== modified file 'debian/patches/series'
277--- debian/patches/series 2011-01-04 16:33:09 +0000
278+++ debian/patches/series 2011-01-29 15:39:13 +0000
279@@ -1,8 +1,8 @@
280-add_show_tooltip_uri_property.patch
281-dont_display_URIs_in_youtube_tooltips.patch
282 01_fake_keypresses.patch
283 02_lpi.patch
284 07_disable_web_browser_midi.patch
285 08_scrsaver_startup_inhibit.patch
286 70_bbc_plugin.patch
287-
288+71_add_show_tooltip_uri_property.patch
289+72_dont_display_URIs_in_youtube_tooltips.patch
290+73_show_video_title.patch

Subscribers

People subscribed via source and target branches

to all changes: