diff options
author | Ken VanDine <ken.vandine@canonical.com> | 2011-06-22 11:12:53 -0400 |
---|---|---|
committer | Ken VanDine <ken.vandine@canonical.com> | 2011-06-22 11:12:53 -0400 |
commit | be0557bd3630b3efe189f299d26aa3db9a358798 (patch) | |
tree | 51aa069c725606e9635b14091c4b6c5ddd7b48a4 /debian/patches/lp_762976.patch | |
parent | 5b1027bd6f7e193639a895c9c0d63462443d4566 (diff) | |
parent | d84d6a67d0c63d270462cade09d33efc9d2b6de8 (diff) | |
download | ayatana-indicator-datetime-be0557bd3630b3efe189f299d26aa3db9a358798.tar.gz ayatana-indicator-datetime-be0557bd3630b3efe189f299d26aa3db9a358798.tar.bz2 ayatana-indicator-datetime-be0557bd3630b3efe189f299d26aa3db9a358798.zip |
* New upstream release.
- Set minimum width for appointments to prevent continuous resizing
when the calendar is hiden and ensure there is enough of the
event description visible (LP: #762976)
- ellipsize long appointment descriptions (LP: #750671)
- GTK3 build
* Dropping debian/patches/lp_762976.patch and debian/patches/lp_750671.patch
as merged upstream.
* debian/control: Switching dep to libedataserverui-3.0-dev
* Upstream Merge
* Ellipsize calendar entries that are too long (LP: #750671)
Diffstat (limited to 'debian/patches/lp_762976.patch')
-rw-r--r-- | debian/patches/lp_762976.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/debian/patches/lp_762976.patch b/debian/patches/lp_762976.patch deleted file mode 100644 index e62280a..0000000 --- a/debian/patches/lp_762976.patch +++ /dev/null @@ -1,18 +0,0 @@ -=== modified file 'src/indicator-datetime.c' ---- src/indicator-datetime.c 2011-04-13 19:32:18 +0000 -+++ src/indicator-datetime.c 2011-04-18 09:59:43 +0000 -@@ -1285,6 +1285,13 @@ - /* 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); -+ -+ GtkStyle * style = gtk_widget_get_style(GTK_WIDGET(mi_data->label)); -+ PangoContext * context = gtk_widget_get_pango_context(GTK_WIDGET(mi_data->label)); -+ gint length = measure_string(style, context, "GGGGGGGGGGGGGGG"); // 15 char wide string max -+ gtk_widget_set_size_request(GTK_WIDGET(mi_data->label), length, -1); // Set the min size in pixels -+ -+ 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); - - |