← Back to branch summary

~3v1n0/unity/overlay-border-scale

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/PanelTray.cpp

  • Committer: Daniel van Vugt
  • Date: 2012-03-14 06:24:18 UTC
  • mfrom: (2108 unity)
  • mto: This revision was merged to the branch mainline in revision 2146.
  • Revision ID: daniel.van.vugt@canonical.com-20120314062418-nprucpbr0m7qky5e
Merged latest lp:unity

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/PanelTray.cpp
20
20
 
21
21
#include <NuxCore/Logger.h>
22
22
 
23
 
#define SETTINGS_NAME "com.canonical.Unity.Panel"
24
 
#define PADDING 3
25
 
 
26
23
namespace
27
24
{
28
25
nux::logging::Logger logger("unity.panel");
 
26
const std::string SETTINGS_NAME = "com.canonical.Unity.Panel";
 
27
const int PADDING = 3;
29
28
}
30
29
 
31
30
namespace unity
39
38
    _last_y(0),
40
39
    _tray_icon_added_id(0)
41
40
{
42
 
  _settings = g_settings_new(SETTINGS_NAME);
 
41
  _settings = g_settings_new(SETTINGS_NAME.c_str());
43
42
  _whitelist = g_settings_get_strv(_settings, "systray-whitelist");
44
43
 
45
44
  RealInit();
95
94
  if (_tray)
96
95
  {
97
96
    g_signal_handler_disconnect(na_tray_get_manager(_tray), _tray_icon_added_id);
98
 
    g_object_unref (_tray);
99
97
    _tray = NULL;
100
98
  }
101
99
 
104
102
  if (_tray_expose_id)
105
103
    g_signal_handler_disconnect(_window, _tray_expose_id);
106
104
 
107
 
  // DISABLED to see if we can get compiz to cleanly exit.
108
 
  // This currently blocks on X.
109
 
  // gtk_widget_destroy(_window);
 
105
  gtk_widget_destroy(_window);
110
106
  g_strfreev(_whitelist);
111
107
  g_object_unref(_settings);
112
108
}