rpms/empathy/devel empathy-fedora-mission-control-convert.patch, 1.1, 1.2 empathy.spec, 1.42, 1.43

[Brian Pepple]

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13281

Modified Files:
	empathy-fedora-mission-control-convert.patch empathy.spec 
Log Message:
* Sat Dec 20 2008 Brian Pepple <bpepple at fedoraproject.org> - 2.25.3-2
- Update mission-control-convert patch.


empathy-fedora-mission-control-convert.patch:

Index: empathy-fedora-mission-control-convert.patch
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy-fedora-mission-control-convert.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- empathy-fedora-mission-control-convert.patch	16 Aug 2008 00:55:50 -0000	1.1
+++ empathy-fedora-mission-control-convert.patch	20 Dec 2008 23:59:38 -0000	1.2
@@ -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 @@
  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");


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- empathy.spec	18 Dec 2008 01:36:35 -0000	1.42
+++ empathy.spec	20 Dec 2008 23:59:38 -0000	1.43
@@ -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 @@
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Sat Dec 20 2008 Brian Pepple <bpepple at fedoraproject.org> - 2.25.3-2
+- Update mission-control-convert patch.
+
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.3-1
 - Update to 2.25.3