projects
/
conv-inbox
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b4573b2
)
Clean unused code
author
Artem Garmash
<artemgarmash@gmail.com>
Sat, 30 Jan 2010 22:43:56 +0000
(
00:43
+0200)
committer
Artem Garmash
<artem.garmash@nokia.com>
Sun, 27 Jun 2010 19:13:45 +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
270bfa2
..
9e06024
100644
(file)
--- a/
src/el-home-applet.c
+++ b/
src/el-home-applet.c
@@
-116,7
+116,6
@@
struct _ELHomeAppletPrivate
float green;
float blue;
} active_color;
float green;
float blue;
} active_color;
- guint8 border_color[4];
PangoFontDescription *font_desc;
GdkPixbuf *avatar_pixbuf;
PangoFontDescription *font_desc;
GdkPixbuf *avatar_pixbuf;
@@
-336,11
+335,6
@@
style_set_cb (GtkWidget *widget,
priv->active_color.red = color.red/(float)G_MAXUINT16;
priv->active_color.green = color.green/(float)G_MAXUINT16;
priv->active_color.blue = color.blue/(float)G_MAXUINT16;
priv->active_color.red = color.red/(float)G_MAXUINT16;
priv->active_color.green = color.green/(float)G_MAXUINT16;
priv->active_color.blue = color.blue/(float)G_MAXUINT16;
-
- priv->border_color[0] = color.red;
- priv->border_color[1] = color.green;
- priv->border_color[2] = color.blue;
- priv->border_color[3] = 255;
}
}
}
}
@@
-759,13
+753,12
@@
aggregator_ready_cb (OssoABookWaitable *waitable,
gtk_label_set_text (GTK_LABEL (priv->sender),
osso_abook_contact_get_display_name (priv->contact));
gtk_label_set_text (GTK_LABEL (priv->sender),
osso_abook_contact_get_display_name (priv->contact));
- priv->avatar_pixbuf = osso_abook_avatar_get_image_scaled /*rounded*/
+ priv->avatar_pixbuf = osso_abook_avatar_get_image_scaled
(OSSO_ABOOK_AVATAR (priv->contact),
HILDON_ICON_PIXEL_SIZE_THUMB,
HILDON_ICON_PIXEL_SIZE_THUMB,
TRUE);
(OSSO_ABOOK_AVATAR (priv->contact),
HILDON_ICON_PIXEL_SIZE_THUMB,
HILDON_ICON_PIXEL_SIZE_THUMB,
TRUE);
- /* -1, */
- /* priv->border_color); */
+
g_warning ("HAVE avatar");
if (priv->avatar_pixbuf) {
gtk_widget_set_size_request (priv->sender,
g_warning ("HAVE avatar");
if (priv->avatar_pixbuf) {
gtk_widget_set_size_request (priv->sender,
@@
-780,14
+773,6
@@
aggregator_ready_cb (OssoABookWaitable *waitable,
"notify::presence-status",
G_CALLBACK (presence_updated),
self);
"notify::presence-status",
G_CALLBACK (presence_updated),
self);
-#if 0
- if (priv->avatar_pixbuf) {
- gtk_image_set_from_pixbuf (GTK_IMAGE (priv->avatar),
- priv->avatar_pixbuf);
- gtk_widget_show (priv->avatar);
- /* g_object_unref (avatar_image); */
- }
-#endif
gtk_widget_queue_draw (GTK_WIDGET (self));
}
}
gtk_widget_queue_draw (GTK_WIDGET (self));
}
}
@@
-1436,15
+1421,12
@@
el_home_applet_init (ELHomeApplet *self)
0.0f,
0.5f);
hildon_helper_set_logical_font (priv->unread, "SmallSystemFont");
0.0f,
0.5f);
hildon_helper_set_logical_font (priv->unread, "SmallSystemFont");
- /* gtk_widget_set_size_request (priv->unread, */
- /* -1, */
- /* HEADER_HEIGHT); */
-#if 1
+
priv->icon = gtk_image_new ();
gtk_misc_set_alignment (GTK_MISC (priv->icon),
0.5f,
0.5f);
priv->icon = gtk_image_new ();
gtk_misc_set_alignment (GTK_MISC (priv->icon),
0.5f,
0.5f);
-#endif
+
priv->avatar = gtk_image_new ();
gtk_misc_set_alignment (GTK_MISC (priv->avatar),
0.5f,
priv->avatar = gtk_image_new ();
gtk_misc_set_alignment (GTK_MISC (priv->avatar),
0.5f,
@@
-1487,7
+1469,6
@@
el_home_applet_init (ELHomeApplet *self)
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), priv->sender, FALSE, FALSE, 0);
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), priv->sender, FALSE, FALSE, 0);
- /* gtk_box_pack_start (GTK_BOX (hbox), priv->avatar, FALSE, FALSE, 0); */
footer = gtk_hbox_new (FALSE, HILDON_MARGIN_DEFAULT);
gtk_box_pack_start (GTK_BOX (footer), priv->unread, FALSE, FALSE, 0);
footer = gtk_hbox_new (FALSE, HILDON_MARGIN_DEFAULT);
gtk_box_pack_start (GTK_BOX (footer), priv->unread, FALSE, FALSE, 0);