rpms/nautilus-sendto/F-7 nautilus-sendto-0.12-pidgin-icq.patch, NONE, 1.1 purple_debug_info.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 nautilus-sendto-0.7-thunderbird.patch, 1.1, 1.2 nautilus-sendto.spec, 1.36, 1.37 sources, 1.8, 1.9
Adel Gadllah (drago01)
fedora-extras-commits at redhat.com
Fri Dec 28 17:31:20 UTC 2007
Author: drago01
Update of /cvs/pkgs/rpms/nautilus-sendto/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28489
Modified Files:
.cvsignore nautilus-sendto-0.7-thunderbird.patch
nautilus-sendto.spec sources
Added Files:
nautilus-sendto-0.12-pidgin-icq.patch purple_debug_info.patch
Log Message:
update to 0.12 and 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);
}
purple_debug_info.patch:
--- NEW FILE purple_debug_info.patch ---
diff -uNr nautilus-sendto-0.12-orig/pidgin_plugin/nautilus-sendto-plugin.c nautilus-sendto-0.12/pidgin_plugin/nautilus-sendto-plugin.c
--- nautilus-sendto-0.12-orig/pidgin_plugin/nautilus-sendto-plugin.c 2007-08-13 10:43:02.000000000 -0400
+++ nautilus-sendto-0.12/pidgin_plugin/nautilus-sendto-plugin.c 2007-11-18 10:26:08.000000000 -0500
@@ -123,10 +123,10 @@
fclose (fd);
g_string_free (buddies_str, TRUE);
buddies_str = str;
- gaim_debug_info ("nautilus", "save blist online\n");
+ purple_debug_info ("nautilus", "save blist online\n");
}else{
g_string_free (str, TRUE);
- gaim_debug_info ("nautilus", "don't save blist online. No change\n");
+ purple_debug_info ("nautilus", "don't save blist online. No change\n");
}
g_free (fd_name);
}else{
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 11 Mar 2007 22:58:05 -0000 1.8
+++ .cvsignore 28 Dec 2007 17:30:15 -0000 1.9
@@ -1 +1 @@
-nautilus-sendto-0.10.tar.bz2
+nautilus-sendto-0.12.tar.bz2
nautilus-sendto-0.7-thunderbird.patch:
Index: nautilus-sendto-0.7-thunderbird.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-7/nautilus-sendto-0.7-thunderbird.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nautilus-sendto-0.7-thunderbird.patch 16 Sep 2006 06:19:41 -0000 1.1
+++ nautilus-sendto-0.7-thunderbird.patch 28 Dec 2007 17:30:15 -0000 1.2
@@ -28,14 +28,4 @@
cmd = g_strdup_printf ("%s %s", t_cmd, mailto->str);
g_spawn_command_line_async (cmd, NULL);
g_free (cmd);
---- nautilus-sendto-0.7/configure.thunderbird 2006-06-25 09:25:10.000000000 -0400
-+++ nautilus-sendto-0.7/configure 2006-09-16 02:13:01.000000000 -0400
-@@ -19430,7 +19430,7 @@
-
-
-
--enable_thunderbird=no
-+enable_thunderbird=yes
-
-
- if test "x$enable_thunderbird" = "xyes"; then
+
Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-7/nautilus-sendto.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- nautilus-sendto.spec 11 May 2007 15:43:22 -0000 1.36
+++ nautilus-sendto.spec 28 Dec 2007 17:30:15 -0000 1.37
@@ -1,10 +1,10 @@
Name: nautilus-sendto
-Version: 0.10
-Release: 4%{?dist}
+Version: 0.12
+Release: 1%{?dist}
Summary: Nautilus context menu for sending files
Group: User Interface/Desktops
-License: GPL
+License: GPLv2+
URL: ftp://ftp.gnome.org/pub/gnome/sources/%{name}
Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,8 +24,9 @@
Requires(preun): GConf2
Patch1: nautilus-sendto-0.7-thunderbird.patch
-Patch2: nautilus-sendto-0.10-wrong-error.patch
-Patch3: nautilus-sendto-0.10-pidgin.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=466427
+Patch2: purple_debug_info.patch
+Patch3: nautilus-sendto-0.12-pidgin-icq.patch
# For compat with old nautilus-sendto packaging
Provides: nautilus-sendto-gaim
@@ -44,8 +45,8 @@
%setup -q
%patch1 -p1 -b .thunderbird
-%patch2 -p1 -b .wrong-error
-%patch3 -p1 -b .pidgin
+%patch2 -p1 -b .purple_debug_info
+%patch3 -p1 -b .pidgin-icq
%build
@@ -97,9 +98,13 @@
%{_libdir}/pidgin/nautilus.so
%endif
%{_sysconfdir}/gconf/schemas/nst.schemas
-%{_datadir}/man/man1/nautilus-sendto.1.gz
+%{_mandir}/man1/nautilus-sendto.1.gz
%changelog
+* Fri Dec 28 2007 Adel Gadllah <adel.gadllah at gmail.com> - 0.12-1
+- Update to 0.12
+- Fix icq file transfers with pidgin RH #408511
+
* Fri May 11 2007 Stu Tomlinson <stu at nosnilmot.com> - 0.10-4
- Update to work with pidgin
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 11 Mar 2007 22:58:05 -0000 1.8
+++ sources 28 Dec 2007 17:30:15 -0000 1.9
@@ -1 +1 @@
-cc47d4364d71d6f35776c5634e2f1ed1 nautilus-sendto-0.10.tar.bz2
+9ec9a476be9a1c24ceddcfd76c6b3be2 nautilus-sendto-0.12.tar.bz2
More information about the fedora-extras-commits
mailing list