Hello community, here is the log from the commit of package gnome-panel for openSUSE:11.4 checked in at Mon Jul 4 12:26:49 CEST 2011.
-------- --- old-versions/11.4/all/gnome-panel/gnome-panel.changes 2011-02-17 19:51:39.000000000 +0100 +++ 11.4/gnome-panel/gnome-panel.changes 2011-04-05 10:35:36.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 05 09:06:45 BST 2011 - [email protected] + +- Add gnome-panel-bgo633566-clock-app-show-ews.patch: Evolution + appointments are not shown in the clock applet (bgo633566 also + bnc648940). This patch from bgo fixes this. + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/gnome-panel Destination is old-versions/11.4/UPDATES/all/gnome-panel calling whatdependson for 11.4-i586 New: ---- gnome-panel-bgo633566-clock-app-show-ews.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-panel.spec ++++++ --- /var/tmp/diff_new_pack.BRQMzW/_old 2011-07-04 12:25:43.000000000 +0200 +++ /var/tmp/diff_new_pack.BRQMzW/_new 2011-07-04 12:25:43.000000000 +0200 @@ -19,7 +19,7 @@ Name: gnome-panel Version: 2.32.1 -Release: 7.<RELEASE3> +Release: 7.<RELEASE12> License: GPLv2+ Summary: The GNOME Desktop Panel Url: http://www.gnome.org @@ -48,6 +48,8 @@ Patch58: gnome-panel-bnc363981-intlclock-compatibility.patch # PATCH-FEATURE-OPENSUSE gnome-panel-bnc356242-recently-used-apps-hidden.patch bnc356242 [email protected] -- Hide recently used apps from the recent documents menu Patch61: gnome-panel-bnc356242-recently-used-apps-hidden.patch +# PATCH-FIX-UPSTREAM gnome-panel-bgo633566-clock-app-show-ews.patch bgo633566 [email protected] -- EWS Evolution appointments not shown in clock applet +Patch62: gnome-panel-bgo633566-clock-app-show-ews.patch BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel @@ -220,6 +222,7 @@ %patch56 -p0 %patch58 -p1 %patch61 -p0 +%patch62 -p1 gnome-patch-translation-update %build ++++++ gnome-panel-bgo633566-clock-app-show-ews.patch ++++++ --- gnome-panel-2.32.1/applets/clock/calendar-window.c.orig 2010-06-23 01:00:27.000000000 +0200 +++ gnome-panel-2.32.1/applets/clock/calendar-window.c 2011-03-03 10:17:10.000000000 +0100 @@ -247,7 +247,7 @@ enum { APPOINTMENT_COLUMN_UID, - APPOINTMENT_COLUMN_URI, + APPOINTMENT_COLUMN_TYPE, APPOINTMENT_COLUMN_SUMMARY, APPOINTMENT_COLUMN_DESCRIPTION, APPOINTMENT_COLUMN_START_TIME, @@ -259,6 +259,12 @@ }; enum { + APPOINTMENT_TYPE_APPOINTMENT, + APPOINTMENT_TYPE_BIRTHDAY, + APPOINTMENT_TYPE_WEATHER +}; + +enum { TASK_COLUMN_UID, TASK_COLUMN_SUMMARY, TASK_COLUMN_DESCRIPTION, @@ -272,6 +278,7 @@ TASK_COLUMN_COLOR, TASK_COLUMN_PRIORITY, N_TASK_COLUMNS + }; static char * @@ -441,48 +448,15 @@ } static gboolean -is_appointment (GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data) -{ - gchar *uri; - - gtk_tree_model_get (model, iter, APPOINTMENT_COLUMN_URI, &uri, -1); - if (uri) - return (g_ascii_strcasecmp (uri, "file") == 0 || - g_ascii_strcasecmp (uri, "webcal") == 0 || - g_ascii_strcasecmp (uri, "caldav") == 0 || - g_ascii_strcasecmp (uri, "exchange") == 0 || - g_ascii_strcasecmp (uri, "groupwise") == 0 || - g_ascii_strcasecmp (uri, "google") == 0); - return FALSE; -} - -static gboolean -is_birthday (GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data) -{ - gchar *uri; - - gtk_tree_model_get (model, iter, APPOINTMENT_COLUMN_URI, &uri, -1); - if (uri) - return (g_ascii_strcasecmp (uri, "contacts") == 0); - return FALSE; -} +is_for_filter (GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) + { + gint type; + gtk_tree_model_get (model, iter, APPOINTMENT_COLUMN_TYPE, &type, -1); + return type == GPOINTER_TO_INT (data); + } -static gboolean -is_weather (GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data) -{ - gchar *uri; - - gtk_tree_model_get (model, iter, APPOINTMENT_COLUMN_URI, &uri, -1); - if (uri) - return (g_ascii_strcasecmp (uri, "weather") == 0); - return FALSE; -} static gboolean filter_out_tasks (GtkTreeModel *model, @@ -961,6 +935,7 @@ CalendarAppointment *appointment = l->data; GtkTreeIter iter; char *start_text; + gint type; g_assert (CALENDAR_EVENT (appointment)->type == CALENDAR_EVENT_APPOINTMENT); @@ -970,13 +945,18 @@ start_text = format_time (calwin->priv->time_format, appointment->start_time, year, month, day); - + if (g_ascii_strcasecmp (appointment->uri, "weather") == 0) + type = APPOINTMENT_TYPE_WEATHER; + else if (g_ascii_strcasecmp (appointment->uri, "contacts") == 0) + type = APPOINTMENT_TYPE_BIRTHDAY; + else + type = APPOINTMENT_TYPE_APPOINTMENT; gtk_list_store_append (calwin->priv->appointments_model, &iter); gtk_list_store_set (calwin->priv->appointments_model, &iter, APPOINTMENT_COLUMN_UID, appointment->uid, - APPOINTMENT_COLUMN_URI, appointment->uri, + APPOINTMENT_COLUMN_TYPE, type, APPOINTMENT_COLUMN_SUMMARY, appointment->summary, APPOINTMENT_COLUMN_DESCRIPTION, appointment->description, APPOINTMENT_COLUMN_START_TIME, (gint64)appointment->start_time, @@ -1003,7 +983,7 @@ create_list_for_appointment_model (CalendarWindow *calwin, const char *label, GtkTreeModelFilter **filter, - GtkTreeModelFilterVisibleFunc is_for_filter, + gint filter_type, GtkTreeCellDataFunc set_pixbuf_cell, gboolean show_start, GtkWidget **tree_view, @@ -1043,7 +1023,7 @@ gtk_tree_model_filter_set_visible_func ( *filter, (GtkTreeModelFilterVisibleFunc) is_for_filter, - calwin, + GINT_TO_POINTER (filter_type), NULL); } @@ -1105,7 +1085,7 @@ calwin, _("Appointments"), &calwin->priv->appointments_filter, - is_appointment, + APPOINTMENT_TYPE_APPOINTMENT, appointment_pixbuf_cell_data_func, TRUE, tree_view, @@ -1130,7 +1110,7 @@ calwin, _("Birthdays and Anniversaries"), &calwin->priv->birthdays_filter, - is_birthday, + APPOINTMENT_TYPE_BIRTHDAY, birthday_pixbuf_cell_data_func, FALSE, tree_view, @@ -1155,7 +1135,7 @@ calwin, _("Weather Information"), &calwin->priv->weather_filter, - is_weather, + APPOINTMENT_TYPE_WEATHER, weather_pixbuf_cell_data_func, FALSE, tree_view, @@ -1217,7 +1197,7 @@ calwin->priv->appointments_model = gtk_list_store_new (N_APPOINTMENT_COLUMNS, G_TYPE_STRING, /* uid */ - G_TYPE_STRING, /* uri */ + G_TYPE_INT, /* type */ G_TYPE_STRING, /* summary */ G_TYPE_STRING, /* description */ G_TYPE_INT64, /* start time */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
