rpms/nautilus-sendto/devel nautilus-sendto-0.12-pidgin-icq.patch, NONE, 1.1 nautilus-sendto.spec, 1.44, 1.45

[Adel Gadllah (drago01)]

Author: drago01

Update of /cvs/pkgs/rpms/nautilus-sendto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28259

Modified Files:
	nautilus-sendto.spec 
Added Files:
	nautilus-sendto-0.12-pidgin-icq.patch 
Log Message:
fix icq file transfer

nautilus-sendto-0.12-pidgin-icq.patch:

--- NEW FILE nautilus-sendto-0.12-pidgin-icq.patch ---
diff -upNr nautilus-sendto-0.12.orign/src/plugins/pidgin.c nautilus-sendto-0.12/src/plugins/pidgin.c
--- nautilus-sendto-0.12.orign/src/plugins/pidgin.c	2007-08-13 16:13:56.000000000 +0200
+++ nautilus-sendto-0.12/src/plugins/pidgin.c	2007-12-03 20:24:08.000000000 +0100
@@ -49,7 +49,7 @@ gboolean init (NstPlugin *plugin)
 static void
 add_pidgin_contacts_to_model (GtkListStore *store, GtkTreeIter *iter)
 {
-	GdkPixbuf *msn, *jabber, *yahoo, *aim;
+	GdkPixbuf *msn, *jabber, *yahoo, *aim, *icq;
 	GtkIconTheme *it;
 	GList *list = NULL;
 	GList *l;
@@ -91,7 +91,8 @@ add_pidgin_contacts_to_model (GtkListSto
 					GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
 	aim = gtk_icon_theme_load_icon (it, "im-aim", 16, 
 					GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
-		
+	icq = gtk_icon_theme_load_icon (it, "im-icq", 16, 
+					GTK_ICON_LOOKUP_USE_BUILTIN, NULL);	
 	l = list;
 	while (l->next != NULL){
 		gchar *prt, *username, *cname, *alias;
@@ -122,7 +123,7 @@ add_pidgin_contacts_to_model (GtkListSto
 					      jabber, 1, alias_e->str, -1);
 			  contact_list = g_list_append (contact_list, contact_info);
 		  }else
-		    if (strcmp(prt,"prpl-oscar")==0){
+		    if (strcmp(prt,"prpl-aim")==0){
 			    gtk_list_store_append (store, iter);
 			    gtk_list_store_set (store, iter, 0, 
 						aim, 1, alias_e->str, -1);
@@ -133,9 +134,16 @@ add_pidgin_contacts_to_model (GtkListSto
 			      gtk_list_store_set (store, iter, 0, 
 						  yahoo, 1, alias_e->str, -1);
 			      contact_list = g_list_append (contact_list, contact_info);
-		      }else{
-			      g_free (contact_info);
-		      }
+		      }else
+			if(strcmp(prt,"prpl-icq")==0) {
+			    gtk_list_store_append (store, iter);
+			    gtk_list_store_set (store, iter, 0, 
+						icq, 1, alias_e->str, -1);
+			    contact_list = g_list_append (contact_list, contact_info);
+			}else {
+			    g_free (contact_info);
+			}
+			
 		g_string_free(alias_e, TRUE);
 	}
 	


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- nautilus-sendto.spec	27 Dec 2007 03:21:44 -0000	1.44
+++ nautilus-sendto.spec	28 Dec 2007 17:16:32 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        0.12
-Release: 	6%{?dist}
+Release: 	 7%{?dist}
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -27,6 +27,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=466427
 Patch2:         purple_debug_info.patch
 Patch3:		gio.patch
+Patch4:		nautilus-sendto-0.12-pidgin-icq.patch
 
 # For compat with old nautilus-sendto packaging
 Provides: nautilus-sendto-gaim
@@ -47,6 +48,7 @@
 %patch1 -p1 -b .thunderbird
 %patch2 -p1 -b .purple_debug_info
 %patch3 -p1 -b .gio
+%patch4 -p1 -b .pidgin-icq
 
 # Enable the Thunderbird plugin by default
 sed 's,enable_thunderbird=no,enable_thunderbird=yes,' configure > configure.new
@@ -105,6 +107,9 @@
 %{_mandir}/man1/nautilus-sendto.1.gz
 
 %changelog
+* Fri Dec 28 2007 Adel Gadllah <adel.gadllah at gmail.com> - 0.12-7
+- Fix icq file transfers with pidgin RH #408511
+
 * Wed Dec 26 2007 Matthias Clasen <mclasen at redhat.com> - 0.12-6
 - Install the nautilus exension in the right spot