Index: nautilus-sendto-0.10-pidgin.patch =================================================================== RCS file: nautilus-sendto-0.10-pidgin.patch diff -N nautilus-sendto-0.10-pidgin.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ nautilus-sendto-0.10-pidgin.patch 11 May 2007 14:43:50 -0000 @@ -0,0 +1,323 @@ +diff -ur nautilus-sendto-0.10.gaim/configure nautilus-sendto-0.10/configure +--- nautilus-sendto-0.10.gaim/configure 2007-03-11 16:46:48.000000000 -0600 ++++ nautilus-sendto-0.10/configure 2007-05-11 08:08:04.000000000 -0600 +@@ -19079,7 +19079,7 @@ + BONOBO_ACTIVATION_REQUIRED=2.13.0 + BONOBO_REQUIRED=2.13.0 + GNOME_REQUIRED=2.13.0 +-GAIM_REQUIRED=1.5.0 ++GAIM_REQUIRED=2.0.0 + NAUTILUS_EXTENSION=2.13.3 + DBUS_REQUIRED=0.60 + +@@ -19597,12 +19597,12 @@ + pkg_cv_GAIM_CFLAGS="$GAIM_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gaim >= \$GAIM_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gaim >= $GAIM_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pidgin >= \$GAIM_REQUIRED\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "pidgin >= $GAIM_REQUIRED") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GAIM_CFLAGS=`$PKG_CONFIG --cflags "gaim >= $GAIM_REQUIRED" 2>/dev/null` ++ pkg_cv_GAIM_CFLAGS=`$PKG_CONFIG --cflags "pidgin >= $GAIM_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -19615,12 +19615,12 @@ + pkg_cv_GAIM_LIBS="$GAIM_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gaim >= \$GAIM_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gaim >= $GAIM_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pidgin >= \$GAIM_REQUIRED\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "pidgin >= $GAIM_REQUIRED") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GAIM_LIBS=`$PKG_CONFIG --libs "gaim >= $GAIM_REQUIRED" 2>/dev/null` ++ pkg_cv_GAIM_LIBS=`$PKG_CONFIG --libs "pidgin >= $GAIM_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -19639,9 +19639,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GAIM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gaim >= $GAIM_REQUIRED"` ++ GAIM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pidgin >= $GAIM_REQUIRED"` + else +- GAIM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gaim >= $GAIM_REQUIRED"` ++ GAIM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pidgin >= $GAIM_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GAIM_PKG_ERRORS" >&5 +@@ -19649,13 +19649,13 @@ + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + +- echo "Building without gaim" ++ echo "Building without pidgin" + enable_gaim=no + + + elif test $pkg_failed = untried; then + +- echo "Building without gaim" ++ echo "Building without pidgin" + enable_gaim=no + + +@@ -19667,8 +19667,8 @@ + + + +- GAIM_LIBDIR=`pkg-config --variable=libdir gaim` +- GAIM_DATADIR=`pkg-config --variable=datadir gaim` ++ GAIM_LIBDIR=`pkg-config --variable=libdir pidgin` ++ GAIM_DATADIR=`pkg-config --variable=datadir pidgin` + + + enable_gaim=yes +@@ -23751,9 +23751,9 @@ + fi + + if test "x${enable_gaim}" = "xyes" ; then +- echo " Enable gaim plugin : YES" ++ echo " Enable pidgin plugin : YES" + else +- echo " Enable gaim plugin : NO" ++ echo " Enable pidgin plugin : NO" + fi + + if test "x${enable_bluetooth}" = "xyes" ; then +diff -ur nautilus-sendto-0.10.gaim/gaim_plugin/Makefile.in nautilus-sendto-0.10/gaim_plugin/Makefile.in +--- nautilus-sendto-0.10.gaim/gaim_plugin/Makefile.in 2007-03-11 16:46:46.000000000 -0600 ++++ nautilus-sendto-0.10/gaim_plugin/Makefile.in 2007-05-11 08:06:12.000000000 -0600 +@@ -268,13 +268,13 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-plugindir = $(libdir)/gaim ++plugindir = $(libdir)/pidgin + plugin_LTLIBRARIES = nautilus.la + nautilus_la_SOURCES = nautilus-sendto-plugin.c + nautilus_la_LIBADD = $(NAUTILUS_SENDTO_CFLAGS) + nautilus_la_LDFLAGS = -module -avoid-version + AM_CPPFLAGS = \ +- -DLIBDIR=\"$(GAIM_LIBDIR)/gaim/\" \ ++ -DLIBDIR=\"$(GAIM_LIBDIR)/pidgin/\" \ + -DDATADIR=\"$(GAIM_DATADIR)\" \ + $(NAUTILUS_SENDTO_CFLAGS) \ + $(GAIM_CFLAGS) +diff -ur nautilus-sendto-0.10.gaim/gaim_plugin/nautilus-sendto-plugin.c nautilus-sendto-0.10/gaim_plugin/nautilus-sendto-plugin.c +--- nautilus-sendto-0.10.gaim/gaim_plugin/nautilus-sendto-plugin.c 2007-03-05 17:27:26.000000000 -0700 ++++ nautilus-sendto-0.10/gaim_plugin/nautilus-sendto-plugin.c 2007-05-11 08:43:38.000000000 -0600 +@@ -26,8 +26,8 @@ + #include + #endif + +-#ifndef GAIM_PLUGINS +-#define GAIM_PLUGINS ++#ifndef PURPLE_PLUGINS ++#define PURPLE_PLUGINS + #endif + + #include +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + #include "conversation.h" + #include "core.h" +@@ -48,7 +49,6 @@ + #include "server.h" + + #include "gtkplugin.h" +-#include "gaim.h" + #include "version.h" + #include "prefs.h" + +@@ -63,17 +63,17 @@ + GString *buddies_str; + + void +-get_online_buddies (GaimBlistNode *node, GString *str){ ++get_online_buddies (PurpleBlistNode *node, GString *str){ + +- GaimBlistNode *aux; ++ PurpleBlistNode *aux; + + if (node == NULL) + return; + for (aux = node ; aux != NULL ;aux = aux->next){ +- if (GAIM_BLIST_NODE_IS_BUDDY(aux)){ +- GaimBuddy *buddy; +- buddy = (GaimBuddy*)aux; +- if (GAIM_BUDDY_IS_ONLINE(buddy)){ ++ if (PURPLE_BLIST_NODE_IS_BUDDY(aux)){ ++ PurpleBuddy *buddy; ++ buddy = (PurpleBuddy*)aux; ++ if (PURPLE_BUDDY_IS_ONLINE(buddy)){ + gchar *alias; + + if (buddy->alias == NULL){ +@@ -103,7 +103,7 @@ + + gint + save_online_buddies (){ +- GaimBuddyList *blist; ++ PurpleBuddyList *blist; + GString *str; + gchar *fd_name; + FILE *fd; +@@ -111,7 +111,7 @@ + fd_name = g_build_path ("/", g_get_home_dir(), PLUGIN_HOME, + B_ONLINE, NULL); + +- blist = gaim_get_blist(); ++ blist = purple_get_blist(); + str = g_string_new ("---\n"); + get_online_buddies (blist->root, str); + str = g_string_append (str, "---\n"); +@@ -123,10 +123,10 @@ + g_free (fd_name); + 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"); + } + + return TRUE; +@@ -142,19 +142,19 @@ + + if (!g_file_test (plugin_home,G_FILE_TEST_IS_DIR)){ + mkdir (plugin_home, 0755); +- gaim_debug_info ("nautilus", "creating: %s\n",plugin_home); ++ purple_debug_info ("nautilus", "creating: %s\n",plugin_home); + } + g_free (plugin_home); + spool = g_build_path ("/", g_get_home_dir(), PLUGIN_HOME, "spool", NULL); + if (!g_file_test (spool,G_FILE_TEST_IS_DIR)){ + mkdir (spool, 0755); +- gaim_debug_info ("nautilus", "creating: %s\n", spool); ++ purple_debug_info ("nautilus", "creating: %s\n", spool); + } + g_free (spool); + spool_tmp = g_build_path ("/", g_get_home_dir(), PLUGIN_HOME, "spool", "tmp", NULL); + if (!g_file_test (spool_tmp,G_FILE_TEST_IS_DIR)){ + mkdir (spool_tmp, 0755); +- gaim_debug_info ("nautilus", "creating: %s\n", spool_tmp); ++ purple_debug_info ("nautilus", "creating: %s\n", spool_tmp); + } + g_free (spool_tmp); + } +@@ -163,10 +163,10 @@ + send_file (GString *username, GString *cname, + GString *protocol, GString *file){ + +- GaimAccount *account; +- GaimXfer *xfer; ++ PurpleAccount *account; ++ PurpleXfer *xfer; + +- account = gaim_accounts_find (username->str, protocol->str); ++ account = purple_accounts_find (username->str, protocol->str); + if (account == NULL) + return; + +@@ -190,7 +190,7 @@ + if (io == NULL) + return; + +- gaim_debug_info ("nautilus","Open spool file : %s\n",file); ++ purple_debug_info ("nautilus","Open spool file : %s\n",file); + g_io_channel_read_line_string (io, username, NULL, NULL); + username = g_string_truncate (username, username->len - 1); + g_io_channel_read_line_string (io, cname, NULL, NULL); +@@ -229,7 +229,7 @@ + plugin_spool = g_build_path ("/", g_get_home_dir(),PLUGIN_HOME,"spool", NULL); + dir = opendir (plugin_spool); + if (dir == NULL){ +- gaim_debug_info ("nautilus","Can't open the spool dir\n"); ++ purple_debug_info ("nautilus","Can't open the spool dir\n"); + }else{ + while (ep = readdir(dir)){ + gchar *file; +@@ -253,16 +253,16 @@ + } + + static gboolean +-plugin_load(GaimPlugin *plugin) { ++plugin_load(PurplePlugin *plugin) { + + + init_plugin_stuff (); + buddies_str = g_string_new (""); +- save_blist_timeout_handler = gaim_timeout_add (5000, ++ save_blist_timeout_handler = purple_timeout_add (5000, + save_online_buddies, + NULL); + taking_files = FALSE; +- take_spool_files_handler = gaim_timeout_add (3000, ++ take_spool_files_handler = purple_timeout_add (3000, + take_spool_files, + NULL); + return TRUE; +@@ -274,30 +274,30 @@ + + fd_name = g_build_path ("/", g_get_home_dir(), PLUGIN_HOME, + B_ONLINE, NULL); +- gaim_timeout_remove (save_blist_timeout_handler); +- gaim_timeout_remove (take_spool_files_handler); ++ purple_timeout_remove (save_blist_timeout_handler); ++ purple_timeout_remove (take_spool_files_handler); + remove (fd_name); + g_free(fd_name); + g_string_free (buddies_str, TRUE); +- gaim_debug_info ("nautilus", "Stop nautilus plugin\n"); ++ purple_debug_info ("nautilus", "Stop nautilus plugin\n"); + + return TRUE; + } + + static void +-init_plugin(GaimPlugin *plugin) { ++init_plugin(PurplePlugin *plugin) { + + } + +-static GaimPluginInfo info = { +- GAIM_PLUGIN_MAGIC, /* api version */ +- GAIM_MAJOR_VERSION, +- GAIM_MINOR_VERSION, +- GAIM_PLUGIN_STANDARD, /* type */ +- GAIM_GTK_PLUGIN_TYPE, /* ui requirement */ ++static PurplePluginInfo info = { ++ PURPLE_PLUGIN_MAGIC, /* api version */ ++ PURPLE_MAJOR_VERSION, ++ PURPLE_MINOR_VERSION, ++ PURPLE_PLUGIN_STANDARD, /* type */ ++ PIDGIN_PLUGIN_TYPE, /* ui requirement */ + 0, /* flags */ + NULL, /* dependencies */ +- GAIM_PRIORITY_DEFAULT, /* priority */ ++ PURPLE_PRIORITY_DEFAULT, /* priority */ + + "gtk-nautilus", /* id */ + N_("Nautilus Integration"), /* name */ +@@ -316,5 +316,5 @@ + NULL /* actions info */ + }; + +-GAIM_INIT_PLUGIN(nautilus, init_plugin, info) ++PURPLE_INIT_PLUGIN(nautilus, init_plugin, info) + Index: nautilus-sendto.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v retrieving revision 1.35 diff -u -d -p -r1.35 nautilus-sendto.spec --- nautilus-sendto.spec 9 May 2007 18:56:31 -0000 1.35 +++ nautilus-sendto.spec 11 May 2007 14:43:50 -0000 @@ -1,6 +1,6 @@ Name: nautilus-sendto Version: 0.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Nautilus context menu for sending files Group: User Interface/Desktops @@ -14,8 +14,7 @@ BuildRequires: libglade2-devel BuildRequires: evolution-data-server-devel >= 1.9.1 BuildRequires: libgnomeui-devel BuildRequires: nautilus-devel >= 2.5.4 -# Disabling gaim temporarily during transition to pidgin -#BuildRequires: gaim-devel >= 1.0 +BuildRequires: pidgin-devel >= 2.0.0 BuildRequires: gettext BuildRequires: perl-XML-Parser BuildRequires: dbus-glib-devel >= 0.70 @@ -26,6 +25,7 @@ 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 # For compat with old nautilus-sendto packaging Provides: nautilus-sendto-gaim @@ -45,6 +45,7 @@ Evolution integration. %patch1 -p1 -b .thunderbird %patch2 -p1 -b .wrong-error +%patch3 -p1 -b .pidgin %build @@ -92,14 +93,16 @@ fi %{_libdir}/nautilus-sendto/plugins/*.so %{_datadir}/nautilus-sendto %{_bindir}/nautilus-sendto -# Disabling gaim temporarily during transition to pidgin -#%ifnarch s390 s390x -#%{_libdir}/gaim/nautilus.so -#%endif +%ifnarch s390 s390x +%{_libdir}/pidgin/nautilus.so +%endif %{_sysconfdir}/gconf/schemas/nst.schemas %{_datadir}/man/man1/nautilus-sendto.1.gz %changelog +* Fri May 11 2007 Stu Tomlinson - 0.10-4 +- Update to work with pidgin + * Wed May 9 2007 Matthias Clasen - 0.10-3 - Fix a problem with dbus error handling (#239588)