aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-06-21 14:07:25 -0500
committerTed Gould <ted@gould.cx>2011-06-21 14:07:25 -0500
commitf23f3aee28f6c326cc94cc7098934a5afac0c246 (patch)
tree4f9555f67c67315832fcebdb0d9a45841912fd15
parent548daa53dbb19ad5998001a67f56f31904519d4c (diff)
parent5b1027bd6f7e193639a895c9c0d63462443d4566 (diff)
downloadayatana-indicator-datetime-f23f3aee28f6c326cc94cc7098934a5afac0c246.tar.gz
ayatana-indicator-datetime-f23f3aee28f6c326cc94cc7098934a5afac0c246.tar.bz2
ayatana-indicator-datetime-f23f3aee28f6c326cc94cc7098934a5afac0c246.zip
Merge Ubuntu Desktop
-rw-r--r--debian/changelog16
-rw-r--r--debian/patches/lp_750671.patch12
-rw-r--r--debian/patches/lp_762976.patch18
3 files changed, 46 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 0c384ae..1ceeb8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+indicator-datetime (0.2.3-0ubuntu3) natty; urgency=low
+
+ * debian/patches/lp_762976.patch
+ - 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)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Mon, 18 Apr 2011 10:05:41 -0400
+
+indicator-datetime (0.2.3-0ubuntu2) natty; urgency=low
+
+ * debian/patches/lp_750671.patch
+ - ellipsize long appointment descriptions (LP: #750671)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 15 Apr 2011 10:00:41 -0400
+
indicator-datetime (0.2.3-0ubuntu2~ppa1) natty; urgency=low
* Upstream Merge
diff --git a/debian/patches/lp_750671.patch b/debian/patches/lp_750671.patch
new file mode 100644
index 0000000..676f4f1
--- /dev/null
+++ b/debian/patches/lp_750671.patch
@@ -0,0 +1,12 @@
+=== 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
new file mode 100644
index 0000000..e62280a
--- /dev/null
+++ b/debian/patches/lp_762976.patch
@@ -0,0 +1,18 @@
+=== 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);
+
+