[Pkg-privacy-commits] [pidgin-otr] 12/255: * packaging/fedora/gaim-otr.spec: Patches from Paul

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch experimental
in repository pidgin-otr.

commit af215b6db94762a69dab459c4e069fc4fd7aa7ee
Author: cypherpunk <cypherpunk>
Date:   Wed Oct 19 15:13:07 2005 +0000

    	* packaging/fedora/gaim-otr.spec: Patches from Paul
---
 ChangeLog                      |  4 ++++
 otr-plugin.c                   | 15 ---------------
 packaging/fedora/gaim-otr.spec |  8 +++++++-
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1d5216e..883a8e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-19
+
+	* packaging/fedora/gaim-otr.spec: Patches from Paul
+
 2005-10-16
 
 	* Conform to the new libotr API.
diff --git a/otr-plugin.c b/otr-plugin.c
index c44b8a3..f96080d 100644
--- a/otr-plugin.c
+++ b/otr-plugin.c
@@ -511,17 +511,6 @@ TrustLevel otrg_plugin_context_to_trust(ConnContext *context)
     return level;
 }
 
-/* Send the OTRL_TLV_DISCONNECTED packets when we're about to quit. */
-static void process_quitting(void)
-{
-    ConnContext *context = otrg_plugin_userstate->context_root;
-    while(context) {
-	ConnContext *next = context->next;
-	otrg_plugin_disconnect(context);
-	context = next;
-    }
-}
-
 static guint button_type_cbid;
 
 static gboolean otr_plugin_load(GaimPlugin *handle)
@@ -552,8 +541,6 @@ static gboolean otr_plugin_load(GaimPlugin *handle)
 
     otrg_ui_update_fingerprint();
 
-    gaim_signal_connect(core_handle, "quitting", otrg_plugin_handle,
-	    GAIM_CALLBACK(process_quitting), NULL);
     gaim_signal_connect(conv_handle, "sending-im-msg", otrg_plugin_handle,
             GAIM_CALLBACK(process_sending_im), NULL);
     gaim_signal_connect(conv_handle, "receiving-im-msg", otrg_plugin_handle,
@@ -586,8 +573,6 @@ static gboolean otr_plugin_unload(GaimPlugin *handle)
     otrl_userstate_free(otrg_plugin_userstate);
     otrg_plugin_userstate = NULL;
 
-    gaim_signal_disconnect(core_handle, "quitting", otrg_plugin_handle,
-	    GAIM_CALLBACK(process_quitting));
     gaim_signal_disconnect(conv_handle, "sending-im-msg", otrg_plugin_handle,
             GAIM_CALLBACK(process_sending_im));
     gaim_signal_disconnect(conv_handle, "receiving-im-msg", otrg_plugin_handle,
diff --git a/packaging/fedora/gaim-otr.spec b/packaging/fedora/gaim-otr.spec
index b611337..d5edbd6 100644
--- a/packaging/fedora/gaim-otr.spec
+++ b/packaging/fedora/gaim-otr.spec
@@ -9,7 +9,8 @@ Group: Applications/Internet
 Provides: otr-plugin = %{version}
 Obsoletes: otr-plugin
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: glib2-devel, gtk2-devel, libgcrypt-devel >= 1.2.0, libgpg-error-devel, gaim >= 1.0.0, libotr-devel >= 2.0.2
+Requires: gaim >= 1.0.0, libotr >= 3.0.0
+BuildRequires: glib2-devel, gtk2-devel, libgcrypt-devel >= 1.2.0, libgpg-error-devel, gaim >= 1.0.0, libotr-devel >= 3.0.0
 
 %description 
 
@@ -21,6 +22,7 @@ gaim (1.x).
 %setup -q
 
 %build
+
 %configure 
 make %{?_smp_mflags} all
 
@@ -39,6 +41,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gaim/gaim-otr.so
 
 %changelog
+* Mon Oct 17 2005 Paul Wouters <paul at cypherpunks.ca> 3.0.0
+- Minor change to allow for new documentation files. Ensure
+  dependancy on at least libotr version 3.0.0
+
 * Fri Jun 17 2005 Tom "spot" Callaway <tcallawa at redhat.com>
 - reworked for Fedora Extras
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git