Group :: Graphical desktop/GNOME
RPM: nautilus-sendto
Navigation
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: nautilus-sendto-3.0.1-alt2.patch
Download
Download
.gear/rules | 2 +
.../tags/bb6de3b2ab6101cffc2d6eeccc03ad7477cbed51 | 6 +
.gear/tags/list | 1 +
Makefile.am | 4 -
NEWS | 52 ++++
nautilus-sendto.spec | 281 ++++++++++++++++++++
po/ru.po | 151 +++++------
src/nautilus-nste.c | 16 +-
src/nautilus-sendto-command.c | 9 +-
src/plugins/gajim/Makefile.am | 1 +
10 files changed, 418 insertions(+), 105 deletions(-)
diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 0000000..7eb96aa
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,2 @@
+tar: NAUTILUS_SENDTO_3_0_1:.
+diff: NAUTILUS_SENDTO_3_0_1:. .
diff --git a/.gear/tags/bb6de3b2ab6101cffc2d6eeccc03ad7477cbed51 b/.gear/tags/bb6de3b2ab6101cffc2d6eeccc03ad7477cbed51
new file mode 100644
index 0000000..22c5320
--- /dev/null
+++ b/.gear/tags/bb6de3b2ab6101cffc2d6eeccc03ad7477cbed51
@@ -0,0 +1,6 @@
+object 9959891e72a4178945b2fb0d6772607883164317
+type commit
+tag NAUTILUS_SENDTO_3_0_1
+tagger Bastien Nocera <hadess@hadess.net> 1317029979 +0100
+
+3.0.1
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 0000000..6e30735
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1 @@
+bb6de3b2ab6101cffc2d6eeccc03ad7477cbed51 NAUTILUS_SENDTO_3_0_1
diff --git a/Makefile.am b/Makefile.am
index 18eb6a9..4190fcb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,3 @@ ChangeLog:
git log --stat --after="Fri Apr 17 16:36:52 2009" > $@; \
fi
-install-data-local:
- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
-
-
diff --git a/NEWS b/NEWS
index 74452be..0cb3161 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,55 @@
+===============
+Version 2.32.0
+===============
+
+Nautilus Sendto
+
+- Remove obsolete call to gconftool-2 on installation
+- Updated translations
+
+===============
+Version 2.31.90
+===============
+
+Nautilus Sendto
+
+- Show the contextual menu for non-local files
+- Fix command-line help glitch
+
+==============
+Version 2.31.7
+==============
+
+Nautilus Sendto
+
+- Remove never_unload struct member for plugins,
+ they are never unloaded now
+- Fix a few memory leaks when sending files
+
+==============
+Version 2.31.6
+==============
+
+Nautilus Sendto
+
+- Remove plugin to send files from Evolution,
+ it's now builtin to Evolution
+- Remove Empathy plugin, now in Empathy
+- Remove Bluetooth plugin, now in gnome-bluetooth
+- Port to GSettings
+
+==============
+Version 2.28.5
+==============
+
+Nautilus Sendto
+
+- Fix GSEAL compilation
+- Make the last selected medium's widget grab focus
+- Fix thunderbird's mailto command
+- Fix crashers when unloading plugins
+- Fix handling of shadowed mounts in the "Removable device" section
+
==============
Version 3.0.1
==============
diff --git a/nautilus-sendto.spec b/nautilus-sendto.spec
new file mode 100644
index 0000000..fcf38fa
--- /dev/null
+++ b/nautilus-sendto.spec
@@ -0,0 +1,281 @@
+%define ver_major 3.0
+
+%def_enable gtk_doc
+%def_with gupnp
+
+Name: nautilus-sendto
+Version: %ver_major.1
+Release: alt2
+
+Packager: GNOME Maintainers Team <gnome@packages.altlinux.org>
+
+Summary: Nautilus Sendto menu item
+License: GPL
+Group: Graphical desktop/GNOME
+Url: http://www.gnome.org
+
+Obsoletes: %name-thunderbird
+Obsoletes: %name-sylpheed
+Obsoletes: %name-balsa
+
+Source: %name-%version.tar
+Patch0: %name-%version-%release.patch
+
+BuildPreReq: rpm-build-gnome
+BuildRequires: intltool glib2-devel libgio-devel libgtk+3-devel pidgin-devel libpurple-devel libnautilus-devel
+BuildRequires: libdbus-glib-devel libdbus-devel gtk-doc evolution-data-server-devel gajim gcc-c++ gnome-common
+%if_with gupnp
+BuildPreReq: libgupnp-devel
+%endif
+
+%description
+This application provides integration between nautilus and other.
+It adds a Nautilus context menu component ("Send To...") and features+a dialog for insert the email or IM account which you want to send
+the file/files.
+
+%package evolution
+Summary: Send files from nautilus to evolution
+Group: Graphical desktop/GNOME
+Requires: evolution
+Requires: %name = %version
+Provides: %name-plugin = %version-%release
+
+%description evolution
+This application provides integration between nautilus and evolution.
+It adds a Nautilus context menu component ("Send To...") and features+a dialog for insert the email acount which you want to send the
+file/files.
+
+%package pidgin
+Summary: Send files from nautilus to pidgin
+Group: Graphical desktop/GNOME
+Requires: pidgin
+Requires: %name = %version
+Provides: %name-plugin = %version-%release
+Provides: nautilus-sendto-gaim
+Obsoletes: nautilus-sendto-gaim
+
+%description pidgin
+This application provides integration between nautilus and pidgin. It
+adds a Nautilus context menu component ("Send To...") and features a+dialog for insert the IM account which you want to send the file/files.
+
+%package gajim
+Summary: Send files from nautilus to gajim
+Group: Graphical desktop/GNOME
+Requires: gajim
+Requires: %name = %version
+Provides: %name-plugin = %version-%release
+
+%description gajim
+This application provides integration between nautilus and gajim. It
+adds a Nautilus context menu component ("Send To...") and features a+dialog for insert the IM account which you want to send the file/files.
+
+%package removable-devices
+Summary: Send files from nautilus to removable devices
+Group: Graphical desktop/GNOME
+Requires: %name = %version
+Provides: %name-plugin = %version-%release
+
+%description removable-devices
+This application provides ability for nautilus to send files to
+removable devices and shares.
+
+%package nautilus-burn
+Summary: Send files to from nautilus to nautilus-cd-burner
+Group: Graphical desktop/GNOME
+Requires: %name = %version
+Provides: %name-plugin = %version-%release
+Requires: brasero-nautilus
+
+%description nautilus-burn
+This application provides integration between nautilus and Nautilus CD Burner.
+
+%package upnp
+Summary: Send files to to UPNP Media Servers
+Group: Graphical desktop/GNOME
+Requires: %name = %version
+Provides: %name-plugin = %version-%release
+
+%description upnp
+Plugin to allow sending files to UPNP Media Servers
+
+%package devel
+Summary: Development files for %name
+Group: Development/C
+
+%description devel
+The %name-devel package contains header files for developing
+applications that use %name
+
+%package devel-doc
+Summary: Development documentation for %name
+Group: Development/C
+BuildArch: noarch
+Conflicts: %name-devel < %version
+
+%description devel-doc
+The %name-devel-doc package contains documentation needed for developing
+applications that use %name
+
+%prep
+%setup -q
+%patch0 -p1
+
+%build
+%autoreconf
+%configure \
+ --with-plugins="evolution gajim nautilus-burn pidgin removable-devices upnp" \
+ --disable-schemas-compile \
+ %{subst_enable gtk_doc} \+ --disable-static
+%make_build
+
+%install
+%make DESTDIR=%buildroot install
+
+find %buildroot%_libdir -name \*.la -delete
+
+%find_lang %name
+
+%files -f %name.lang
+%doc NEWS AUTHORS COPYING ChangeLog*
+%_bindir/*
+# in nautilus now
+%exclude %_libdir/nautilus/extensions-3.0/libnautilus-sendto.so
+%dir %_libdir/%name/
+%dir %_libdir/%name/plugins
+%_datadir/%name
+%_datadir/GConf/gsettings/nautilus-sendto-convert
+%_datadir/glib-2.0/schemas/*.xml
+%_man1dir/*.1*
+
+%files pidgin
+%_libdir/%name/plugins/libnstpidgin.so
+
+%files gajim
+%_libdir/%name/plugins/libnstgajim.so
+
+%files evolution
+%_libdir/%name/plugins/libnstevolution.so
+
+%files nautilus-burn
+%_libdir/%name/plugins/libnstburn.so
+
+%files removable-devices
+%_libdir/%name/plugins/libnstremovable_devices.so
+
+%if_with gupnp
+%files upnp
+%_libdir/%name/plugins/libnstupnp.so
+%endif
+
+%files devel
+%_includedir/%name
+%_pkgconfigdir/*.pc
+
+%if_enabled gtk_doc
+%files devel-doc
+%_datadir/gtk-doc/html/*
+%else
+%exclude %_datadir/gtk-doc/html/*
+%endif
+
+%changelog
+* Thu Oct 27 2011 Yuri N. Sedunov <aris@altlinux.org> 3.0.1-alt2
+- rebuilt against libebook-1.2.so.12
+
+* Mon Sep 26 2011 Yuri N. Sedunov <aris@altlinux.org> 3.0.1-alt1
+- 3.0.1
+
+* Wed Jun 22 2011 Yuri N. Sedunov <aris@altlinux.org> 3.0.0-alt2
+- rebuilt against libgupnp-1.0.so.4 (gupnp-0.17)
+
+* Sun May 29 2011 Yuri N. Sedunov <aris@altlinux.org> 3.0.0-alt1
+- 3.0.0
+
+* Fri Oct 08 2010 Valery Inozemtsev <shrek@altlinux.ru> 2.32.0-alt1
+- 2.32.0
+
+* Mon Jun 21 2010 Valery Inozemtsev <shrek@altlinux.ru> 2.28.4-alt2
+- rebuild with libedataserver-1.2.so.13
+
+* Tue Mar 30 2010 Valery Inozemtsev <shrek@altlinux.ru> 2.28.4-alt1
+- 2.28.4
+
+* Sat Mar 13 2010 Valery Inozemtsev <shrek@altlinux.ru> 2.28.2-alt3
+- disabled bluetooth/empathy
+
+* Mon Nov 30 2009 Valery Inozemtsev <shrek@altlinux.ru> 2.28.2-alt2
+- new subpackage devel
+
+* Thu Nov 19 2009 Valery Inozemtsev <shrek@altlinux.ru> 2.28.2-alt1
+- 2.28.2
+- enabled empathy/upnp
+
+* Wed Nov 11 2009 Valery Inozemtsev <shrek@altlinux.ru> 2.28.0-alt4
+- disabled empathy/upnp
+
+* Sat Oct 10 2009 Valery Inozemtsev <shrek@altlinux.ru> 2.28.0-alt3
+- 2.28.0
+
+* Fri Oct 09 2009 Valery Inozemtsev <shrek@altlinux.ru> 1.1.6-alt2
+- nautilus-sendto-nautilus-burn: fixed requires (closes: #21768)
+
+* Mon Aug 03 2009 Valery Inozemtsev <shrek@altlinux.ru> 1.1.6-alt1
+- 1.1.6
+
+* Mon Aug 03 2009 Valery Inozemtsev <shrek@altlinux.ru> 1.1.5-alt1
+- 1.1.5
+- add -upnp package
+
+* Thu Apr 23 2009 Alexey Shabalin <shaba@altlinux.ru> 1.1.4.1-alt1
+- 1.1.4.1
+
+* Sat Apr 18 2009 Alexey Shabalin <shaba@altlinux.ru> 1.1.4-alt1
+- 1.1.4
+
+* Sun Apr 05 2009 Alexey Shabalin <shaba@altlinux.ru> 1.1.3-alt1
+- 1.1.3
+- aris@
+ removed obsolete patch for balsa
+ updated buildreqs
+ removed obsolete -thunderbird, -sylpheed, -balsa plugins
+ new -empathy, -burn, -removable-devices plugins
+
+* Tue Feb 10 2009 Alexey Shabalin <shaba@altlinux.ru> 1.1.0-alt3
+- changed requires from bluez-utils to bluez for bluetooth package(need for bluez-4)
+
+* Tue Oct 28 2008 Alexey Shabalin <shaba@altlinux.ru> 1.1.0-alt2
+- rebuild
+
+* Mon Oct 06 2008 Alexey Shabalin <shaba@altlinux.ru> 1.1.0-alt1
+- 1.1.0
+
+* Thu Aug 21 2008 Alexey Shabalin <shaba@altlinux.ru> 1.0.1-alt1
+- 1.0.1
+
+* Tue Jul 08 2008 Alexey Shabalin <shaba@altlinux.ru> 1.0.0-alt3
+- change requires for bluetooth from gnome-bluetooth to bluez-gnome
+
+* Tue Jun 24 2008 Alexey Shabalin <shaba@altlinux.ru> 1.0.0-alt2
+- fix requires for thunderbird plugin
+- remove requires for sylpheed plugin
+- add provides %name-claws-mail for sylpheed plugin
+- build balsa plugin
+- fix sending files with balsa (patch1, thx Nick Butorin)
+
+* Fri Jun 20 2008 Alexey Shabalin <shaba@altlinux.ru> 1.0.0-alt1
+- 1.0.0
+- revoke from orphaned
+- rewrite spec, based on mandriva (thx Andrey Novoselov)
+
+* Sat Sep 03 2005 Vital Khilko <vk@altlinux.ru> 0.4-alt1
+- 0.4
+- added bluetooth subpackage
+
+* Mon Jan 31 2005 Vital Khilko <vk@altlinux.ru> 0.3-alt1
+- initial build for ALT Linux Sisyphus
+- added belarusian translation
diff --git a/po/ru.po b/po/ru.po
index d0cf079..426c1d3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,54 +9,17 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-24 11:15+0200\n"
-"PO-Revision-Date: 2010-02-17 00:10+0300\n"
-"Last-Translator: Alexander Saprykin <xelfium@gmail.com>\n"
+"POT-Creation-Date: 2010-08-16 14:25+0300\n"
+"PO-Revision-Date: 2010-08-08 21:44+0300\n"
+"Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
"Language-Team: Russian <gnome-cyr@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../nst.schemas.in.h:1
-msgid "Last plugin used to send"
-msgstr "Последний модуль, использовавшийся для отправки"
-
-#: ../nst.schemas.in.h:2
-msgid "Last type of archive used"
-msgstr "Последний использовавшийся тип архива"
-
-#: ../nst.schemas.in.h:3
-msgid ""
-"Used to store which plugin was used the last time files were sent using "
-"nautilus-sendto."
-msgstr ""
-"Используется для сохранения использовавшегося в последний раз модуля для "
-"отправки файлов."
-
-#: ../nst.schemas.in.h:4
-msgid ""
-"Used to store which type of archive was used the last time (0: zip, 1: tar."
-"gz, 2: tar.bz2)."
-msgstr ""
-"Используется для сохранения использовавшегося в последний раз типа архива "
-"(0: zip, 1: tar.gz, 2: tar.bz2)."
-
-#: ../evolution/nautilus-sendto.c:47
-msgid "_Send to..."
-msgstr "_Отправить..."
-
-#: ../evolution/org-gnome-evolution-send-attachments-to.eplug.xml.h:1
-msgid "Send files to remote devices, or people"
-msgstr "Отправить файл на внешнее устройство или людям"
-
-#. the path to the shared library
-#: ../evolution/org-gnome-evolution-send-attachments-to.eplug.xml.h:3
-msgid "Send to..."
-msgstr "Отправить..."
-
#: ../src/nautilus-nste.c:92 ../src/nautilus-nste.c:97
#: ../src/nautilus-sendto.ui.h:3
msgid "Send To..."
@@ -70,29 +33,25 @@ msgstr "Отправить файл по почте, в мгновенном с
msgid "Send files by mail, instant message..."
msgstr "Отправить файлы по почте, в мгновенном сообщении..."
-#: ../src/nautilus-sendto-command.c:569
+#: ../src/nautilus-sendto-command.c:572
msgid "Files"
msgstr "Файлы"
-#: ../src/nautilus-sendto-command.c:782
+#: ../src/nautilus-sendto-command.c:783
#, c-format
msgid "Expects URIs or filenames to be passed as options\n"
msgstr "Ожидается, что URI или имена файлов будут переданы как параметры\n"
-#: ../src/nautilus-sendto-command.c:799
-msgid "Nautilus Sendto"
-msgstr "Nautilus Sendto"
-
-#: ../src/nautilus-sendto-command.c:803
+#: ../src/nautilus-sendto-command.c:804
#, c-format
msgid "Could not parse command-line options: %s\n"
msgstr "Не удаётся разобрать параметры командной строки: %s\n"
-#: ../src/nautilus-sendto-command.c:818
+#: ../src/nautilus-sendto-command.c:819
msgid "Could not load any plugins."
msgstr "Не удаётся загрузить модули."
-#: ../src/nautilus-sendto-command.c:821
+#: ../src/nautilus-sendto-command.c:822
msgid "Please verify your installation"
msgstr "Пожалуйста, проверьте вашу установку"
@@ -120,36 +79,7 @@ msgstr "К_уда:"
msgid "_Send"
msgstr "_Отправить"
-#: ../src/plugins/bluetooth/bluetooth.c:451
-msgid "Programming error, could not find the device in the list"
-msgstr "Ошибка программирования: не удаётся найти устройство в списке"
-
-#: ../src/plugins/bluetooth/bluetooth.c:526
-#, c-format
-msgid "Obex Push file transfer unsupported"
-msgstr "Передача файлов по Obex Push не поддерживается"
-
-#: ../src/plugins/bluetooth/bluetooth.c:550
-msgid "Bluetooth (OBEX Push)"
-msgstr "Bluetooth (OBEX Push)"
-
-#: ../src/plugins/empathy/empathy.c:144
-msgid "The contact selected cannot receive files."
-msgstr "Выбранный контакт не может принимать файлы."
-
-#: ../src/plugins/empathy/empathy.c:150
-msgid "The contact selected is offline."
-msgstr "Выбранный контакт неактивен."
-
-#: ../src/plugins/empathy/empathy.c:205
-msgid "No error message"
-msgstr "Отсутствуют данные об ошибке"
-
-#: ../src/plugins/empathy/empathy.c:281
-msgid "Instant Message (Empathy)"
-msgstr "Мгновенное сообщение (Empathy)"
-
-#: ../src/plugins/evolution/evolution.c:369
+#: ../src/plugins/evolution/evolution.c:378
msgid "Email"
msgstr "Электронная почта"
@@ -189,7 +119,7 @@ msgstr "Адресная книга не существует."
#: ../src/plugins/evolution/e-contact-entry.c:896
msgid "The \"Me\" contact does not exist."
-msgstr "Контакт \"Я\" не существует."
+msgstr "Контакт «Я» не существует."
#: ../src/plugins/evolution/e-contact-entry.c:898
msgid "The address book is not loaded."
@@ -201,7 +131,7 @@ msgstr "Адресная книга уже загружена."
#: ../src/plugins/evolution/e-contact-entry.c:902
msgid "Permission was denied when accessing the address book."
-msgstr "Доступ к адресной книге запрещен."
+msgstr "Доступ к адресной книге запрещён."
#: ../src/plugins/evolution/e-contact-entry.c:904
msgid "The contact was not found."
@@ -255,7 +185,7 @@ msgstr "Не удалось отправить файл"
#: ../src/plugins/gajim/gajim.c:418
msgid "There is no connection to gajim remote service."
-msgstr "Нет соединения с сервисом gajim."
+msgstr "Нет соединения с удалённой службой gajim."
#: ../src/plugins/gajim/gajim.c:442 ../src/plugins/gajim/gajim.c:482
msgid "Sending file failed"
@@ -289,10 +219,63 @@ msgstr "Создание CD/DVD"
msgid "Instant Message (Pidgin)"
msgstr "Мгновенное сообщение (Pidgin)"
-#: ../src/plugins/removable-devices/removable-devices.c:224
+#: ../src/plugins/removable-devices/removable-devices.c:248
msgid "Removable disks and shares"
msgstr "Сменные диски и общие папки"
#: ../src/plugins/upnp/upnp.c:309
msgid "UPnP Media Server"
msgstr "Медиа-сервер UPnP"
+
+#~ msgid "Last plugin used to send"
+#~ msgstr "Последний модуль, использовавшийся для отправки"
+
+#~ msgid "Last type of archive used"
+#~ msgstr "Последний использовавшийся тип архива"
+
+#~ msgid ""
+#~ "Used to store which plugin was used the last time files were sent using "
+#~ "nautilus-sendto."
+#~ msgstr ""
+#~ "Используется для сохранения использовавшегося в последний раз модуля для "
+#~ "отправки файлов."
+
+#~ msgid ""
+#~ "Used to store which type of archive was used the last time (0: zip, 1: "
+#~ "tar.gz, 2: tar.bz2)."
+#~ msgstr ""
+#~ "Используется для сохранения использовавшегося в последний раз типа архива "
+#~ "(0: zip, 1: tar.gz, 2: tar.bz2)."
+
+#~ msgid "_Send to..."
+#~ msgstr "_Отправить..."
+
+#~ msgid "Send files to remote devices, or people"
+#~ msgstr "Отправить файл на внешнее устройство или людям"
+
+#~ msgid "Send to..."
+#~ msgstr "Отправить..."
+
+#~ msgid "Nautilus Sendto"
+#~ msgstr "Nautilus Sendto"
+
+#~ msgid "Programming error, could not find the device in the list"
+#~ msgstr "Ошибка программирования: не удаётся найти устройство в списке"
+
+#~ msgid "Obex Push file transfer unsupported"
+#~ msgstr "Передача файлов по Obex Push не поддерживается"
+
+#~ msgid "Bluetooth (OBEX Push)"
+#~ msgstr "Bluetooth (OBEX Push)"
+
+#~ msgid "The contact selected cannot receive files."
+#~ msgstr "Выбранный контакт не может принимать файлы."
+
+#~ msgid "The contact selected is offline."
+#~ msgstr "Выбранный контакт неактивен."
+
+#~ msgid "No error message"
+#~ msgstr "Отсутствуют данные об ошибке"
+
+#~ msgid "Instant Message (Empathy)"
+#~ msgstr "Мгновенное сообщение (Empathy)"
diff --git a/src/nautilus-nste.c b/src/nautilus-nste.c
index acd6c9e..b7e7ae7 100644
--- a/src/nautilus-nste.c
+++ b/src/nautilus-nste.c
@@ -57,7 +57,7 @@ sendto_callback (NautilusMenuItem *item,
g_spawn_command_line_async (cmd->str, NULL);
g_string_free (cmd, TRUE);
-}
+}
static GList *
nautilus_nste_get_file_items (NautilusMenuProvider *provider,
@@ -65,26 +65,12 @@ nautilus_nste_get_file_items (NautilusMenuProvider *provider,
GList *files)
{GList *items = NULL;
- GList *scan;
gboolean one_item;
NautilusMenuItem *item;
if (files == NULL)
return NULL;
- for (scan = files; scan; scan = scan->next) {- NautilusFileInfo *file = scan->data;
- gchar *scheme;
- gboolean local;
-
- scheme = nautilus_file_info_get_uri_scheme (file);
- local = strncmp (scheme, "file", 4) == 0;
- g_free (scheme);
-
- if (!local)
- return NULL;
- }
-
one_item = (files != NULL) && (files->next == NULL);
if (one_item &&
!nautilus_file_info_is_directory ((NautilusFileInfo *)files->data)) {diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c
index 1496411..826f52c 100644
--- a/src/nautilus-sendto-command.c
+++ b/src/nautilus-sendto-command.c
@@ -262,7 +262,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;
@@ -303,11 +303,14 @@ send_button_cb (GtkWidget *widget, NS_ui *ui)
p->info->id);
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;
}
@@ -316,6 +319,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);
@@ -761,6 +765,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;
@@ -797,7 +802,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) {diff --git a/src/plugins/gajim/Makefile.am b/src/plugins/gajim/Makefile.am
index 4ccdc20..68ab14d 100644
--- a/src/plugins/gajim/Makefile.am
+++ b/src/plugins/gajim/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = \
$(NAUTILUS_SENDTO_CFLAGS) \
$(DBUS_CFLAGS) \
$(DISABLE_DEPRECATED) \
+ $(DBUS_CFLAGS) \
$(WARN_CFLAGS)
plugin_LTLIBRARIES = libnstgajim.la