Mercurial > pidgin

changeset 20810:57312baae0b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '63f107d777d3af55ea0468202ae4d2fcc319f53f' and '6b57335241f2c9a501643280407bdc3374100dee'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sat, 06 Oct 2007 21:59:41 +0000
parents b671eb078419 (diff) c6232f341ea5 (current diff)
children 368d79355aba
files
diffstat 28 files changed, 47 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/.mtn-ignore	Sat Oct 06 21:58:54 2007 +0000
+++ b/.mtn-ignore	Sat Oct 06 21:59:41 2007 +0000
@@ -21,7 +21,7 @@
 config.status
 config.sub
 configure$
-finch/finch
+finch/finch$
 finch/libgnt/gntmarshal.c
 finch/libgnt/gntmarshal.h
 depcomp
--- a/configure.ac	Sat Oct 06 21:58:54 2007 +0000
+++ b/configure.ac	Sat Oct 06 21:59:41 2007 +0000
@@ -2247,6 +2247,7 @@
 		   share/Makefile
 		   share/sounds/Makefile
 		   share/ca-certs/Makefile
+		   finch/finch.pc
 		   finch/Makefile
 		   finch/libgnt/Makefile
 		   finch/libgnt/gnt.pc
--- a/doc/gtkconv-signals.dox	Sat Oct 06 21:58:54 2007 +0000
+++ b/doc/gtkconv-signals.dox	Sat Oct 06 21:59:41 2007 +0000
@@ -134,7 +134,7 @@
 void (*conversation_displayed)(PidginConversation *gtkconv);
   @endsignalproto
   @signaldesc
-   Emitted right after the Pidgin UI is reattached to a conversation.
+   Emitted right after the Pidgin UI is attached to a new or a hidden conversation.
   @param gtkconv  The PidginConversation
  @endsignaldef
 
--- a/finch/Makefile.am	Sat Oct 06 21:58:54 2007 +0000
+++ b/finch/Makefile.am	Sat Oct 06 21:59:41 2007 +0000
@@ -1,7 +1,11 @@
 EXTRA_DIST = \
 		getopt.c \
 		getopt.h \
-		getopt1.c
+		getopt1.c \
+		finch.pc.in
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = finch.pc
 
 SUBDIRS = libgnt plugins
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/finch/finch.pc.in	Sat Oct 06 21:59:41 2007 +0000
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+Name: Finch
+Description: Finch is an instant messenger application that uses libpurple for protocol support and ncurses (libgnt) for the UI.
+Version: @VERSION@
+Requires: gnt purple
+Cflags: -I${includedir}/finch
+
--- a/libpurple/account.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/libpurple/account.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file account.h Account API
  * @ingroup core
+ * @see @ref account-signals
  */
 
 /* purple
@@ -22,8 +23,6 @@
  * 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  02111-1301  USA
- *
- * @see @ref account-signals
  */
 #ifndef _PURPLE_ACCOUNT_H_
 #define _PURPLE_ACCOUNT_H_
--- a/libpurple/blist.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/libpurple/blist.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file blist.h Buddy List API
  * @ingroup core
+ * @see @ref blist-signals
  */
 
 /* purple
@@ -22,8 +23,6 @@
  * 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  02111-1301  USA
- *
- * @see @ref blist-signals
  */
 #ifndef _PURPLE_BLIST_H_
 #define _PURPLE_BLIST_H_
--- a/libpurple/certificate.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/libpurple/certificate.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file certificate.h Public-Key Certificate API
  * @ingroup core
+ * @see @ref certificate-signals
  */
 
 /*
--- a/libpurple/cipher.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/libpurple/cipher.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file cipher.h Purple Cipher API
  * @ingroup core
+ * @see @ref cipher-signals
  */
 
 /* purple
@@ -22,8 +23,6 @@
  * 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  02111-1301  USA
- *
- * @see @ref cipher-signals
  */
 #ifndef PURPLE_CIPHER_H
 #define PURPLE_CIPHER_H
--- a/libpurple/connection.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/libpurple/connection.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file connection.h Connection API
  * @ingroup core
+ * @see @ref connection-signals
  */
 
 /* purple
@@ -22,8 +23,6 @@
  * 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  02111-1301  USA
- *
- * @see @ref connection-signals
  */
 #ifndef _PURPLE_CONNECTION_H_
 #define _PURPLE_CONNECTION_H_
--- a/libpurple/conversation.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/libpurple/conversation.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file conversation.h Conversation API
  * @ingroup core
+ * @see @ref conversation-signals
  */
 
 /* purple
@@ -22,8 +23,6 @@
  * 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  02111-1301  USA
- *
- * @see @ref conversation-signals
  */
 #ifndef _PURPLE_CONVERSATION_H_
 #define _PURPLE_CONVERSATION_H_
--- a/libpurple/core.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/libpurple/core.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,5 +1,6 @@
 /**
  * @defgroup core libpurple
+ * @see @ref core-signals
  */
 
 /* purple
@@ -21,8 +22,6 @@
  * 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  02111-1301  USA
- *
- * @see @ref core-signals
  */
 #ifndef _PURPLE_CORE_H_
 #define _PURPLE_CORE_H_
--- a/libpurple/dbus-server.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/libpurple/dbus-server.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file dbus-server.h Purple DBUS Server
  * @ingroup core
+ * @see @ref dbus-server-signals
  */
 
 /* purple
@@ -22,8 +23,6 @@
  * 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  02111-1301  USA
- *
- * @see @ref dbus-server-signals
  */
 
 #ifndef _PURPLE_DBUS_SERVER_H_
--- a/libpurple/ft.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/libpurple/ft.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file ft.h File Transfer API
  * @ingroup core
+ * @see @ref xfer-signals
  */
 
 /* purple
@@ -22,8 +23,6 @@
  * 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  02111-1301  USA
- *
- * @see @ref xfer-signals
  */
 #ifndef _PURPLE_FT_H_
 #define _PURPLE_FT_H_
--- a/libpurple/gaim-compat.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/libpurple/gaim-compat.h	Sat Oct 06 21:59:41 2007 +0000
@@ -22,8 +22,6 @@
  * 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  02111-1301  USA
- *
- * @see @ref account-signals
  */
 #ifndef _GAIM_COMPAT_H_
 #define _GAIM_COMPAT_H_
--- a/libpurple/imgstore.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/libpurple/imgstore.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file imgstore.h IM Image Store API
  * @ingroup core
+ * @see @ref imgstore-signals
  */
 
 /* purple
@@ -22,8 +23,6 @@
  * 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  02111-1301  USA
- *
- * @see @ref imgstore-signals
  */
 #ifndef _PURPLE_IMGSTORE_H_
 #define _PURPLE_IMGSTORE_H_
--- a/libpurple/log.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/libpurple/log.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file log.h Logging API
  * @ingroup core
+ * @see @ref log-signals
  */
 
 /* purple
@@ -22,8 +23,6 @@
  * 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  02111-1301  USA
- *
- * @see @ref log-signals
  */
 #ifndef _PURPLE_LOG_H_
 #define _PURPLE_LOG_H_
--- a/libpurple/notify.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/libpurple/notify.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file notify.h Notification API
  * @ingroup core
+ * @see @ref notify-signals
  */
 
 /* purple
@@ -22,8 +23,6 @@
  * 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  02111-1301  USA
- *
- * @see @ref notify-signals
  */
 #ifndef _PURPLE_NOTIFY_H_
 #define _PURPLE_NOTIFY_H_
--- a/libpurple/plugin.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/libpurple/plugin.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,9 @@
 /**
  * @file plugin.h Plugin API
  * @ingroup core
+ * @see @ref plugin-signals
+ * @see @ref plugin-ids
+ * @see @ref plugin-i18n
  */
 
 /* purple
@@ -22,10 +25,6 @@
  * 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  02111-1301  USA
- *
- * @see @ref plugin-signals
- * @see @ref plugin-ids
- * @see @ref plugin-i18n
  */
 #ifndef _PURPLE_PLUGIN_H_
 #define _PURPLE_PLUGIN_H_
--- a/libpurple/savedstatuses.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/libpurple/savedstatuses.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file savedstatuses.h Saved Status API
  * @ingroup core
+ * @see @ref savedstatus-signals
  */
 
 /* purple
@@ -22,8 +23,6 @@
  * 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  02111-1301  USA
- *
- * @see @ref savedstatus-signals
  */
 #ifndef _PURPLE_SAVEDSTATUSES_H_
 #define _PURPLE_SAVEDSTATUSES_H_
--- a/libpurple/sound.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/libpurple/sound.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file sound.h Sound API
  * @ingroup core
+ * @see @ref sound-signals
  */
 
 /* purple
@@ -22,8 +23,6 @@
  * 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  02111-1301  USA
- *
- * @see @ref sound-signals
  */
 #ifndef _PURPLE_SOUND_H_
 #define _PURPLE_SOUND_H_
--- a/pidgin/gtkaccount.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/pidgin/gtkaccount.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file gtkaccount.h GTK+ Account Editor UI
  * @ingroup pidgin
+ * @see @ref gtkaccount-signals
  */
 
 /* pidgin
--- a/pidgin/gtkblist.c	Sat Oct 06 21:58:54 2007 +0000
+++ b/pidgin/gtkblist.c	Sat Oct 06 21:59:41 2007 +0000
@@ -3070,7 +3070,7 @@
 	{ N_("/Buddies/Get User _Info..."), "<CTL>I", pidgin_dialogs_info, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_USER_INFO },
 	{ N_("/Buddies/View User _Log..."), "<CTL>L", pidgin_dialogs_log, 0, "<Item>", NULL },
 	{ "/Buddies/sep1", NULL, NULL, 0, "<Separator>", NULL },
-	{ N_("/Buddies/Show"), NULL, NULL, 0, "<Branch>", NULL},
+	{ N_("/Buddies/Sh_ow"), NULL, NULL, 0, "<Branch>", NULL},
 	{ N_("/Buddies/Show/_Offline Buddies"), NULL, pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL },
 	{ N_("/Buddies/Show/_Empty Groups"), NULL, pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL },
 	{ N_("/Buddies/Show/Buddy _Details"), NULL, pidgin_blist_buddy_details_cb, 1, "<CheckItem>", NULL },
--- a/pidgin/gtkblist.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/pidgin/gtkblist.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file gtkblist.h GTK+ Buddy List API
  * @ingroup pidgin
+ * @see @ref gtkblist-signals
  */
 
 /* pidgin
--- a/pidgin/gtkconv.c	Sat Oct 06 21:58:54 2007 +0000
+++ b/pidgin/gtkconv.c	Sat Oct 06 21:59:41 2007 +0000
@@ -5128,6 +5128,9 @@
 pidgin_conv_new(PurpleConversation *conv)
 {
 	private_gtkconv_new(conv, FALSE);
+	if (PIDGIN_IS_PIDGIN_CONVERSATION(conv))
+		purple_signal_emit(pidgin_conversations_get_handle(),
+				"conversation-displayed", PIDGIN_CONVERSATION(conv));
 }
 
 static void
--- a/pidgin/gtkconv.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/pidgin/gtkconv.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file gtkconv.h GTK+ Conversation API
  * @ingroup pidgin
+ * @see @ref gtkconv-signals
  */
 
 /* pidgin
--- a/pidgin/gtkimhtml.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/pidgin/gtkimhtml.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file gtkimhtml.h GTK+ IM/HTML rendering component
  * @ingroup pidgin
+ * @see @ref gtkimhtml-signals
  */
 
 /* Pidgin is the legal property of its developers, whose names are too numerous
--- a/pidgin/gtklog.h	Sat Oct 06 21:58:54 2007 +0000
+++ b/pidgin/gtklog.h	Sat Oct 06 21:59:41 2007 +0000
@@ -1,6 +1,7 @@
 /**
  * @file gtklog.h GTK+ Log viewer
  * @ingroup pidgin
+ * @see @ref gtklog-signals
  */
 
 /* pidgin