diff options
Diffstat (limited to 'gnome-extra/nautilus-sendto')
15 files changed, 21 insertions, 1185 deletions
diff --git a/gnome-extra/nautilus-sendto/ChangeLog b/gnome-extra/nautilus-sendto/ChangeLog index 6b983f3b6121..b9adaa81fe8b 100644 --- a/gnome-extra/nautilus-sendto/ChangeLog +++ b/gnome-extra/nautilus-sendto/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for gnome-extra/nautilus-sendto # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.76 2014/09/25 13:52:11 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.77 2014/11/13 12:05:51 pacho Exp $ + + 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> + -files/nautilus-sendto-2.28.4-gseal-enable.patch, + -files/nautilus-sendto-2.28.4-item-focus.patch, + -files/nautilus-sendto-2.28.4-remove-empathy.patch, + -files/nautilus-sendto-2.28.4-remove-old-evo.patch, + -files/nautilus-sendto-2.28.4-shadowed-mounts.patch, + -files/nautilus-sendto-2.28.4-thunderbird-command.patch, + -files/nautilus-sendto-2.28.4-unload-dbus.patch, + -files/nautilus-sendto-2.28.4-unload-init.patch, + -files/nautilus-sendto-2.28.4-unload.patch, + -files/nautilus-sendto-2.28.5-commandline-help.patch, + -files/nautilus-sendto-2.28.5-fix-memleaks.patch, + -nautilus-sendto-2.32.0.ebuild, metadata.xml: + Drop old (#508854) *nautilus-sendto-3.8.2 (25 Sep 2014) diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest index 1469f06b4e1c..b1082d6e98a8 100644 --- a/gnome-extra/nautilus-sendto/Manifest +++ b/gnome-extra/nautilus-sendto/Manifest @@ -1,29 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX nautilus-sendto-2.28.4-gseal-enable.patch 1345 SHA256 2e42e5ecf35cfdf348dfa2d77b94400e92dc8c0eb8150788c657f1fc1dc68126 SHA512 662f8407882c83ed0c025b2c5b9b16f399e25409b2868e8af3c2904f03e34c254bc6c7f01250db1e601891e9216b7f8f930de5fefbfa7e317e70ff2a6e8a049f WHIRLPOOL 5e152650367da10159cdff16a60aa8a6ef411aa473b63edeeb9d7d11b56560950d62fde259b2916b9654160b8f2502e69dcc23d64f5c1f7156066b316d2e85c6 -AUX nautilus-sendto-2.28.4-item-focus.patch 1009 SHA256 e145e6a2992090ee1cbedd850121b7a921c8025eadca697a80db0504831adb18 SHA512 bc6621e2d8050faca8e6db061582f1ded3bef8436fb4f4b656cce81ff2d09a2b1d84029760ffc38e6857609f4244c36b75f67d107f183c94d5b662ce024b2d78 WHIRLPOOL 6701409520a5b4bcc1f6688304222a188725cb030f699413281975fbf3581531385133e2c9ca890414478a57587c361b32c595e8fabf26153a1553f6b456e7e8 -AUX nautilus-sendto-2.28.4-remove-empathy.patch 10102 SHA256 74b3680e93bea6a2f5bdd1acc3ee625f88b15efcd00b9c8f3464f005c90a999d SHA512 d241bc3a2e76d3f0cde973604a8677575961deab9524f79cc6a981a2f9e0c0140b90087f6b363dc9e49f8f25361c53ee3a523483c7a2fb4805fdc061835fdafe WHIRLPOOL 5598f2b0f81f755581c07032713ce3147dcc39d60ae71b7e8a4d10757ec491e17611b94bce05dd05343f21bf5e2295b9abe5fc1cd150dcc0376c63f2f373dd8e -AUX nautilus-sendto-2.28.4-remove-old-evo.patch 8821 SHA256 c07ca391ead906a0993543b64b180e74242af0295123a36fc1844b1f19e5813b SHA512 120ad06976acc76f5fce9358175fd3193fefd53ebe3c8a5c0c7671e057bc8e3921947c640755c35f997d71fe2e6e778409a118d1f542f34236fc91958d4861cc WHIRLPOOL e746e892d110b8e10549907ab9cbf4a4e643c51a8e676cd60ce778b4448f2a796ee48f5f706926bbbd60dce2d842b8f612839287147bf4cc82b6bd1ad4babf7d -AUX nautilus-sendto-2.28.4-shadowed-mounts.patch 2407 SHA256 92d339ad9d2d12cede2a766210426ddd5524b2e748d01b2ca8ae5460d35af94e SHA512 d7150059e8d38dddba0c17bb09d8df52f7abc1a97757c6d2ab706124f6093e883b872b926eca12d2b018c61edff2410f65694173db94dde7ed51bb266c9e69c5 WHIRLPOOL b20ef4ad39cd3e06bfe5081059edbf68ef26c647fe46fb14a3ad3e52afe08abe162be453ae814cc81c61612a76b4a854bdabfcdc4856376076a5f6185cd2152f -AUX nautilus-sendto-2.28.4-thunderbird-command.patch 1329 SHA256 bb4c401ae83c40ed3378a75437f4cfed818f8e1074af643be0c0b3ac04d7c3e9 SHA512 24a693961b1ab6f5a2ee58d97ac93dc49872d6bf3084721c689636788aecc6cd6be84e07a30709d270e16645c5102a44adffccb1f3d348384106a11515d8ddcc WHIRLPOOL 678745c407a711c52f39761990d03c14ec2cce1ef023794ca5a3c6fd398685a98be2201e4641751d4c96fd99f232d50e0025c2ab0f5bac976471cbbf20413fe3 -AUX nautilus-sendto-2.28.4-unload-dbus.patch 669 SHA256 1ec5d84b3b2659dae4c7b118b0f059b69bbf27d3e58abcab7893e59bdc912c14 SHA512 a851f9820c1c6726b0d576bb9ced2b5f0795594e483736da7c34127d859f49bf15fa67ef7f7553bd0e2135b94116cf8e63c021f94f5a02f6cde61c9d63dd0a51 WHIRLPOOL 85ac093793f95e97edccc9c291d8dc4785bef80c75c8ea8c3e74b33c23670ef096ec7759960b409813d27ebdbc7945f994a87f20554f1d4616993bc9a472edb6 -AUX nautilus-sendto-2.28.4-unload-init.patch 753 SHA256 bac15fa5ff7838a2b679525f5d1da502d4b22081c7737f1f9e558e0d89f9a35c SHA512 38b6dbec8ea5bde2a3f8854784834abec099d6e24cdc4912de5b8cce9aabcc284a109f62609a1744dee9c21a6f39723a8287236715ad439dceeccc738468909f WHIRLPOOL 51416ea65347dc3c8e8a95eef8335218535cbdb57326e5947b2d8565f273c86807c59a31d5322092e480c8eb788870fd6718c47c0d4987ccea040c54f363a67c -AUX nautilus-sendto-2.28.4-unload.patch 4212 SHA256 630944971f0f2fb3680eb3e336b1639b4e1f767a0ef38d90138dda6b582254d2 SHA512 46e5bb3fbe35ef1388de86754a64241bba8fc81a1dbafef2e2e4f06b674a09fbbb61cd0e93ee39bb469852eddec6f390bfb0a317aeae3348466e448abf2af9aa WHIRLPOOL 7826e5c126ecb10b5f1dbc842aca83461b8d5ba0e52dbdffc22fc5c1b62552feb3545c295b03d74f205ba2cf09709e9cf9f3c3087571bc57e2078a49c4de9856 -AUX nautilus-sendto-2.28.5-commandline-help.patch 1123 SHA256 f5a928cf771d55f5514b73ff5aa509df73ed1dae4d14b418ddebb256c4940e8d SHA512 6555f45709fe4a832c3d8c7df8bf54dcf82f356e31c950621190116413957ebe449debd3e235f0754356441c6028a827d4f57c743f7451b04a8493b2e2e5a84d WHIRLPOOL 5431cf33fdca7b1b6ba6aade5ea4594adcd7ce2236bd477180e5ae0ae94c12f033da1db71041fcebfbbd6eb71d45da34b9889db05435ff6baadf5643172e291e -AUX nautilus-sendto-2.28.5-fix-memleaks.patch 1596 SHA256 dd78e9382bd5e55f262c8609a50b9daf5bfb4c45c8d9d27e732ca74b8a338388 SHA512 5ffd9e41449f934977904cf1403012d1db1faa567a97eb16290b595c09ddb57d171eb5ab4b96b19ce6844fa9ebe9c8a728557c970a68ca2ca181cf88ff809dad WHIRLPOOL 8817fbb809c9e25c5df16258a8ef2aec014687afe89ebe1e2dc49bf76e0218874342acaeede13d435aad255ad8861fa10fd870f26a66cffe78f9b5cfdc4b40ed -DIST nautilus-sendto-2.32.0.tar.bz2 446731 SHA256 890090b24381d91f079610d5454cb786a3ecefc91fa06649b2222be9bb02269a SHA512 4846155d9adf7c8e298b80a5487a7df0ff1e430c82c96b565413f63c015b84629d21a8b104d84ee8355f975044219c521a728d4a6d28862bafb0e871d86277d8 WHIRLPOOL 4a38f5d4533488751e758a82e6a11c496993f2f5c687f55af8638a86b661849f8aae0ac3baf14e7a07b3cb6f04d4fe852f710f5643be9ac271d1bf3952be2ad9 DIST nautilus-sendto-3.8.1.tar.xz 344040 SHA256 03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab SHA512 4559bf14604ca553be9ccc4a3961a93917cd643338dd1f86fa2edbde2a7c66c4db35204a19ca6fde27ceef48736d552bdad750c24ab4b26238e478cd88caaf3a WHIRLPOOL aeeb170614cb405f5aa7f923eaa32b33be7961d982d7c7a1a639a387f4002b41a4430864eff1b473006b9136248cfaf7763cacde9d5aecca8788cdcca3c8a049 DIST nautilus-sendto-3.8.2.tar.xz 343032 SHA256 932811e781457b1dbf7b396e930d588f433b9ba756b10bde9f03f6d71d54bdc5 SHA512 51ae4b4a14d21677b043c3023d548c1984808ab3216a14b89988bf6883e8807c8215375026f0558723792aba1552518d53631388b18c1c4346813f6246b8a422 WHIRLPOOL a38dab01ee907a23d36afcd6ce90af8b5c08e064435bbe2a96eae522d6fab568b0e5e8390e7f002ba87ee4c8bd06e1293e25057c7dbf4343ee788e8dbb52418d -EBUILD nautilus-sendto-2.32.0.ebuild 1437 SHA256 b99c065a4c145503a8c2c3cc52b7a0f98692a78804fb3b53ec796d1b9cd49112 SHA512 7655a3767d4d8e88ec4eedb8d27b4f8fbd3bf3600d324e3f039cd35f5914aa399d8117a90148eca811063de51df278061abeb9c1269a20158beca7de2bb18352 WHIRLPOOL 4aa579dc11ae3b6aa3ba6984196e09830f794af8df02589f2c5d1df349b4a62fca5d919bfcf1ebc0b2503b9fbe2cda1e914d1651d1d9786d7d6cdaa657730ede EBUILD nautilus-sendto-3.8.1.ebuild 761 SHA256 c3af6e755b23ffe93034af3ef16cff322ce090160cb309beb54197f546b0cf3b SHA512 af80e700a261e5bb86404bf73cc10d57b34de228d690472da9ee590f8caefa9a5d7a5e523974bc7ad448bdd4ec1aa0cba4885e1f290ecae361f87e736304f671 WHIRLPOOL 399c11d0ece178de0cfce30b0dbab9728f03fa6c762cedec290f309a530111c308a5eb39960581d555b73168b69bfd547a72bcaf10a1230bbba14cf09bda1950 EBUILD nautilus-sendto-3.8.2.ebuild 788 SHA256 ab1eed1a67a7d7f2fb608f5f7d9e725b75bc74d678d81e4b89182468feab5788 SHA512 54cbf31a145fc9f445ed5a1a78f0d64a4e20c5a420fbecbd99bbf162c8645305f2a1a9cab67dd27db1e02d7a0721cdd71850a447b63af372d259e36094340444 WHIRLPOOL 049a6febb73f656663675895e6e3c26ca9b8971ec05aa295fedbe88b26d77833de4fca92055f6b0ec32b59c8bcb299fc0e2ec16778131279811806ed8fe07b7b -MISC ChangeLog 15082 SHA256 32b09e9df56f69138dba44c1fc2eba7181b9adec48e78184b682e98ba4407351 SHA512 8d36d6a66c7f6acac3e4c06aa85105cd99402ce0c5c76fbe7db3bbe206cacf1e6494d92cbe07b6a8934c381261d3731e0cc49e39dd368a97c3c888f073c6bd75 WHIRLPOOL fe1118db94bc878c2b1eb8f441388a9bf6524f295017fccfbdf74e1609d913c500ef14ae37b367db635637c08f47661df9ae97ad1791ee45dccc78cb97ee3ad6 -MISC metadata.xml 429 SHA256 d6ca2ca2610c15e8bcbd18c720ae8ecc99d5fa3408c9490f0cd78ae7edcfdc50 SHA512 9ebf3bb8297509dd76eb7665a8b7b77cc6d2a76ec1c0bf19606b03385527b4f6674a84b95e0633ae193ed5aa404e435468bced75a9e1dea51caed8ac7a29bdcf WHIRLPOOL d4fc1556fa18af058d9fa6759f5529e466922958818cf3759375823b384462ac6bd7facc34aec62e2ff797db63fb4bea0f491483d3e9149923093c75cd6ccac3 +MISC ChangeLog 15778 SHA256 d63a784e8cc0115f4b37d0f6356b0a1f9c4fe358bd4ca6ce6f14edf5cd99e13f SHA512 b5931fc0015cde763ff730406f72facddf868dc19c7618abbb580f59d5a3a1c09ec1cd6a56e0d4834877b928e312d958f63516a319904b7cdaa0b2ea14820add WHIRLPOOL 02cb5c8f934f213f8b0bb25d023c74ef82457dfb2c96a46835a0ef9b2dc5e69148fac68592f718500cfdaaba22fcfa1ea7b270f6c6677576bb5325dcaf295b05 +MISC metadata.xml 160 SHA256 458c663699e281bb9a8803997ef8fc9d4f08af8a60057d98a0bfb8c3a6173beb SHA512 1d58e82201f6df27f61065cba6fb92f92d392dc073167e8f84b4b16d897e9169164276c36982690ed3f34bc1393d4bc1e10a7f45828d9e8494ee0de7b8b193ac WHIRLPOOL 3ba40bfa878809bf3976fec01ced44ed7153d501213ed2299406554bc26be72e8659d7b2bd8397e12ca75a6d302df94f5eb3933cfc159789b59776395da67c5e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQkHgwACgkQCaWpQKGI+9QEgACfcldWA/k3/9QUuT7FJzeSD/5d -8yMAn0Owqnvsr52V0MmHHfH0m1C3kUcp -=LqWY +iEYEAREIAAYFAlRknqAACgkQCaWpQKGI+9RaEACeI/JBd9qVP0vC+FfSSXxtZ3JO +i7kAnjteM6ZQSFRFO+K+8DTykjKGaGXG +=AOXA -----END PGP SIGNATURE----- diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-gseal-enable.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-gseal-enable.patch deleted file mode 100644 index 5875fcd902ae..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-gseal-enable.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6d9294461935516991082e535a09b28d27105abe Mon Sep 17 00:00:00 2001 -From: Andre Klapper <a9016009@gmx.de> -Date: Sat, 29 May 2010 01:42:30 +0000 -Subject: Compile with -DGSEAL_ENABLE. Fixes bug 612493. - ---- -diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c -index 094fe62..674d774 100644 ---- a/src/nautilus-sendto-command.c -+++ b/src/nautilus-sendto-command.c -@@ -335,7 +335,7 @@ static void - send_if_no_pack_cb (GtkWidget *widget, NS_ui *ui) - { - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ui->pack_checkbutton))) { -- if (GTK_WIDGET_IS_SENSITIVE (ui->pack_entry)) { -+ if (gtk_widget_is_sensitive (ui->pack_entry)) { - gtk_widget_grab_focus (ui->pack_entry); - } else { - gtk_widget_grab_focus (ui->pack_checkbutton); -diff --git a/src/plugins/evolution/e-contact-entry.c b/src/plugins/evolution/e-contact-entry.c -index 69ffa3d..e190290 100644 ---- a/src/plugins/evolution/e-contact-entry.c -+++ b/src/plugins/evolution/e-contact-entry.c -@@ -385,7 +385,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data) - EContactEntry *entry; - entry = E_CONTACT_ENTRY (editable); - -- if (GTK_ENTRY (editable)->text_length >= entry->priv->lookup_length) { -+ if (gtk_entry_get_text_length (GTK_ENTRY (editable)) >= entry->priv->lookup_length) { - GList *l; - EBookQuery *query; - --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-item-focus.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-item-focus.patch deleted file mode 100644 index c76602ea5271..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-item-focus.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 90859ca39bb877b665bb99da73c47569dc6a55b0 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 09 Jun 2010 16:13:01 +0000 -Subject: Make the last selected medium's widget grab focus - -https://bugzilla.gnome.org/show_bug.cgi?id=615214 ---- -diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c -index 674d774..dd21620 100644 ---- a/src/nautilus-sendto-command.c -+++ b/src/nautilus-sendto-command.c -@@ -429,6 +429,7 @@ set_model_for_options_combobox (NS_ui *ui) - GtkListStore *model; - GtkIconTheme *it; - GtkCellRenderer *renderer; -+ GtkWidget *widget; - GList *aux; - NstPlugin *p; - char *last_used = NULL; -@@ -484,6 +485,10 @@ set_model_for_options_combobox (NS_ui *ui) - - gtk_combo_box_set_active (GTK_COMBO_BOX (ui->options_combobox), option); - -+ /* Grab the focus for the most recently used widget */ -+ widget = g_list_nth_data (ui->contact_widgets, option); -+ gtk_widget_grab_focus (widget); -+ - return last_used_support_dirs; - } - --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-remove-empathy.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-remove-empathy.patch deleted file mode 100644 index b9b330952ff1..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-remove-empathy.patch +++ /dev/null @@ -1,387 +0,0 @@ -From 91aa1610f6ed1d36abe1d7bf1f607616cf8187da Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 09 Jun 2010 16:39:13 +0000 -Subject: Remove Empathy plugin - -It now lives in Empathy itself. ---- -diff --git a/configure.in b/configure.in -index d7318d9..8781f50 100644 ---- a/configure.in -+++ b/configure.in -@@ -38,8 +38,6 @@ NAUTILUS_EXTENSION=2.13.3 - DBUS_REQUIRED=1.0 - DBUS_GLIB_REQUIRED=0.60 - GUPNP_REQUIRED=0.13 --EMPATHY_REQUIRED=2.27.91 --EMPATHY_GTK_REQUIRED=2.27.91 - - AC_SUBST(GLIB_REQUIRED) - AC_SUBST(GTHREAD_REQUIRED) -@@ -50,8 +48,6 @@ AC_SUBST(NAUTILUS_EXTENSION) - AC_SUBST(BLUETOOTH_REQUIRED) - AC_SUBST(DBUS_REQUIRED) - AC_SUBST(GUPNP_REQUIRED) --AC_SUBST(EMPATHY_REQUIRED) --AC_SUBST(EMPATHY_GTK_REQUIRED) - - PKG_CHECK_MODULES(NAUTILUS_SENDTO,\ - glib-2.0 >= $GLIB_REQUIRED \ -@@ -82,7 +78,7 @@ AC_MSG_NOTICE([installing nautilus plugin in ${ac_with_nautilusdir}]) - AC_SUBST([NAUTILUS_EXTENSION_DIR],[${ac_with_nautilusdir}]) - - # The full list of plugins --allowed_plugins="bluetooth empathy evolution gajim nautilus-burn pidgin removable-devices upnp" -+allowed_plugins="bluetooth evolution gajim nautilus-burn pidgin removable-devices upnp" - - plugin_error_or_ignore() - { -@@ -141,14 +137,6 @@ for plugin in ${used_plugins}; do - add_plugin="0" - fi - ;; -- empathy) -- PKG_CHECK_MODULES(EMPATHY, libempathy >= $EMPATHY_REQUIRED libempathy-gtk >= $EMPATHY_GTK_REQUIRED libempathy-gtk <= 2.29.1 gio-2.0 telepathy-glib, -- enable_empathy=yes, enable_empathy=no) -- if test "${enable_empathy}" != "yes" ; then -- plugin_error_or_ignore "you need libempathy and libempathy-gtk to build the Empathy plugin" -- add_plugin="0" -- fi -- ;; - evolution) - PKG_CHECK_MODULES(NST_EBOOK, libebook-1.2 >= $EBOOK_REQUIRED, - enable_evolution=yes, enable_evolution=no) -@@ -269,7 +257,6 @@ src/Makefile - src/nautilus-sendto.pc - src/plugins/Makefile - src/plugins/bluetooth/Makefile --src/plugins/empathy/Makefile - src/plugins/evolution/Makefile - src/plugins/gajim/Makefile - src/plugins/nautilus-burn/Makefile -diff --git a/src/plugins/empathy/Makefile.am b/src/plugins/empathy/Makefile.am -deleted file mode 100644 -index 4e787d1..0000000 ---- a/src/plugins/empathy/Makefile.am -+++ b/dev/null -@@ -1,19 +0,0 @@ --plugindir = $(libdir)/nautilus-sendto/plugins -- --INCLUDES = \ -- -DDATADIR=\"$(datadir)\" \ -- -DICONDIR=\"$(icondir)\" \ -- -DLOCALEDIR="\"$(datadir)/locale\"" \ -- -I$(top_srcdir)/src \ -- -I$(top_builddir) \ -- $(NAUTILUS_SENDTO_CFLAGS) \ -- $(WARN_CFLAGS) \ -- $(DISABLE_DEPRECATED) \ -- $(EMPATHY_CFLAGS) -- --plugin_LTLIBRARIES = libnstempathy.la -- --libnstempathy_la_SOURCES = empathy.c --libnstempathy_la_LDFLAGS = -module -avoid-version --libnstempathy_la_LIBADD = $(EMPATHY_LIBS) $(NAUTILUS_SENDTO_LIBS) -- -diff --git a/src/plugins/empathy/empathy.c b/src/plugins/empathy/empathy.c -deleted file mode 100644 -index f84f789..0000000 ---- a/src/plugins/empathy/empathy.c -+++ b/dev/null -@@ -1,293 +0,0 @@ --/* -- * Copyright (C) 2008, 2009 Collabora Ltd. -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License as -- * published by the Free Software Foundation; either version 2 of the -- * License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * General Public License for more av. -- * -- * You should have received a copy of the GNU General Public -- * License along with this program; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02110-1301 USA. -- * -- * Authors: Jonny Lamb <jonny.lamb@collabora.co.uk> -- * Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> -- */ -- --#include "config.h" -- --#include <glib.h> --#include <glib/gi18n-lib.h> --#include <gtk/gtk.h> --#include <gio/gio.h> -- --#include <telepathy-glib/enums.h> -- --#include <libempathy/empathy-contact.h> --#include <libempathy/empathy-debug.h> --#include <libempathy/empathy-contact-manager.h> --#include <libempathy/empathy-ft-factory.h> --#include <libempathy/empathy-ft-handler.h> --#include <libempathy/empathy-tp-file.h> --#include <libempathy/empathy-account-manager.h> -- --#include <libempathy-gtk/empathy-contact-selector.h> --#include <libempathy-gtk/empathy-ui-utils.h> -- --#include "nautilus-sendto-plugin.h" -- --static EmpathyAccountManager *acc_manager = NULL; --static EmpathyFTFactory *factory = NULL; --static guint transfers = 0; -- --static gboolean destroy (NstPlugin *plugin); -- --static void --handle_account_manager_ready () --{ -- TpConnectionPresenceType presence; -- -- presence = empathy_account_manager_get_global_presence (acc_manager, -- NULL, NULL); -- -- if (presence < TP_CONNECTION_PRESENCE_TYPE_AVAILABLE) -- return; --} -- --static void --acc_manager_ready_cb (EmpathyAccountManager *am, -- GParamSpec *pspec, -- gpointer _user_data) --{ -- if (!empathy_account_manager_is_ready (am)) -- return; -- -- handle_account_manager_ready (); --} -- --static gboolean --init (NstPlugin *plugin) --{ -- g_print ("Init %s plugin\n", plugin->info->id); -- -- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); -- -- empathy_gtk_init (); -- -- acc_manager = empathy_account_manager_dup_singleton (); -- -- if (empathy_account_manager_is_ready (acc_manager)) -- handle_account_manager_ready (); -- else -- g_signal_connect (acc_manager, "notify::ready", -- G_CALLBACK (acc_manager_ready_cb), NULL); -- -- return TRUE; --} -- --static GtkWidget * --get_contacts_widget (NstPlugin *plugin) --{ -- EmpathyContactManager *manager; -- GtkWidget *selector; -- -- manager = empathy_contact_manager_dup_singleton (); -- selector = empathy_contact_selector_new (EMPATHY_CONTACT_LIST (manager)); -- -- empathy_contact_selector_set_visible (EMPATHY_CONTACT_SELECTOR (selector), -- (EmpathyContactSelectorFilterFunc) empathy_contact_can_send_files, NULL); -- -- g_object_unref (manager); -- -- return selector; --} -- --static EmpathyContact * --get_selected_contact (GtkWidget *contact_widget) --{ -- EmpathyContact *contact; -- GtkTreeModel *model; -- GtkTreeIter iter; -- -- if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (contact_widget), &iter)) -- return NULL; -- -- model = gtk_combo_box_get_model (GTK_COMBO_BOX (contact_widget)); -- gtk_tree_model_get (model, &iter, -- EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact, -1); -- -- return contact; --} -- --static gboolean --validate_destination (NstPlugin *plugin, -- GtkWidget *contact_widget, -- gchar **error) --{ -- EmpathyContact *contact = NULL; -- gboolean ret = TRUE; -- -- contact = get_selected_contact (contact_widget); -- -- if (!contact) -- return FALSE; -- -- if (!empathy_contact_can_send_files (contact)) -- { -- *error = g_strdup (_("The contact selected cannot receive files.")); -- ret = FALSE; -- } -- -- if (ret && !empathy_contact_is_online (contact)) -- { -- *error = g_strdup (_("The contact selected is offline.")); -- ret = FALSE; -- } -- -- g_object_unref (contact); -- -- return ret; --} -- --static void --quit (void) --{ -- if (--transfers > 0) -- return; -- -- destroy (NULL); -- gtk_main_quit (); --} -- --static void --transfer_done_cb (EmpathyFTHandler *handler, -- EmpathyTpFile *tp_file, -- NstPlugin *plugin) --{ -- quit (); --} -- --static void --transfer_error_cb (EmpathyFTHandler *handler, -- GError *error, -- NstPlugin *plugin) --{ -- quit (); --} -- --static void --error_dialog_cb (GtkDialog *dialog, -- gint arg, -- gpointer user_data) --{ -- gtk_widget_destroy (GTK_WIDGET (dialog)); -- quit (); --} -- --static void --handler_ready_cb (EmpathyFTFactory *factory, -- EmpathyFTHandler *handler, -- GError *error, -- NstPlugin *plugin) --{ -- if (error != NULL) -- { -- GtkWidget *dialog; -- dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, -- GTK_BUTTONS_CLOSE, "%s", -- error->message ? error->message : _("No error message")); -- -- g_signal_connect (dialog, "response", G_CALLBACK (error_dialog_cb), NULL); -- gtk_widget_show (dialog); -- } -- else -- { -- g_signal_connect (handler, "transfer-done", -- G_CALLBACK (transfer_done_cb), plugin); -- g_signal_connect (handler, "transfer-error", -- G_CALLBACK (transfer_error_cb), plugin); -- -- empathy_ft_handler_start_transfer (handler); -- } --} -- --static gboolean --send_files (NstPlugin *plugin, -- GtkWidget *contact_widget, -- GList *file_list) --{ -- EmpathyContact *contact; -- GList *l; -- -- contact = get_selected_contact (contact_widget); -- -- if (!contact) -- return FALSE; -- -- factory = empathy_ft_factory_dup_singleton (); -- -- g_signal_connect (factory, "new-ft-handler", -- G_CALLBACK (handler_ready_cb), plugin); -- -- for (l = file_list; l; l = l->next) -- { -- gchar *path = l->data; -- GFile *file; -- -- file = g_file_new_for_uri (path); -- -- ++transfers; -- -- empathy_ft_factory_new_transfer_outgoing (factory, -- contact, file); -- -- g_object_unref (file); -- } -- -- g_object_unref (contact); -- -- if (transfers == 0) -- { -- destroy (NULL); -- return TRUE; -- } -- -- return FALSE; --} -- --static gboolean --destroy (NstPlugin *plugin) --{ -- if (acc_manager) -- g_object_unref (acc_manager); -- -- if (factory) -- g_object_unref (factory); -- -- return TRUE; --} -- --static --NstPluginInfo plugin_info = { -- "im", -- "empathy", -- N_("Instant Message (Empathy)"), -- NULL, -- TRUE, -- NAUTILUS_CAPS_NONE, -- init, -- get_contacts_widget, -- validate_destination, -- send_files, -- destroy --}; -- --NST_INIT_PLUGIN (plugin_info) -- --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-remove-old-evo.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-remove-old-evo.patch deleted file mode 100644 index 8ef133aeeaa2..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-remove-old-evo.patch +++ /dev/null @@ -1,273 +0,0 @@ -From 6756a352ce9560a343aa4f31c96ab9247ee20b83 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 09 Jun 2010 16:36:38 +0000 -Subject: Remove plugin to use sendto from Evolution - -And not the plugin to use evolution-data-server in nautilus-sendto. ---- -diff --git a/Makefile.am b/Makefile.am -index a814bb1..be84bf5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,10 +1,4 @@ --if HAVE_EVOLUTION --EVOLUTION_PLUGIN_DIR=evolution --endif -- --SUBDIRS = src $(EVOLUTION_PLUGIN_DIR) docs po -- --DIST_SUBDIRS = evolution src docs po -+SUBDIRS = src docs po - - DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --enable-gtk-doc --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck' - -diff --git a/configure.in b/configure.in -index 214be7c..d7318d9 100644 ---- a/configure.in -+++ b/configure.in -@@ -81,18 +81,6 @@ fi - AC_MSG_NOTICE([installing nautilus plugin in ${ac_with_nautilusdir}]) - AC_SUBST([NAUTILUS_EXTENSION_DIR],[${ac_with_nautilusdir}]) - --dnl Get details about evolution -- --PKG_CHECK_MODULES(EVOLUTION, evolution-plugin < 2.27.1, -- enable_evo=yes, enable_evo=no) --AM_CONDITIONAL(HAVE_EVOLUTION, test "x$enable_evo" = "xyes") -- --plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin` --AC_SUBST(plugindir) -- --EVO_PLUGIN_RULE=$srcdir/evolution/plugin.mk --AC_SUBST_FILE(EVO_PLUGIN_RULE) -- - # The full list of plugins - allowed_plugins="bluetooth empathy evolution gajim nautilus-burn pidgin removable-devices upnp" - -@@ -291,7 +279,6 @@ src/plugins/upnp/Makefile - docs/Makefile - docs/nautilus-sendto/Makefile - docs/nautilus-sendto/version.xml --evolution/Makefile - po/Makefile.in - ]) - -@@ -315,11 +302,5 @@ else - AC_MSG_NOTICE([ No nautilus-sendto plugins enabled]) - fi - --if test "x$enable_evo" = "xyes"; then -- AC_MSG_NOTICE([** Evolution send-to plugin ( < 2.27.1) enabled]) --else -- AC_MSG_NOTICE([ Evolution send-to plugin ( < 2.27.1) disabled]) --fi -- - echo " " - echo "-------------------------------------------------------" -diff --git a/evolution/Makefile.am b/evolution/Makefile.am -deleted file mode 100644 -index a216ed0..0000000 ---- a/evolution/Makefile.am -+++ b/dev/null -@@ -1,17 +0,0 @@ --INCLUDES = \ -- $(EVOLUTION_CFLAGS) \ -- $(WARN_CFLAGS) -- --@EVO_PLUGIN_RULE@ -- --plugin_DATA = org-gnome-evolution-send-attachments-to.eplug --plugin_LTLIBRARIES = liborg-gnome-evolution-send-attachments-to.la -- --liborg_gnome_evolution_send_attachments_to_la_SOURCES = nautilus-sendto.c --liborg_gnome_evolution_send_attachments_to_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) --liborg_gnome_evolution_send_attachments_to_la_LIBADD = $(EVOLUTION_LIBS) -- --EXTRA_DIST = org-gnome-evolution-send-attachments-to.eplug.xml plugin.mk -- --BUILT_SOURCES = $(plugin_DATA) --CLEANFILES = $(BUILT_SOURCES) -diff --git a/evolution/nautilus-sendto.c b/evolution/nautilus-sendto.c -deleted file mode 100644 -index 01728ae..0000000 ---- a/evolution/nautilus-sendto.c -+++ b/dev/null -@@ -1,112 +0,0 @@ --/* -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) version 3. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public -- * License along with the program; if not, see <http://www.gnu.org/licenses/> -- * -- * -- * Authors: -- * Johnny Jacob <johnnyjacob@gmail.com> -- * -- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) -- * -- */ -- --#include <config.h> -- --#include <glib.h> --#include <gtk/gtk.h> --#include <glib/gi18n-lib.h> --#include <e-util/e-config.h> --#include <e-util/e-popup.h> --#include <mail/em-popup.h> --#include <mail/em-menu.h> --#include <mail/em-utils.h> --#include <misc/e-attachment.h> -- --static void send_file (EPlugin *ep, EPopupTarget *t, void *data); --void org_gnome_evolution_send_file_attachments (EPlugin *ep, EMPopupTargetAttachments *t); --void org_gnome_evolution_send_file_part (EPlugin *ep, EMPopupTargetPart *t); -- --static void --popup_free (EPopup *ep, GSList *items, void *data) --{ -- g_slist_free (items); --} -- --static EPopupItem popup_attachment_items[] = { -- { E_POPUP_BAR, "25.display.00"}, -- { E_POPUP_ITEM, "25.display.01", N_("_Send to..."), (EPopupActivateFunc)send_file, NULL, "document-send"} --}; -- --void org_gnome_evolution_send_file_attachments (EPlugin *ep, EMPopupTargetAttachments *t) --{ -- GSList *menus = NULL; -- int len = 0; -- -- g_message ("org_gnome_evolution_send_file_attachments called"); -- -- len = g_slist_length(t->attachments); -- -- if (len != 1) -- return; -- -- menus = g_slist_prepend (menus, &popup_attachment_items[0]); -- menus = g_slist_prepend (menus, &popup_attachment_items[1]); -- e_popup_add_items (t->target.popup, menus, GETTEXT_PACKAGE, popup_free, t); --} -- --void org_gnome_evolution_send_file_part (EPlugin *ep, EMPopupTargetPart *t) --{ -- GSList *menus = NULL; -- -- g_message ("org_gnome_evolution_send_file_attachments called"); -- -- menus = g_slist_prepend (menus, &popup_attachment_items[0]); -- menus = g_slist_prepend (menus, &popup_attachment_items[1]); -- e_popup_add_items (t->target.popup, menus, GETTEXT_PACKAGE, popup_free, t); --} -- --static void --send_file (EPlugin *ep, EPopupTarget *t, void *data) --{ -- CamelMimePart *part; -- char *path; -- EPopupTarget *target = (EPopupTarget *) data; -- GPtrArray *argv; -- gboolean ret; -- GError *err = NULL; -- -- if (target->type == EM_POPUP_TARGET_ATTACHMENTS) -- part = ((EAttachment *) ((EMPopupTargetAttachments *) target)->attachments->data)->body; -- else -- part = ((EMPopupTargetPart *) target)->part; -- -- path = em_utils_temp_save_part (NULL, part, FALSE); -- g_message ("saved part as %s", path); -- -- argv = g_ptr_array_new (); -- g_ptr_array_add (argv, "nautilus-sendto"); -- g_ptr_array_add (argv, path); -- g_ptr_array_add (argv, NULL); -- -- ret = g_spawn_async (NULL, (gchar **) argv->pdata, -- NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &err); -- g_ptr_array_free (argv, TRUE); -- -- if (ret == FALSE) { -- g_warning ("Couldn't send the attachment: %s", err->message); -- g_error_free (err); -- } -- -- g_free (path); --} -- -diff --git a/evolution/org-gnome-evolution-send-attachments-to.eplug.xml b/evolution/org-gnome-evolution-send-attachments-to.eplug.xml -deleted file mode 100644 -index b6f7f27..0000000 ---- a/evolution/org-gnome-evolution-send-attachments-to.eplug.xml -+++ b/dev/null -@@ -1,28 +0,0 @@ --<?xml version="1.0"?> --<e-plugin-list> -- <!-- the path to the shared library --> -- <e-plugin -- id="org-gnome-evolution-send-attachments-to" -- type="shlib" -- location="@PLUGINDIR@/liborg-gnome-evolution-send-attachments-to@SOEXT@" -- _name="Send to..." -- domain="@GETTEXT_PACKAGE@"> -- -- <author name="Bastien Nocera" email="hadess@hadess.net"/> -- <_description>Send files to remote devices, or people</_description> -- <!-- Attachment to received e-mail --> -- <hook class="org.gnome.evolution.mail.popup:1.0"> -- <menu id="org.gnome.evolution.mail.formathtmldisplay.popup" target="part" factory="org_gnome_evolution_send_file_part"> -- </menu> -- </hook> -- <hook class="org.gnome.evolution.mail.popup:1.0"> -- <menu id="org.gnome.evolution.mail.attachments.popup" target="attachments" factory="org_gnome_evolution_send_file_attachments"> -- </menu> -- </hook> -- <!-- Right-click in the attachment bar when creating a new mail --> -- <hook class="org.gnome.evolution.mail.popup:1.0"> -- <menu id="org.gnome.evolution.mail.composer.attachmentbar.popup" target="attachments" factory="org_gnome_evolution_send_file_attachments"> -- </menu> -- </hook> -- </e-plugin> --</e-plugin-list> -diff --git a/evolution/plugin.mk b/evolution/plugin.mk -deleted file mode 100644 -index a98aaf6..0000000 ---- a/evolution/plugin.mk -+++ b/dev/null -@@ -1,11 +0,0 @@ --%.eplug: %.eplug.in -- sed -e 's|\@PLUGINDIR\@|$(plugindir)|' \ -- -e 's|\@SOEXT\@|$(SOEXT)|' \ -- -e 's|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|' \ -- -e 's|\@LOCALEDIR\@|$(localedir)|' $< > $@ -- --%.eplug.in: %.eplug.xml -- LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@ -- --%.error: %.error.xml -- LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 69ca4ea..a66fef3 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -1,8 +1,6 @@ - # List of source files containing translatable strings. - # Please keep this file sorted alphabetically. - nst.schemas.in --evolution/nautilus-sendto.c --evolution/org-gnome-evolution-send-attachments-to.eplug.xml - src/nautilus-nste.c - src/nautilus-nste.h - src/nautilus-sendto-command.c --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-shadowed-mounts.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-shadowed-mounts.patch deleted file mode 100644 index 7aef494c6238..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-shadowed-mounts.patch +++ /dev/null @@ -1,83 +0,0 @@ -From c4f591ebe5af99c0483dd04a608cebda9bbffe49 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Thu, 10 Jun 2010 17:34:08 +0000 -Subject: Fix handling of shadowed mounts - -Fix duplicate mounts appearing in the "removable device" section -when a mount is shadowed. ---- -diff --git a/src/plugins/removable-devices/removable-devices.c b/src/plugins/removable-devices/removable-devices.c -index 5984ec7..68022c4 100644 ---- a/src/plugins/removable-devices/removable-devices.c -+++ b/src/plugins/removable-devices/removable-devices.c -@@ -43,10 +43,11 @@ cb_mount_removed (GVolumeMonitor *volume_monitor, - { - GtkTreeIter iter; - GtkListStore *store; -- gboolean b; -+ gboolean b, found; - - store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (cb))); - b = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter); -+ found = FALSE; - - while (b) { - GMount *m; -@@ -54,11 +55,21 @@ cb_mount_removed (GVolumeMonitor *volume_monitor, - if (m == mount) { - gtk_list_store_remove (store, &iter); - g_object_unref (m); -+ found = TRUE; - break; - } - g_object_unref (m); - b = gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter); - } -+ -+ /* If a mount was removed */ -+ if (found != FALSE) { -+ /* And it was the selected one */ -+ if (gtk_combo_box_get_active (GTK_COMBO_BOX (cb)) == -1) { -+ /* Select the first item in the list */ -+ gtk_combo_box_set_active (GTK_COMBO_BOX (cb), 0); -+ } -+ } - } - - static void -@@ -70,6 +81,11 @@ cb_mount_changed (GVolumeMonitor *volume_monitor, - gboolean b; - GtkListStore *store; - -+ if (g_mount_is_shadowed (mount) != FALSE) { -+ cb_mount_removed (volume_monitor, mount, plugin); -+ return; -+ } -+ - store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (cb))); - b = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter); - -@@ -104,6 +120,9 @@ cb_mount_added (GVolumeMonitor *volume_monitor, - GtkTreeModel *model; - gboolean select_added; - -+ if (g_mount_is_shadowed (mount) != FALSE) -+ return; -+ - name = g_mount_get_name (mount); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (cb)); - -@@ -152,6 +171,11 @@ get_contacts_widget (NstPlugin *plugin) - for (l = mounts; l != NULL; l = l->next) { - char *name; - -+ if (g_mount_is_shadowed (l->data) != FALSE) { -+ g_object_unref (l->data); -+ continue; -+ } -+ - name = g_mount_get_name (l->data); - - gtk_list_store_append (store, &iter); --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-thunderbird-command.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-thunderbird-command.patch deleted file mode 100644 index b6a0cc6e4d33..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-thunderbird-command.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 52ed3fb5981cddcd84d787912fa548043ff568da Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 09 Jun 2010 16:29:08 +0000 -Subject: Fix thunderbird's mailto command - -Seeing as it's the only mailer to be such a pain. - -https://bugzilla.gnome.org/show_bug.cgi?id=614222 ---- -diff --git a/src/plugins/evolution/evolution.c b/src/plugins/evolution/evolution.c -index a25ade1..8e1dd0c 100644 ---- a/src/plugins/evolution/evolution.c -+++ b/src/plugins/evolution/evolution.c -@@ -99,9 +99,18 @@ init (NstPlugin *plugin) - /* Find what the default mailer is */ - if (strstr (mail_cmd, "balsa")) - type = MAILER_BALSA; -- else if (strstr (mail_cmd, "thunder") || strstr (mail_cmd, "seamonkey")) -+ else if (strstr (mail_cmd, "thunder") || strstr (mail_cmd, "seamonkey")) { -+ char **strv; -+ - type = MAILER_THUNDERBIRD; -- else if (strstr (mail_cmd, "sylpheed") || strstr (mail_cmd, "claws")) -+ -+ /* Thunderbird sucks, see -+ * https://bugzilla.gnome.org/show_bug.cgi?id=614222 */ -+ strv = g_strsplit (mail_cmd, " ", -1); -+ g_free (mail_cmd); -+ mail_cmd = g_strdup_printf ("%s %%s", strv[0]); -+ g_strfreev (strv); -+ } else if (strstr (mail_cmd, "sylpheed") || strstr (mail_cmd, "claws")) - type = MAILER_SYLPHEED; - else if (strstr (mail_cmd, "anjal")) - type = MAILER_EVO; --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload-dbus.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload-dbus.patch deleted file mode 100644 index f64c27ca3453..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload-dbus.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 99a19ae7549b8ad8f874748cbc89cda9b0e4d9a5 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 09 Jun 2010 16:42:19 +0000 -Subject: Never unload plugins that use D-Bus internally - -As the new types will be unloaded, and kaboom! - -https://bugzilla.gnome.org/show_bug.cgi?id=608126 ---- -diff --git a/src/plugins/pidgin/pidgin.c b/src/plugins/pidgin/pidgin.c -index 6cfe98a..319fdbd 100644 ---- a/src/plugins/pidgin/pidgin.c -+++ b/src/plugins/pidgin/pidgin.c -@@ -463,7 +463,7 @@ NstPluginInfo plugin_info = { - "pidgin", - N_("Instant Message (Pidgin)"), - NULL, -- FALSE, -+ TRUE, - NAUTILUS_CAPS_NONE, - init, - get_contacts_widget, --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload-init.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload-init.patch deleted file mode 100644 index d88907f9a559..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload-init.patch +++ /dev/null @@ -1,23 +0,0 @@ -From c76410275933ff05701cda346944e30498d27b2e Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 09 Jun 2010 17:12:42 +0000 -Subject: Never unload modules once init() has been done - -Because they might register new types, and when they're unloaded, -kaboom! ---- -diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c -index dd21620..92b96bb 100644 ---- a/src/nautilus-sendto-command.c -+++ b/src/nautilus-sendto-command.c -@@ -665,8 +665,6 @@ nautilus_sendto_plugin_dir_process (const char *plugindir) - if (p->info->init(p)) { - plugin_list = g_list_append (plugin_list, p); - } else { -- if (!p->info->never_unload) -- g_module_close (p->module); - g_free (p); - } - } --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload.patch deleted file mode 100644 index ebbdb82ff5e7..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload.patch +++ /dev/null @@ -1,120 +0,0 @@ -From ff902cb60e1ace5ca4af09f9c9f7d76517c8e5d5 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 09 Jun 2010 17:18:15 +0000 -Subject: Remove never_unload from the plugin struct - -Seeing as we never want to unload them now. ---- -diff --git a/src/nautilus-sendto-plugin.h b/src/nautilus-sendto-plugin.h -index 216f051..14fb7f5 100644 ---- a/src/nautilus-sendto-plugin.h -+++ b/src/nautilus-sendto-plugin.h -@@ -61,7 +61,6 @@ typedef enum { - * @id: A unique ID representing the plugin - * @description: The label used in the plugin selection drop-down - * @gettext_package: The domain to use to translate the description, %NULL if the plugin is part of nautilus-sendto -- * @never_unload: Whether to unload the plugin on exit. Enable this if your plugin registers a new #GType - * @capabilities: a bitmask of #NstPluginCapabilities - * @init: Check for dependencies, and return %FALSE if dependencies such as programs are missing. - * @get_contacts_widget: Return the contact widget, the widget to select the destination of the files -@@ -71,13 +70,12 @@ typedef enum { - * - * A structure representing a nautilus-sendto plugin. You should also call NST_INIT_PLUGIN() on the plugin structure to export it. - **/ --struct _NstPluginInfo -+struct _NstPluginInfo - { - gchar *icon; - gchar *id; - gchar *description; - gchar *gettext_package; -- gboolean never_unload; - NstPluginCapabilities capabilities; - gboolean (*init) (NstPlugin *plugin); - GtkWidget* (*get_contacts_widget) (NstPlugin *plugin); -diff --git a/src/plugins/bluetooth/bluetooth.c b/src/plugins/bluetooth/bluetooth.c -index f2db2dd..160619d 100644 ---- a/src/plugins/bluetooth/bluetooth.c -+++ b/src/plugins/bluetooth/bluetooth.c -@@ -549,7 +549,6 @@ NstPluginInfo plugin_info = { - "bluetooth", - N_("Bluetooth (OBEX Push)"), - NULL, -- FALSE, - NAUTILUS_CAPS_NONE, - init, - get_contacts_widget, -diff --git a/src/plugins/evolution/evolution.c b/src/plugins/evolution/evolution.c -index 8e1dd0c..7feb305 100644 ---- a/src/plugins/evolution/evolution.c -+++ b/src/plugins/evolution/evolution.c -@@ -377,7 +377,6 @@ NstPluginInfo plugin_info = { - "evolution", - N_("Email"), - NULL, -- FALSE, - NAUTILUS_CAPS_NONE, - init, - get_contacts_widget, -diff --git a/src/plugins/gajim/gajim.c b/src/plugins/gajim/gajim.c -index 1943b3d..088c69b 100644 ---- a/src/plugins/gajim/gajim.c -+++ b/src/plugins/gajim/gajim.c -@@ -504,7 +504,6 @@ NstPluginInfo plugin_info = { - "gajim", - N_("Instant Message (Gajim)"), - NULL, -- TRUE, - NAUTILUS_CAPS_NONE, - init, - get_contacts_widget, -diff --git a/src/plugins/nautilus-burn/nautilus-burn.c b/src/plugins/nautilus-burn/nautilus-burn.c -index bdc80c1..cdaa09e 100644 ---- a/src/plugins/nautilus-burn/nautilus-burn.c -+++ b/src/plugins/nautilus-burn/nautilus-burn.c -@@ -177,7 +177,6 @@ NstPluginInfo plugin_info = { - "nautilus-burn", - N_("CD/DVD Creator"), - NULL, -- FALSE, - NAUTILUS_CAPS_SEND_DIRECTORIES, - init, - get_contacts_widget, -diff --git a/src/plugins/pidgin/pidgin.c b/src/plugins/pidgin/pidgin.c -index 319fdbd..5d9b52e 100644 ---- a/src/plugins/pidgin/pidgin.c -+++ b/src/plugins/pidgin/pidgin.c -@@ -463,7 +463,6 @@ NstPluginInfo plugin_info = { - "pidgin", - N_("Instant Message (Pidgin)"), - NULL, -- TRUE, - NAUTILUS_CAPS_NONE, - init, - get_contacts_widget, -diff --git a/src/plugins/removable-devices/removable-devices.c b/src/plugins/removable-devices/removable-devices.c -index 4a735a3..5984ec7 100644 ---- a/src/plugins/removable-devices/removable-devices.c -+++ b/src/plugins/removable-devices/removable-devices.c -@@ -223,7 +223,6 @@ NstPluginInfo plugin_info = { - "folder-remote", - N_("Removable disks and shares"), - NULL, -- FALSE, - NAUTILUS_CAPS_SEND_DIRECTORIES, - init, - get_contacts_widget, -diff --git a/src/plugins/upnp/upnp.c b/src/plugins/upnp/upnp.c -index da5669e..5d2448e 100644 ---- a/src/plugins/upnp/upnp.c -+++ b/src/plugins/upnp/upnp.c -@@ -308,7 +308,6 @@ NstPluginInfo plugin_info = { - "upnp", - N_("UPnP Media Server"), - NULL, -- FALSE, - NAUTILUS_CAPS_NONE, - init, - get_contacts_widget, --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-commandline-help.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-commandline-help.patch deleted file mode 100644 index 0f086522649b..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-commandline-help.patch +++ /dev/null @@ -1,34 +0,0 @@ -From aff367791fdd6535021fd0c95ecf2067363073c2 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Tue, 31 Aug 2010 15:49:00 +0000 -Subject: Fix command-line help glitch - -nautilus-sendo --help says - -Usage: -nautilus-sendto [OPTION...] [FILES...] nautilus-sendto - -The second 'nautilus-sendto' here is redundant and confusing. With the -patch below, it says just - -Usage: -nautilus-sendto [OPTION...] [FILES...] -which is the intended output - -https://bugzilla.gnome.org/show_bug.cgi?id=627849 ---- -diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c -index 4dcbb1a..722386c 100644 ---- a/src/nautilus-sendto-command.c -+++ b/src/nautilus-sendto-command.c -@@ -804,7 +804,7 @@ int main (int argc, char **argv) - textdomain (GETTEXT_PACKAGE); - - g_thread_init (NULL); -- context = g_option_context_new ("nautilus-sendto"); -+ context = g_option_context_new (""); - g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); - g_option_context_add_group (context, gtk_get_option_group (TRUE)); - if (g_option_context_parse (context, &argc, &argv, &error) == FALSE) { --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-fix-memleaks.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-fix-memleaks.patch deleted file mode 100644 index 937c7d7ef2e9..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-fix-memleaks.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 52a1a4433dd5087baed79f948aec96aab409e3d2 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Mon, 16 Aug 2010 15:21:05 +0000 -Subject: Fix a few memory leaks - -On startup, and when sending packed files - -https://bugzilla.gnome.org/show_bug.cgi?id=626754 ---- -diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c -index 92b96bb..4dcbb1a 100644 ---- a/src/nautilus-sendto-command.c -+++ b/src/nautilus-sendto-command.c -@@ -265,7 +265,7 @@ status_label_clear (gpointer data) - static void - send_button_cb (GtkWidget *widget, NS_ui *ui) - { -- char *f, *error; -+ char *error; - NstPlugin *p; - GtkWidget *w; - -@@ -305,11 +305,14 @@ send_button_cb (GtkWidget *widget, NS_ui *ui) - NAUTILUS_SENDTO_LAST_MEDIUM, p->info->id, NULL); - - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ui->pack_checkbutton))){ -+ char *f; -+ - f = pack_files (ui); - if (f != NULL) { - GList *packed_file = NULL; - packed_file = g_list_append (packed_file, f); - if (!p->info->send_files (p, w, packed_file)) { -+ g_free (f); - g_list_free (packed_file); - return; - } -@@ -318,6 +321,7 @@ send_button_cb (GtkWidget *widget, NS_ui *ui) - gtk_widget_set_sensitive (ui->dialog, TRUE); - return; - } -+ g_free (f); - } else { - if (!p->info->send_files (p, w, file_list)) { - g_list_foreach (file_list, (GFunc) g_free, NULL); -@@ -763,6 +767,7 @@ nautilus_sendto_init (void) - - file = g_file_new_for_commandline_arg (filenames[i]); - filename = g_file_get_path (file); -+ g_object_unref (file); - if (filename == NULL) - continue; - --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/metadata.xml b/gnome-extra/nautilus-sendto/metadata.xml index 8157556b1496..48a8d9232864 100644 --- a/gnome-extra/nautilus-sendto/metadata.xml +++ b/gnome-extra/nautilus-sendto/metadata.xml @@ -2,11 +2,5 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>gnome</herd> - <use> - <flag name='gajim'>Enables support for <pkg>net-im/gajim</pkg></flag> - <flag name='mail'>Enables support for mailto using - <pkg>gnome-extra/evolution-data-server</pkg></flag> - <flag name='pidgin'>Enables support for <pkg>net-im/pidgin</pkg></flag> - </use> </pkgmetadata> diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild deleted file mode 100644 index b05019753a7a..000000000000 --- a/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild,v 1.8 2013/01/13 15:53:49 eva Exp $ - -EAPI="3" -GCONF_DEBUG="yes" - -inherit eutils gnome2 multilib - -DESCRIPTION="A nautilus extension for sending files to locations" -HOMEPAGE="http://www.gnome.org" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc sparc x86" -IUSE="cdr gajim +mail pidgin upnp-av" - -RDEPEND=">=x11-libs/gtk+-2.18:2 - >=dev-libs/glib-2.25.9:2 - >=gnome-base/nautilus-2.14 - cdr? ( >=app-cdr/brasero-2.26.0[nautilus] ) - gajim? ( - net-im/gajim - >=dev-libs/dbus-glib-0.60 ) - mail? ( >=gnome-extra/evolution-data-server-1.5.3 ) - pidgin? ( - >=net-im/pidgin-2.0.0 - >=dev-libs/dbus-glib-0.60 ) - upnp-av? ( >=net-libs/gupnp-0.13.0 )" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.9 - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig -" -# Needed for eautoreconf -# >=gnome-base/gnome-common-0.12 - -_use_plugin() { - if use ${1}; then - G2CONF="${G2CONF}${2:-"${1}"}," - fi -} - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README" - G2CONF="${G2CONF} - --with-plugins=removable-devices," - _use_plugin cdr nautilus-burn - _use_plugin mail evolution - _use_plugin pidgin - _use_plugin gajim - _use_plugin upnp-av upnp -} - -src_install() { - gnome2_src_install - find "${ED}" -name "*.la" -delete || die "failed to delete *.la files" -} |