rpms/nautilus-sendto/devel nautilus-sendto.spec, 1.76, 1.77 nst-empathy-new-api-again.patch, 1.1, 1.2
Bastien Nocera
hadess at fedoraproject.org
Fri Jun 19 19:20:55 UTC 2009
Author: hadess
Update of /cvs/pkgs/rpms/nautilus-sendto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29851
Modified Files:
nautilus-sendto.spec nst-empathy-new-api-again.patch
Log Message:
Update patch to match upstream
Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- nautilus-sendto.spec 18 Jun 2009 15:12:38 -0000 1.76
+++ nautilus-sendto.spec 19 Jun 2009 19:20:22 -0000 1.77
@@ -9,6 +9,7 @@ URL: ftp://ftp.gnome.org/pub/
Source0: http://download.gnome.org/sources/%{name}/1.1/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# http://bugzilla.gnome.org/show_bug.cgi?id=584716
Patch0: nst-empathy-new-api-again.patch
BuildRequires: gtk2-devel
nst-empathy-new-api-again.patch:
Index: nst-empathy-new-api-again.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nst-empathy-new-api-again.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nst-empathy-new-api-again.patch 18 Jun 2009 15:12:39 -0000 1.1
+++ nst-empathy-new-api-again.patch 19 Jun 2009 19:20:22 -0000 1.2
@@ -1,5 +1,28 @@
+From 258a1e1a1c8aaa8544a4f491196daf6411300c46 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimo.cecchi at collabora.co.uk>
+Date: Fri, 19 Jun 2009 19:13:27 +0000
+Subject: Bug 584716 – Use the new Empathy file transfer API
+
+Empathy 2.27.3 changed its file transfer API; adapt the Empathy plugin
+in nautilus-sendto to use it.
+---
+diff --git a/configure.in b/configure.in
+index 105a01f..cc7159c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -34,8 +34,8 @@ NAUTILUS_EXTENSION=2.13.3
+ DBUS_REQUIRED=1.0
+ DBUS_GLIB_REQUIRED=0.60
+ GUPNP_AV_REQUIRED=0.2.1
+-EMPATHY_REQUIRED=2.25.5
+-EMPATHY_GTK_REQUIRED=2.25.2
++EMPATHY_REQUIRED=2.27.3
++EMPATHY_GTK_REQUIRED=2.27.3
+
+ AC_SUBST(GLIB_REQUIRED)
+ AC_SUBST(GTK_REQUIRED)
diff --git a/src/plugins/empathy/empathy.c b/src/plugins/empathy/empathy.c
-index 25d446f..60c9a15 100644
+index 25d446f..9594dd4 100644
--- a/src/plugins/empathy/empathy.c
+++ b/src/plugins/empathy/empathy.c
@@ -1,5 +1,5 @@
@@ -19,10 +42,11 @@ index 25d446f..60c9a15 100644
*/
#include "config.h"
-@@ -31,8 +32,10 @@
+@@ -30,9 +31,10 @@
+
#include <libempathy/empathy-debug.h>
#include <libempathy/empathy-contact-manager.h>
- #include <libempathy/empathy-dispatcher.h>
+-#include <libempathy/empathy-dispatcher.h>
-#include <libempathy/empathy-utils.h>
+#include <libempathy/empathy-ft-factory.h>
+#include <libempathy/empathy-ft-handler.h>
@@ -31,23 +55,16 @@ index 25d446f..60c9a15 100644
#include <libempathy-gtk/empathy-contact-selector.h>
#include <libempathy-gtk/empathy-ui-utils.h>
-@@ -41,6 +44,7 @@
+@@ -40,7 +42,7 @@
+ #include "nautilus-sendto-plugin.h"
static MissionControl *mc = NULL;
- static EmpathyDispatcher *dispatcher = NULL;
+-static EmpathyDispatcher *dispatcher = NULL;
+static EmpathyFTFactory *factory = NULL;
static guint transfers = 0;
static gboolean destroy (NstPlugin *plugin);
-@@ -59,6 +63,7 @@ init (NstPlugin *plugin)
- empathy_gtk_init ();
-
- mc = empathy_mission_control_dup_singleton ();
-+ dispatcher = empathy_dispatcher_dup_singleton ();
- accounts = mission_control_get_online_connections (mc, FALSE);
-
- if (g_slist_length (accounts) == 0)
-@@ -147,16 +152,19 @@ quit (void)
+@@ -147,16 +149,19 @@ quit (void)
}
static void
@@ -75,7 +92,7 @@ index 25d446f..60c9a15 100644
}
static void
-@@ -169,13 +177,14 @@ error_dialog_cb (GtkDialog *dialog,
+@@ -169,13 +174,14 @@ error_dialog_cb (GtkDialog *dialog,
}
static void
@@ -95,7 +112,7 @@ index 25d446f..60c9a15 100644
{
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR,
-@@ -187,19 +196,13 @@ send_file_cb (EmpathyDispatchOperation *dispatch,
+@@ -187,19 +193,13 @@ send_file_cb (EmpathyDispatchOperation *dispatch,
}
else
{
@@ -120,7 +137,7 @@ index 25d446f..60c9a15 100644
}
static gboolean
-@@ -212,56 +215,27 @@ send_files (NstPlugin *plugin,
+@@ -212,56 +212,27 @@ send_files (NstPlugin *plugin,
contact = get_selected_contact (contact_widget);
@@ -182,13 +199,13 @@ index 25d446f..60c9a15 100644
+ ++transfers;
+
+ empathy_ft_factory_new_transfer_outgoing (factory,
-+ contact, file, FALSE);
++ contact, file);
+
+ g_object_unref (file);
}
g_object_unref (contact);
-@@ -281,8 +255,8 @@ destroy (NstPlugin *plugin)
+@@ -281,8 +252,8 @@ destroy (NstPlugin *plugin)
if (mc)
g_object_unref (mc);
@@ -199,47 +216,5 @@ index 25d446f..60c9a15 100644
return TRUE;
}
-diff --git a/src/plugins/empathy/empathy.c b/src/plugins/empathy/empathy.c
-index 60c9a15..f38e5e8 100644
---- a/src/plugins/empathy/empathy.c
-+++ b/src/plugins/empathy/empathy.c
-@@ -31,7 +31,6 @@
-
- #include <libempathy/empathy-debug.h>
- #include <libempathy/empathy-contact-manager.h>
--#include <libempathy/empathy-dispatcher.h>
- #include <libempathy/empathy-ft-factory.h>
- #include <libempathy/empathy-ft-handler.h>
- #include <libempathy/empathy-tp-file.h>
-@@ -43,7 +42,6 @@
- #include "nautilus-sendto-plugin.h"
-
- static MissionControl *mc = NULL;
--static EmpathyDispatcher *dispatcher = NULL;
- static EmpathyFTFactory *factory = NULL;
- static guint transfers = 0;
-
-@@ -63,7 +61,6 @@ init (NstPlugin *plugin)
- empathy_gtk_init ();
-
- mc = empathy_mission_control_dup_singleton ();
-- dispatcher = empathy_dispatcher_dup_singleton ();
- accounts = mission_control_get_online_connections (mc, FALSE);
-
- if (g_slist_length (accounts) == 0)
-
-diff --git a/configure.in b/configure.in
-index 105a01f..cc7159c 100644
---- a/configure.in
-+++ b/configure.in
-@@ -34,8 +34,8 @@ NAUTILUS_EXTENSION=2.13.3
- DBUS_REQUIRED=1.0
- DBUS_GLIB_REQUIRED=0.60
- GUPNP_AV_REQUIRED=0.2.1
--EMPATHY_REQUIRED=2.25.5
--EMPATHY_GTK_REQUIRED=2.25.2
-+EMPATHY_REQUIRED=2.27.3
-+EMPATHY_GTK_REQUIRED=2.27.3
-
- AC_SUBST(GLIB_REQUIRED)
- AC_SUBST(GTK_REQUIRED)
+--
+cgit v0.8.2
More information about the fedora-extras-commits
mailing list