Hello community, here is the log from the commit of package evolution-tray for openSUSE:Factory checked in at Fri Aug 12 13:23:46 CEST 2011.
-------- --- GNOME/evolution-tray/evolution-tray.changes 2011-06-07 12:19:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/evolution-tray/evolution-tray.changes 2011-08-10 22:27:55.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 10 20:27:15 UTC 2011 - dims...@opensuse.org + +- Add evolution-tray-gnome3-ter.patch: Fix build against evo 3.1.x. + Patch based on git master changes. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- evolution-tray-gnome3-ter.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-tray.spec ++++++ --- /var/tmp/diff_new_pack.VIy4zm/_old 2011-08-12 11:59:46.000000000 +0200 +++ /var/tmp/diff_new_pack.VIy4zm/_new 2011-08-12 11:59:46.000000000 +0200 @@ -19,7 +19,7 @@ Name: evolution-tray Version: 0.0.7 -Release: 6 +Release: 7 License: GPLv2+ Summary: Evolution plugin to minimize in tray Url: http://gnome.eu.org/evo/index.php/Evolution_Tray @@ -29,6 +29,8 @@ Patch0: evolution-tray-gnome3.patch # PATCH-FIX-UPSTREAM evolution-tray-gnome3-bis.patch vu...@opensuse.org -- Finish port to GNOME 3, sent upstream by mail Patch1: evolution-tray-gnome3-bis.patch +# PATCH-FIX-UPSTREAM evolution-tray-gnome3-ter.patch dims...@opensnsue.org -- Fix build with evo 3.1.x. Patch based on git commits. +Patch2: evolution-tray-gnome3-ter.patch # Needed by patch0 and patch1 BuildRequires: gnome-common BuildRequires: intltool @@ -57,6 +59,7 @@ %if ! (0%{?favor_gtk2}) %patch0 -p1 %patch1 -p1 +%patch2 -p1 %endif %build ++++++ evolution-tray-gnome3-ter.patch ++++++ --- evolution-tray-0.0.7/src/tray.c 2011-08-10 22:21:56.207943526 +0200 +++ evolution-tray/src/tray.c 2011-08-10 22:22:43.672113487 +0200 @@ -53,6 +53,10 @@ #include <mail/em-event.h> #include <mail/em-folder-tree.h> +#if EVOLUTION_VERSION >= 30102 +#include <mail/e-mail-folder-utils.h> +#include <e-util/e-account-utils.h> +#endif #include <e-util/e-icon-factory.h> #include <shell/es-event.h> @@ -659,7 +663,7 @@ NULL); g_signal_connect ( tray_icon, "popup-menu", - G_CALLBACK (popup_menu_status), NULL); + G_CALLBACK (popup_menu_status), tray_icon); } gtk_status_icon_set_visible (tray_icon, TRUE); } @@ -877,9 +881,11 @@ item, "activate", G_CALLBACK (do_quit), NULL); - g_object_ref_sink (menu); - gtk_menu_popup (menu, NULL, NULL, NULL, NULL, button, activate_time); - g_object_unref (menu); + gtk_menu_popup (GTK_MENU (menu), + NULL, NULL, + gtk_status_icon_position_menu, + user_data, + button, activate_time); } static void @@ -904,6 +910,7 @@ if (!status_count) { EAccount *account; + gchar *folder_name; #if EVOLUTION_VERSION >= 30102 const gchar *uid; gchar *name = t->display_name; @@ -926,11 +933,20 @@ #endif #endif - if (account != NULL) { - name = g_strdup_printf ( - "%s/%s", e_account_get_string ( - account, E_ACCOUNT_NAME), name); - } +#if EVOLUTION_VERSION >= 30102 + if (account != NULL) + folder_name = g_strdup_printf ( + "%s/%s", account->name, t->folder_name); + else + folder_name = g_strdup (t->folder_name); +#else + if (account != NULL) + folder_name = g_strdup_printf ( + "%s/%s", e_account_get_strinf (account, E_ACCOUNT_NAME), + name; + else + folder_name = g_strdup (t->name); +#endif status_count = t->new; @@ -939,10 +955,9 @@ msg = g_strdup_printf (ngettext ( "You have received %d new message\nin %s.", "You have received %d new messages\nin %s.", - status_count), status_count, name); + status_count), status_count, folder_name); - if (name != t->name) - g_free (name); + g_free(folder_name); #if EVOLUTION_VERSION >= 22902 if (t->msg_sender) { @@ -1076,6 +1091,7 @@ new_notify_status (t); } +#if EVOLUTION_VERSION < 30101 void get_shell(void *ep, ESEventTargetShell *t) { EShell *shell; @@ -1091,6 +1107,7 @@ G_CALLBACK (shown_first_time_cb), NULL); } } +#endif #if EVOLUTION_VERSION >= 22900 gboolean ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
