diff -u indicator-datetime-0.2.3/debian/changelog indicator-datetime-0.2.3/debian/changelog --- indicator-datetime-0.2.3/debian/changelog +++ indicator-datetime-0.2.3/debian/changelog @@ -1,18 +1,15 @@ -indicator-datetime (0.2.3-0ubuntu3) natty; urgency=low +indicator-datetime (0.2.3-0ubuntu4~ppa1) 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) + * Make it so the date is reset on show not hide (LP: #793450) - -- Ken VanDine Mon, 18 Apr 2011 10:05:41 -0400 + -- Ted Gould Tue, 14 Jun 2011 14:46:57 -0500 -indicator-datetime (0.2.3-0ubuntu2) natty; urgency=low +indicator-datetime (0.2.3-0ubuntu2~ppa1) natty; urgency=low - * debian/patches/lp_750671.patch - - ellipsize long appointment descriptions (LP: #750671) + * Upstream Merge + * Ellipsize calendar entries that are too long (LP: #750671) - -- Ken VanDine Fri, 15 Apr 2011 10:00:41 -0400 + -- Ted Gould Fri, 15 Apr 2011 09:32:43 -0500 indicator-datetime (0.2.3-0ubuntu1) natty; urgency=low reverted: --- indicator-datetime-0.2.3/debian/patches/lp_750671.patch +++ indicator-datetime-0.2.3.orig/debian/patches/lp_750671.patch @@ -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); - - reverted: --- indicator-datetime-0.2.3/debian/patches/lp_762976.patch +++ indicator-datetime-0.2.3.orig/debian/patches/lp_762976.patch @@ -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); - - only in patch2: unchanged: --- indicator-datetime-0.2.3.orig/src/indicator-datetime.c +++ indicator-datetime-0.2.3/src/indicator-datetime.c @@ -275,8 +275,8 @@ // we should only react if we're currently visible gboolean visible; g_object_get(G_OBJECT(menu), "visible", &visible, NULL); - if (visible) return; - g_debug("notify visible menu hidden, resetting date"); + if (!visible) return; + g_debug("notify visible menu shown, resetting date"); time_t curtime; @@ -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, "MMMMMMMMMMMMMMM"); // 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);