← Back to branch summary

~unity-team/bamf/trunk

« back to all changes in this revision

Viewing changes to src/bamf-matcher.c

  • Committer: CI Train Bot
  • Author(s): Marco Trevisan (Treviño)
  • Date: 2015-02-02 10:24:53 UTC
  • mfrom: (608.1.4 fixup-gtk-application-matching)
  • Revision ID: ci-train-bot@canonical.com-20150202102453-5bqsz4mg0fcy3j20
BamfMatcher: rename set our atom to _BAMF_DESKTOP_FILE

It has never been standard 
Approved by: Lars Uebernickel

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/bamf-matcher.c
1630
1630
 
1631
1631
  priv = self->priv;
1632
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
1634
  class_name = bamf_legacy_window_get_class_name (window);
1635
1635
  instance_name = bamf_legacy_window_get_class_instance_name (window);
1636
1636
 
2022
2022
      return;
2023
2023
    }
2024
2024
 
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);
2026
2026
 
2027
2027
  if (desktop_file_hint)
2028
2028
    {
2058
2058
  g_list_free (pids);
2059
2059
 
2060
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
}
2063
2063
 
2064
2064
static void
2185
2185
  char *old_hint;
2186
2186
  const char *new_hint;
2187
2187
 
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
2189
  new_hint = get_gnome_control_center_window_hint (self, window);
2190
2190
 
2191
2191
  if (new_hint && g_strcmp0 (new_hint, old_hint) != 0)
2220
2220
    }
2221
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
2224
      const char *new_hint = get_gnome_control_center_window_hint (self, window);
2225
2225
 
2226
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
        }
2230
2230
 
2231
2231
      g_signal_connect (window, "role-changed", (GCallback) on_gnome_control_center_window_role_changed, self);