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
=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c 2015-02-02 10:08:22 +0000
+++ src/bamf-matcher.c 2015-02-02 10:08:22 +0000
@@ -1630,7 +1630,7 @@
16301630
1631 priv = self->priv;1631 priv = self->priv;
1632 window = bamf_window_get_window (bamf_window);1632 window = bamf_window_get_window (bamf_window);
1633 desktop_file = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);1633 desktop_file = bamf_legacy_window_get_hint (window, _BAMF_DESKTOP_FILE);
1634 class_name = bamf_legacy_window_get_class_name (window);1634 class_name = bamf_legacy_window_get_class_name (window);
1635 instance_name = bamf_legacy_window_get_class_instance_name (window);1635 instance_name = bamf_legacy_window_get_class_instance_name (window);
16361636
@@ -2022,7 +2022,7 @@
2022 return;2022 return;
2023 }2023 }
20242024
2025 desktop_file_hint = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);2025 desktop_file_hint = bamf_legacy_window_get_hint (window, _BAMF_DESKTOP_FILE);
20262026
2027 if (desktop_file_hint)2027 if (desktop_file_hint)
2028 {2028 {
@@ -2058,7 +2058,7 @@
2058 g_list_free (pids);2058 g_list_free (pids);
20592059
2060 if (desktop_file_hint)2060 if (desktop_file_hint)
2061 bamf_legacy_window_set_hint (window, _NET_WM_DESKTOP_FILE, desktop_file_hint);2061 bamf_legacy_window_set_hint (window, _BAMF_DESKTOP_FILE, desktop_file_hint);
2062}2062}
20632063
2064static void2064static void
@@ -2185,7 +2185,7 @@
2185 char *old_hint;2185 char *old_hint;
2186 const char *new_hint;2186 const char *new_hint;
21872187
2188 old_hint = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);2188 old_hint = bamf_legacy_window_get_hint (window, _BAMF_DESKTOP_FILE);
2189 new_hint = get_gnome_control_center_window_hint (self, window);2189 new_hint = get_gnome_control_center_window_hint (self, window);
21902190
2191 if (new_hint && g_strcmp0 (new_hint, old_hint) != 0)2191 if (new_hint && g_strcmp0 (new_hint, old_hint) != 0)
@@ -2220,12 +2220,12 @@
2220 }2220 }
2221 else if (g_strcmp0 (bamf_legacy_window_get_class_name (window), "Gnome-control-center") == 0)2221 else if (g_strcmp0 (bamf_legacy_window_get_class_name (window), "Gnome-control-center") == 0)
2222 {2222 {
2223 char *old_hint = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);2223 char *old_hint = bamf_legacy_window_get_hint (window, _BAMF_DESKTOP_FILE);
2224 const char *new_hint = get_gnome_control_center_window_hint (self, window);2224 const char *new_hint = get_gnome_control_center_window_hint (self, window);
22252225
2226 if (new_hint && g_strcmp0 (old_hint, new_hint) != 0)2226 if (new_hint && g_strcmp0 (old_hint, new_hint) != 0)
2227 {2227 {
2228 bamf_legacy_window_set_hint (window, _NET_WM_DESKTOP_FILE, new_hint);2228 bamf_legacy_window_set_hint (window, _BAMF_DESKTOP_FILE, new_hint);
2229 }2229 }
22302230
2231 g_signal_connect (window, "role-changed", (GCallback) on_gnome_control_center_window_role_changed, self);2231 g_signal_connect (window, "role-changed", (GCallback) on_gnome_control_center_window_role_changed, self);
22322232
=== modified file 'src/bamf-matcher.h'
--- src/bamf-matcher.h 2015-01-10 21:44:23 +0000
+++ src/bamf-matcher.h 2015-02-02 10:08:22 +0000
@@ -45,7 +45,7 @@
45#define BAMF_IS_MATCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), BAMF_TYPE_MATCHER))45#define BAMF_IS_MATCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), BAMF_TYPE_MATCHER))
46#define BAMF_MATCHER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), BAMF_TYPE_MATCHER, BamfMatcherClass))46#define BAMF_MATCHER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), BAMF_TYPE_MATCHER, BamfMatcherClass))
4747
48#define _NET_WM_DESKTOP_FILE "_NET_WM_DESKTOP_FILE"48#define _BAMF_DESKTOP_FILE "_BAMF_DESKTOP_FILE"
49#define _GTK_APPLICATION_ID "_GTK_APPLICATION_ID"49#define _GTK_APPLICATION_ID "_GTK_APPLICATION_ID"
5050
51typedef struct _BamfMatcher BamfMatcher;51typedef struct _BamfMatcher BamfMatcher;
5252
=== modified file 'tests/bamfdaemon/test-matcher.c'
--- tests/bamfdaemon/test-matcher.c 2014-04-09 16:59:37 +0000
+++ tests/bamfdaemon/test-matcher.c 2015-02-02 10:08:22 +0000
@@ -586,7 +586,7 @@
586 bamf_legacy_window_test_set_role (test_win, NULL);586 bamf_legacy_window_test_set_role (test_win, NULL);
587 _bamf_legacy_screen_open_test_window (screen, test_win);587 _bamf_legacy_screen_open_test_window (screen, test_win);
588588
589 hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);589 hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _BAMF_DESKTOP_FILE);
590 g_assert_cmpstr (hint, ==, DATA_DIR"/gnome-control-center.desktop");590 g_assert_cmpstr (hint, ==, DATA_DIR"/gnome-control-center.desktop");
591 g_free (hint);591 g_free (hint);
592 app = bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/gnome-control-center.desktop");592 app = bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/gnome-control-center.desktop");
@@ -599,7 +599,7 @@
599 g_assert (app);599 g_assert (app);
600 window = BAMF_WINDOW (bamf_view_get_children (BAMF_VIEW (app))->data);600 window = BAMF_WINDOW (bamf_view_get_children (BAMF_VIEW (app))->data);
601 test_win = BAMF_LEGACY_WINDOW_TEST (bamf_window_get_window (window));601 test_win = BAMF_LEGACY_WINDOW_TEST (bamf_window_get_window (window));
602 hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);602 hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _BAMF_DESKTOP_FILE);
603 g_assert_cmpstr (hint, ==, DATA_DIR"/gnome-display-panel.desktop");603 g_assert_cmpstr (hint, ==, DATA_DIR"/gnome-display-panel.desktop");
604 g_free (hint);604 g_free (hint);
605605
@@ -610,7 +610,7 @@
610 g_assert (app);610 g_assert (app);
611 window = BAMF_WINDOW (bamf_view_get_children (BAMF_VIEW (app))->data);611 window = BAMF_WINDOW (bamf_view_get_children (BAMF_VIEW (app))->data);
612 test_win = BAMF_LEGACY_WINDOW_TEST (bamf_window_get_window (window));612 test_win = BAMF_LEGACY_WINDOW_TEST (bamf_window_get_window (window));
613 hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);613 hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _BAMF_DESKTOP_FILE);
614 g_assert_cmpstr (hint, ==, DATA_DIR"/gnome-mouse-panel.desktop");614 g_assert_cmpstr (hint, ==, DATA_DIR"/gnome-mouse-panel.desktop");
615 g_free (hint);615 g_free (hint);
616616
@@ -621,7 +621,7 @@
621 g_assert (app);621 g_assert (app);
622 window = BAMF_WINDOW (bamf_view_get_children (BAMF_VIEW (app))->data);622 window = BAMF_WINDOW (bamf_view_get_children (BAMF_VIEW (app))->data);
623 test_win = BAMF_LEGACY_WINDOW_TEST (bamf_window_get_window (window));623 test_win = BAMF_LEGACY_WINDOW_TEST (bamf_window_get_window (window));
624 hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);624 hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _BAMF_DESKTOP_FILE);
625 g_assert_cmpstr (hint, ==, DATA_DIR"/gnome-control-center.desktop");625 g_assert_cmpstr (hint, ==, DATA_DIR"/gnome-control-center.desktop");
626 g_free (hint);626 g_free (hint);
627627
@@ -731,7 +731,7 @@
731731
732 bamf_matcher_register_desktop_file_for_pid (matcher, DATA_DIR"/icedtea-netx-javaws.desktop", pid);732 bamf_matcher_register_desktop_file_for_pid (matcher, DATA_DIR"/icedtea-netx-javaws.desktop", pid);
733733
734 char *hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);734 char *hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _BAMF_DESKTOP_FILE);
735 g_assert (hint == NULL);735 g_assert (hint == NULL);
736736
737 app = bamf_matcher_get_application_by_xid (matcher, xid);737 app = bamf_matcher_get_application_by_xid (matcher, xid);

Subscribers

People subscribed via source and target branches