aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog9
-rw-r--r--debian/patches/lp_750671.patch12
-rw-r--r--debian/patches/lp_762976.patch18
3 files changed, 8 insertions, 31 deletions
diff --git a/debian/changelog b/debian/changelog
index b433c02..176a8b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
indicator-datetime (0.2.90-0ubuntu1) UNRELEASED; urgency=low
* 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.
- -- Ted Gould <ted@ubuntu.com> Tue, 21 Jun 2011 14:13:01 -0500
+ -- Ted Gould <ted@ubuntu.com> Tue, 21 Jun 2011 14:24:41 -0500
indicator-datetime (0.2.3-0ubuntu3) natty; urgency=low
diff --git a/debian/patches/lp_750671.patch b/debian/patches/lp_750671.patch
deleted file mode 100644
index 676f4f1..0000000
--- a/debian/patches/lp_750671.patch
+++ /dev/null
@@ -1,12 +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-15 13:23:28 +0000
-@@ -1285,6 +1285,7 @@
- /* 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);
-
-
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);
-
-