rpms/empathy/devel presence-icons.patch, NONE, 1.1 empathy.spec, 1.68, 1.69

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	empathy.spec 
Added Files:
	presence-icons.patch 
Log Message:
Make presence icons show up in the menus


presence-icons.patch:
 empathy-presence-chooser.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE presence-icons.patch ---
--- empathy-2.27.5/libempathy-gtk/empathy-presence-chooser.c	2009-07-29 04:18:26.000000000 -0400
+++ hacked/libempathy-gtk/empathy-presence-chooser.c	2009-08-24 02:00:31.892689425 -0400
@@ -223,7 +223,7 @@
 
 	gtk_list_store_insert_with_values (store, NULL, -1,
 		COL_STATUS_TEXT, _("Edit Custom Messages..."),
-		COL_STATE_ICON_NAME, GTK_STOCK_EDIT,
+		COL_STATE_ICON_NAME, NULL,
 		COL_DISPLAY_MARKUP, _("Edit Custom Messages..."),
 		COL_TYPE, ENTRY_TYPE_EDIT_CUSTOM,
 		-1);
@@ -1049,6 +1049,7 @@
 	gtk_widget_show (image);
 
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
 	gtk_widget_show (item);
 
 	g_object_set_data_full (G_OBJECT (item),


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- empathy.spec	4 Aug 2009 04:41:27 -0000	1.68
+++ empathy.spec	24 Aug 2009 06:08:29 -0000	1.69
@@ -11,7 +11,7 @@
 
 Name:		empathy
 Version:	2.27.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -28,6 +28,9 @@ Patch1:		%{name}-broken-pkgconfig.patch
 
 Patch2:		clutter.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=592853
+Patch3:		presence-icons.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	enchant-devel >= %{enchant_version}
@@ -131,6 +134,7 @@ bindings to the libempathy and libempath
 %setup -q
 %patch1 -p1 -b .pkgconfig
 %patch2 -p1 -b .clutter
+%patch3 -p1 -b .presence-icons
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -238,6 +242,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-3
+- Make presence icons show up in the menus
+
 * Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-2
 - Enable map and location features