BAMF

Merge lp:~3v1n0/bamf/bamf-desktop-file-atom into lp:bamf

  1. bamf-desktop-file-atom
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 612
Merged at revision: 610
Proposed branch: lp:~3v1n0/bamf/bamf-desktop-file-atom
Merge into: lp:bamf
Prerequisite: lp:~larsu/bamf/fixup-gtk-application-matching
Diff against target: 116 lines (+12/-12)
3 files modified
src/bamf-matcher.c (+6/-6)
src/bamf-matcher.h (+1/-1)
tests/bamfdaemon/test-matcher.c (+5/-5)
To merge this branch: bzr merge lp:~3v1n0/bamf/bamf-desktop-file-atom
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
Unity Team Pending
Review via email: mp+248222@code.launchpad.net

Commit message

BamfMatcher: rename set our atom to _BAMF_DESKTOP_FILE

It has never been standard

To post a comment you must log in.
Revision history for this message
Lars Karlitski (larsu) wrote :

Looks good and works. Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/bamf-matcher.c'
2--- src/bamf-matcher.c 2015-02-02 10:08:22 +0000
3+++ src/bamf-matcher.c 2015-02-02 10:08:22 +0000
4@@ -1630,7 +1630,7 @@
5
6 priv = self->priv;
7 window = bamf_window_get_window (bamf_window);
8- desktop_file = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);
9+ desktop_file = bamf_legacy_window_get_hint (window, _BAMF_DESKTOP_FILE);
10 class_name = bamf_legacy_window_get_class_name (window);
11 instance_name = bamf_legacy_window_get_class_instance_name (window);
12
13@@ -2022,7 +2022,7 @@
14 return;
15 }
16
17- desktop_file_hint = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);
18+ desktop_file_hint = bamf_legacy_window_get_hint (window, _BAMF_DESKTOP_FILE);
19
20 if (desktop_file_hint)
21 {
22@@ -2058,7 +2058,7 @@
23 g_list_free (pids);
24
25 if (desktop_file_hint)
26- bamf_legacy_window_set_hint (window, _NET_WM_DESKTOP_FILE, desktop_file_hint);
27+ bamf_legacy_window_set_hint (window, _BAMF_DESKTOP_FILE, desktop_file_hint);
28 }
29
30 static void
31@@ -2185,7 +2185,7 @@
32 char *old_hint;
33 const char *new_hint;
34
35- old_hint = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);
36+ old_hint = bamf_legacy_window_get_hint (window, _BAMF_DESKTOP_FILE);
37 new_hint = get_gnome_control_center_window_hint (self, window);
38
39 if (new_hint && g_strcmp0 (new_hint, old_hint) != 0)
40@@ -2220,12 +2220,12 @@
41 }
42 else if (g_strcmp0 (bamf_legacy_window_get_class_name (window), "Gnome-control-center") == 0)
43 {
44- char *old_hint = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);
45+ char *old_hint = bamf_legacy_window_get_hint (window, _BAMF_DESKTOP_FILE);
46 const char *new_hint = get_gnome_control_center_window_hint (self, window);
47
48 if (new_hint && g_strcmp0 (old_hint, new_hint) != 0)
49 {
50- bamf_legacy_window_set_hint (window, _NET_WM_DESKTOP_FILE, new_hint);
51+ bamf_legacy_window_set_hint (window, _BAMF_DESKTOP_FILE, new_hint);
52 }
53
54 g_signal_connect (window, "role-changed", (GCallback) on_gnome_control_center_window_role_changed, self);
55
56=== modified file 'src/bamf-matcher.h'
57--- src/bamf-matcher.h 2015-01-10 21:44:23 +0000
58+++ src/bamf-matcher.h 2015-02-02 10:08:22 +0000
59@@ -45,7 +45,7 @@
60 #define BAMF_IS_MATCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), BAMF_TYPE_MATCHER))
61 #define BAMF_MATCHER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), BAMF_TYPE_MATCHER, BamfMatcherClass))
62
63-#define _NET_WM_DESKTOP_FILE "_NET_WM_DESKTOP_FILE"
64+#define _BAMF_DESKTOP_FILE "_BAMF_DESKTOP_FILE"
65 #define _GTK_APPLICATION_ID "_GTK_APPLICATION_ID"
66
67 typedef struct _BamfMatcher BamfMatcher;
68
69=== modified file 'tests/bamfdaemon/test-matcher.c'
70--- tests/bamfdaemon/test-matcher.c 2014-04-09 16:59:37 +0000
71+++ tests/bamfdaemon/test-matcher.c 2015-02-02 10:08:22 +0000
72@@ -586,7 +586,7 @@
73 bamf_legacy_window_test_set_role (test_win, NULL);
74 _bamf_legacy_screen_open_test_window (screen, test_win);
75
76- hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);
77+ hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _BAMF_DESKTOP_FILE);
78 g_assert_cmpstr (hint, ==, DATA_DIR"/gnome-control-center.desktop");
79 g_free (hint);
80 app = bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/gnome-control-center.desktop");
81@@ -599,7 +599,7 @@
82 g_assert (app);
83 window = BAMF_WINDOW (bamf_view_get_children (BAMF_VIEW (app))->data);
84 test_win = BAMF_LEGACY_WINDOW_TEST (bamf_window_get_window (window));
85- hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);
86+ hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _BAMF_DESKTOP_FILE);
87 g_assert_cmpstr (hint, ==, DATA_DIR"/gnome-display-panel.desktop");
88 g_free (hint);
89
90@@ -610,7 +610,7 @@
91 g_assert (app);
92 window = BAMF_WINDOW (bamf_view_get_children (BAMF_VIEW (app))->data);
93 test_win = BAMF_LEGACY_WINDOW_TEST (bamf_window_get_window (window));
94- hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);
95+ hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _BAMF_DESKTOP_FILE);
96 g_assert_cmpstr (hint, ==, DATA_DIR"/gnome-mouse-panel.desktop");
97 g_free (hint);
98
99@@ -621,7 +621,7 @@
100 g_assert (app);
101 window = BAMF_WINDOW (bamf_view_get_children (BAMF_VIEW (app))->data);
102 test_win = BAMF_LEGACY_WINDOW_TEST (bamf_window_get_window (window));
103- hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);
104+ hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _BAMF_DESKTOP_FILE);
105 g_assert_cmpstr (hint, ==, DATA_DIR"/gnome-control-center.desktop");
106 g_free (hint);
107
108@@ -731,7 +731,7 @@
109
110 bamf_matcher_register_desktop_file_for_pid (matcher, DATA_DIR"/icedtea-netx-javaws.desktop", pid);
111
112- char *hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);
113+ char *hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _BAMF_DESKTOP_FILE);
114 g_assert (hint == NULL);
115
116 app = bamf_matcher_get_application_by_xid (matcher, xid);

Subscribers

People subscribed via source and target branches