← Back to branch summary

~kvalo/indicator-network/bug-737743

« back to all changes in this revision

Viewing changes to src/backend/manager-proxy.c

  • Committer: Kalle Valo
  • Date: 2011-03-09 18:29:45 UTC
  • mfrom: (162.3.3 bug-705329)
  • Revision ID: kalle.valo@canonical.com-20110309182945-1qn22os42gvqdo9j
bzr merge lp:~kvalo/indicator-network/bug-705329

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/backend/manager-proxy.c
49
49
 
50
50
G_DEFINE_TYPE (ManagerProxy, manager_proxy, G_TYPE_OBJECT);
51
51
 
52
 
void manager_proxy_set_icon(ManagerProxy* self, const gchar *icon_name)
 
52
static void emit_icon_changed(ManagerProxy *self)
53
53
{
54
54
  ManagerProxyPrivate *priv = MANAGER_PROXY_GET_PRIVATE(self);
55
55
  GVariant *parameters;
56
56
  GError *error = NULL;
57
57
 
58
 
  g_return_if_fail(IS_MANAGER_PROXY(self));
59
58
  g_return_if_fail(priv != NULL);
60
 
  g_return_if_fail(priv->connection != NULL);
61
 
 
62
 
  if (priv->icon_name && g_str_equal(icon_name, priv->icon_name))
63
 
    return;
64
 
 
65
 
  g_free(priv->icon_name);
66
 
 
67
 
  priv->icon_name = g_strdup(icon_name);
68
 
  if (!priv->icon_name)
 
59
 
 
60
  if (priv->icon_name == NULL)
69
61
    return;
70
62
 
71
63
  parameters = g_variant_new("(s)", priv->icon_name);
84
76
  }
85
77
}
86
78
 
87
 
void manager_proxy_set_accessible_desc(ManagerProxy* self, const gchar *accessible_desc)
 
79
void manager_proxy_set_icon(ManagerProxy* self, const gchar *icon_name)
 
80
{
 
81
  ManagerProxyPrivate *priv = MANAGER_PROXY_GET_PRIVATE(self);
 
82
 
 
83
  g_return_if_fail(IS_MANAGER_PROXY(self));
 
84
  g_return_if_fail(priv != NULL);
 
85
 
 
86
  if (priv->icon_name && g_str_equal(icon_name, priv->icon_name))
 
87
    return;
 
88
 
 
89
  g_free(priv->icon_name);
 
90
 
 
91
  priv->icon_name = g_strdup(icon_name);
 
92
  if (!priv->icon_name)
 
93
    return;
 
94
 
 
95
  /* if dbus connection is not ready, postpone sending of signal */
 
96
  if (priv->connection == NULL)
 
97
    return;
 
98
 
 
99
  emit_icon_changed(self);
 
100
}
 
101
 
 
102
static void emit_accessible_desc_changed(ManagerProxy *self)
88
103
{
89
104
  ManagerProxyPrivate *priv = MANAGER_PROXY_GET_PRIVATE(self);
90
105
  GVariant *parameters;
91
106
  GError *error = NULL;
92
107
 
93
 
  g_return_if_fail(IS_MANAGER_PROXY(self));
94
108
  g_return_if_fail(priv != NULL);
95
 
  g_return_if_fail(priv->connection != NULL);
96
 
 
97
 
  if (priv->accessible_desc && g_strcmp0(accessible_desc, priv->accessible_desc) == 0)
98
 
    return;
99
 
 
100
 
  g_free(priv->accessible_desc);
101
 
 
102
 
  priv->accessible_desc = g_strdup(accessible_desc);
103
 
  if (!priv->accessible_desc)
 
109
 
 
110
  if (priv->accessible_desc == NULL)
104
111
    return;
105
112
 
106
113
  parameters = g_variant_new("(s)", priv->accessible_desc);
119
126
  }
120
127
}
121
128
 
 
129
void manager_proxy_set_accessible_desc(ManagerProxy* self, const gchar *accessible_desc)
 
130
{
 
131
  ManagerProxyPrivate *priv = MANAGER_PROXY_GET_PRIVATE(self);
 
132
  GVariant *parameters;
 
133
  GError *error = NULL;
 
134
 
 
135
  g_return_if_fail(IS_MANAGER_PROXY(self));
 
136
  g_return_if_fail(priv != NULL);
 
137
 
 
138
  if (priv->accessible_desc && g_strcmp0(accessible_desc, priv->accessible_desc) == 0)
 
139
    return;
 
140
 
 
141
  g_free(priv->accessible_desc);
 
142
 
 
143
  priv->accessible_desc = g_strdup(accessible_desc);
 
144
  if (!priv->accessible_desc)
 
145
    return;
 
146
 
 
147
  /* if dbus connection is not ready, postpone sending of signal */
 
148
  if (priv->connection == NULL)
 
149
    return;
 
150
 
 
151
  emit_accessible_desc_changed(self);
 
152
}
 
153
 
122
154
static void method_get_icon(ManagerProxy *self, GVariant *parameters,
123
155
                            GDBusMethodInvocation *invocation)
124
156
{
213
245
  /* FIXME: check if priv->registration_id != 0 and act accordingly */
214
246
  g_return_if_fail(id != 0);
215
247
 
216
 
 
217
248
  priv->registration_id = id;
 
249
 
 
250
  emit_icon_changed(self);
 
251
  emit_accessible_desc_changed(self);
218
252
}
219
253
 
220
254
static void on_name_acquired (GDBusConnection *connection, const gchar *name,