projects
/
conv-inbox
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a1e0046
)
Don't resize sender name from dispose
author
Artem Garmash
<artemgarmash@gmail.com>
Sun, 14 Feb 2010 21:51:29 +0000
(23:51 +0200)
committer
Artem Garmash
<artem.garmash@nokia.com>
Sun, 27 Jun 2010 19:13:47 +0000
(22:13 +0300)
src/el-home-applet.c
patch
|
blob
|
history
diff --git
a/src/el-home-applet.c
b/src/el-home-applet.c
index
6254576
..
930b474
100644
(file)
--- a/
src/el-home-applet.c
+++ b/
src/el-home-applet.c
@@
-720,7
+720,7
@@
contacts_added (OssoABookRoster *roster,
}
static void
}
static void
-reset_contact (ELHomeApplet *self)
+reset_contact (ELHomeApplet *self, gboolean resize)
{
ELHomeAppletPrivate *priv = self->priv;
{
ELHomeAppletPrivate *priv = self->priv;
@@
-742,7
+742,8
@@
reset_contact (ELHomeApplet *self)
priv->contact = NULL;
}
priv->contact = NULL;
}
- resize_sender (priv);
+ if (resize)
+ resize_sender (priv);
}
static void
}
static void
@@
-759,13
+760,13
@@
contacts_removed (OssoABookRoster *roster,
for (contact_id = ids; *contact_id; contact_id++) {
if (strcmp (*contact_id, priv->contact_id) == 0) {
for (contact_id = ids; *contact_id; contact_id++) {
if (strcmp (*contact_id, priv->contact_id) == 0) {
- reset_contact (self);
+ reset_contact (self, TRUE);
gtk_widget_queue_draw (GTK_WIDGET (self));
return;
}
if (strcmp (*contact_id, uid) == 0) {
gtk_widget_queue_draw (GTK_WIDGET (self));
return;
}
if (strcmp (*contact_id, uid) == 0) {
- reset_contact (self);
+ reset_contact (self, TRUE);
resolve_contact (self);
gtk_widget_queue_draw (GTK_WIDGET (self));
return;
resolve_contact (self);
gtk_widget_queue_draw (GTK_WIDGET (self));
return;
@@
-775,11
+776,11
@@
contacts_removed (OssoABookRoster *roster,
}
static void
}
static void
-clean_contact (ELHomeApplet *self)
+clean_contact (ELHomeApplet *self, gboolean resize)
{
ELHomeAppletPrivate *priv = self->priv;
{
ELHomeAppletPrivate *priv = self->priv;
- reset_contact (self);
+ reset_contact (self, resize);
if (priv->aggregator) {
if (priv->aggregator_ready_closure){
if (priv->aggregator) {
if (priv->aggregator_ready_closure){
@@
-852,7
+853,7
@@
dispose (GObject *self)
}
clean_state (EL_HOME_APPLET (self));
}
clean_state (EL_HOME_APPLET (self));
- clean_contact (EL_HOME_APPLET (self));
+ clean_contact (EL_HOME_APPLET (self), FALSE);
G_OBJECT_CLASS (el_home_applet_parent_class)->dispose (self);
}
G_OBJECT_CLASS (el_home_applet_parent_class)->dispose (self);
}
@@
-1222,7
+1223,7
@@
read_event (ELHomeApplet *self)
if (g_strcmp0 (priv->remote_id, remote_id) ||
new_account ||
!priv->contact) {
if (g_strcmp0 (priv->remote_id, remote_id) ||
new_account ||
!priv->contact) {
- clean_contact (self);
+ clean_contact (self, TRUE);
start_aggregator (self);
}
else if (priv->contact) {
start_aggregator (self);
}
else if (priv->contact) {
@@
-1287,7
+1288,7
@@
read_event (ELHomeApplet *self)
dgettext ("rtcom-messaging-ui",
"messaging_ap_conversations"));
dgettext ("rtcom-messaging-ui",
"messaging_ap_conversations"));
- clean_contact (self);
+ clean_contact (self, TRUE);
gtk_widget_hide (priv->icon);
}
gtk_widget_hide (priv->icon);
}