Merge lp:~robert-ancell/bamf/lp740844 into lp:bamf/0.4

Proposed by Robert Ancell
Status: Merged
Merged at revision: 398
Proposed branch: lp:~robert-ancell/bamf/lp740844
Merge into: lp:bamf/0.4
Diff against target: 26 lines (+1/-8)
1 file modified
src/bamf-application.c (+1/-8)
To merge this branch: bzr merge lp:~robert-ancell/bamf/lp740844
Reviewer Review Type Date Requested Status
Jason Smith (community) Approve
Review via email: mp+58075@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jason Smith (jassmith) wrote :

+1 this might effect other things negatively, but I still think it is a net win

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/bamf-application.c'
2--- src/bamf-application.c 2011-04-08 23:30:56 +0000
3+++ src/bamf-application.c 2011-04-18 06:51:33 +0000
4@@ -185,7 +185,7 @@
5 }
6 while (FALSE);
7
8- name = g_strdup (bamf_legacy_window_get_class_name (bamf_window_get_window (window)));
9+ name = g_strdup (bamf_legacy_window_get_name (bamf_window_get_window (window)));
10 }
11
12 if (!icon)
13@@ -438,13 +438,6 @@
14 (GCallback) view_exported, view);
15 }
16
17- // If we're not a real application, get some properties from our first child
18- if (application->priv->desktop_file == NULL)
19- {
20- if (bamf_view_get_name (view) == NULL)
21- bamf_view_set_name (view, bamf_view_get_name (child));
22- }
23-
24 g_signal_connect (G_OBJECT (child), "active-changed",
25 (GCallback) view_active_changed, view);
26 g_signal_connect (G_OBJECT (child), "urgent-changed",

Subscribers

People subscribed via source and target branches