diff options
| author | Davyd Madeley <davyd@madeley.id.au> | 2009-07-07 18:09:05 +0800 |
|---|---|---|
| committer | Davyd Madeley <davyd@madeley.id.au> | 2009-07-07 18:09:05 +0800 |
| commit | 43b22a36646ac97e2c1f599369156d3aa56eac6c (patch) | |
| tree | 41d5fc5c8d65ed8b9fd4c4ebbea9476bd0c71489 | |
| parent | 700a8e8096468491466c0e2c70fab525d66016dd (diff) | |
| download | gsoc2013-empathy-43b22a36646ac97e2c1f599369156d3aa56eac6c.tar gsoc2013-empathy-43b22a36646ac97e2c1f599369156d3aa56eac6c.tar.gz gsoc2013-empathy-43b22a36646ac97e2c1f599369156d3aa56eac6c.tar.bz2 gsoc2013-empathy-43b22a36646ac97e2c1f599369156d3aa56eac6c.tar.lz gsoc2013-empathy-43b22a36646ac97e2c1f599369156d3aa56eac6c.tar.xz gsoc2013-empathy-43b22a36646ac97e2c1f599369156d3aa56eac6c.tar.zst gsoc2013-empathy-43b22a36646ac97e2c1f599369156d3aa56eac6c.zip | |
Make EmpathyContactWidget use EmpathyKludgeLabel
| -rw-r--r-- | libempathy-gtk/Makefile.am | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-widget.c | 8 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-widget.ui | 12 |
3 files changed, 10 insertions, 12 deletions
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 10931012a..5903efb15 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -60,6 +60,7 @@ libempathy_gtk_handwritten_source = \ empathy-theme-boxes.c \ empathy-theme-irc.c \ empathy-theme-manager.c \ + empathy-kludge-label.c \ empathy-ui-utils.c libempathy_gtk_la_SOURCES = \ @@ -120,6 +121,7 @@ libempathy_gtk_headers = \ empathy-theme-boxes.h \ empathy-theme-irc.h \ empathy-theme-manager.h \ + empathy-kludge-label.h \ empathy-ui-utils.h check_c_sources = \ diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index 7e80d0d65..f078f5248 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -47,6 +47,7 @@ #include "empathy-avatar-chooser.h" #include "empathy-avatar-image.h" #include "empathy-ui-utils.h" +#include "empathy-kludge-label.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT #include <libempathy/empathy-debug.h> @@ -219,7 +220,6 @@ empathy_contact_widget_new (EmpathyContact *contact, "hbox_presence", &information->hbox_presence, "label_alias", &information->label_alias, "image_state", &information->image_state, - "label_status", &information->label_status, "table_contact", &information->table_contact, "vbox_avatar", &information->vbox_avatar, "vbox_location", &information->vbox_location, @@ -587,6 +587,12 @@ update_avatar_chooser_account_cb (EmpathyAccountChooser *account_chooser, static void contact_widget_contact_setup (EmpathyContactWidget *information) { + /* Setup label_status as a KludgeLabel */ + information->label_status = empathy_kludge_label_new (""); + gtk_box_pack_start (GTK_BOX (information->hbox_presence), + information->label_status, TRUE, TRUE, 0); + gtk_widget_show (information->label_status); + /* Setup account label/chooser */ if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_ACCOUNT) { diff --git a/libempathy-gtk/empathy-contact-widget.ui b/libempathy-gtk/empathy-contact-widget.ui index c5bbd5bbe..5737b7d71 100644 --- a/libempathy-gtk/empathy-contact-widget.ui +++ b/libempathy-gtk/empathy-contact-widget.ui @@ -112,17 +112,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="label_status"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="position">1</property> - </packing> + <placeholder/> </child> </object> <packing> |