diff options
author | Ted Gould <ted@gould.cx> | 2011-04-15 09:02:08 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2011-04-15 09:02:08 -0500 |
commit | cf82ce1c56ecfab384896118d01ec241e32f5118 (patch) | |
tree | 4c14a095a12876fe5f387418ea8776a413b72237 | |
parent | a8c851e11151258d090c037f1f2a712f8b647c70 (diff) | |
parent | 9f48d2fd048cdac443fb6f9db5153f375ffc1bd9 (diff) | |
download | ayatana-indicator-datetime-cf82ce1c56ecfab384896118d01ec241e32f5118.tar.gz ayatana-indicator-datetime-cf82ce1c56ecfab384896118d01ec241e32f5118.tar.bz2 ayatana-indicator-datetime-cf82ce1c56ecfab384896118d01ec241e32f5118.zip |
* Upstream Merge
* Ellipsize calendar entries that are too long (LP: #750671)
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | src/indicator-datetime.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index d0c522c..f2a2537 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.2.3-0ubuntu2~ppa1) natty; urgency=low + + * Upstream Merge + * Ellipsize calendar entries that are too long (LP: #750671) + + -- Ted Gould <ted@ubuntu.com> Fri, 15 Apr 2011 09:01:32 -0500 + indicator-datetime (0.2.3-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index 1c05ff0..a992507 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -1285,6 +1285,7 @@ new_appointment_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbu /* Label, probably a username, chat room or mailbox name */ mi_data->label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPOINTMENT_MENUITEM_PROP_LABEL)); gtk_misc_set_alignment(GTK_MISC(mi_data->label), 0.0, 0.5); + gtk_label_set_ellipsize(GTK_LABEL(mi_data->label), PANGO_ELLIPSIZE_END); gtk_box_pack_start(GTK_BOX(hbox), mi_data->label, TRUE, TRUE, 0); gtk_widget_show(mi_data->label); |