From 3b8298513eed02bae309329aa853182d5e7b9181 Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Dec 20 2008 23:59:38 +0000 Subject: - Update mission-control-convert patch. --- diff --git a/empathy-fedora-mission-control-convert.patch b/empathy-fedora-mission-control-convert.patch index 70c4e7e..b65eac5 100644 --- a/empathy-fedora-mission-control-convert.patch +++ b/empathy-fedora-mission-control-convert.patch @@ -1,7 +1,7 @@ -diff -ur empathy-2.23.6/src/empathy.c empathy-2.23.6.hacked/src/empathy.c ---- empathy-2.23.6/src/empathy.c 2008-08-04 07:25:40.000000000 -0400 -+++ empathy-2.23.6.hacked/src/empathy.c 2008-08-15 13:10:41.000000000 -0400 -@@ -356,6 +356,47 @@ +diff -urp empathy-2.25.3.OLD/src/empathy.c empathy-2.25.3/src/empathy.c +--- empathy-2.25.3.OLD/src/empathy.c 2008-12-15 14:41:56.000000000 -0500 ++++ empathy-2.25.3/src/empathy.c 2008-12-20 18:49:26.000000000 -0500 +@@ -371,6 +371,47 @@ get_startup_timestamp () return (retval > 0) ? retval : 0; } @@ -49,14 +49,12 @@ diff -ur empathy-2.23.6/src/empathy.c empathy-2.23.6.hacked/src/empathy.c int main (int argc, char *argv[]) { -@@ -386,6 +427,8 @@ - { NULL } - }; +@@ -414,6 +455,8 @@ main (int argc, char *argv[]) + gtk_window_set_default_icon_name ("empathy"); + textdomain (GETTEXT_PACKAGE); + fedora_mission_control_convert (); + - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); -Only in empathy-2.23.6.hacked/src: empathy.c~ -Only in empathy-2.23.6/: upgrade-haze-profiles.sh + /* Setting up the bacon connection */ + startup_timestamp = get_startup_timestamp (); + connection = bacon_message_connection_new ("empathy"); diff --git a/empathy.spec b/empathy.spec index dcbaaab..75f71ce 100644 --- a/empathy.spec +++ b/empathy.spec @@ -10,7 +10,7 @@ Name: empathy Version: 2.25.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Instant Messaging Client for GNOME Group: Applications/Communications @@ -224,6 +224,9 @@ fi %{python_sitearch}/empathy*.so %changelog +* Sat Dec 20 2008 Brian Pepple - 2.25.3-2 +- Update mission-control-convert patch. + * Wed Dec 17 2008 Matthias Clasen - 2.25.3-1 - Update to 2.25.3