Revision 003015469cdb622dd60c5e0777e6382c563f2e6b
markdoliner at pidgin.im
markdoliner at pidgin.im
Mon Mar 26 01:29:18 EDT 2007
o -----------------------------------------------------------------
| Revision: 003015469cdb622dd60c5e0777e6382c563f2e6b
| Ancestor: 6f1f82c8cb2e3613ce62f384135daea40f42c5f7
| Author: markdoliner at pidgin.im
| Date: 2007-03-26T05:28:57
| Branch: im.pidgin.pidgin
|
| Modified files:
| AUTHORS COPYRIGHT ChangeLog ChangeLog.API Doxyfile.in
| doc/PERL-HOWTO.dox libpurple/account.h libpurple/buddyicon.h
| libpurple/eventloop.h libpurple/notify.h
| libpurple/protocols/silc/README
| libpurple/protocols/silc/TODO libpurple/savedstatuses.h
| libpurple/server.h pidgin/gtkutils.h pidgin/pidginstock.h
| pidgin.spec.in
|
| ChangeLog:
|
| A little doxygen love and some tiny gaim->purpleisms
|
| ============================================================
| --- AUTHORS 13ec2e87ea5799fa3c2bcaae3be1880ccb5c80aa
| +++ AUTHORS 26fe78c9de204b02a48843c8723029194e5711c9
| @@ -1,10 +1,10 @@
| -gaim - the Pimpin' Penguin IM Clone that's Good for the Soul
| -============================================================
| +Pidgin and Finch: The Pimpin' Penguin IM Clients that're Good for the Soul
| +==========================================================================
|
| For a complete list of all contributors, see the COPYRIGHT file.
|
| -We've got an IRC room now too, #gaim on irc.freenode.net (#wingaim for
| -Windows users). Come check us out.
| +We've got an IRC room now too, #pidgin on irc.freenode.net
| +(#winpidgin for Windows users). Come check us out.
|
| Current Developers:
| ------------------
| ============================================================
| --- COPYRIGHT ac96d128049bd03585402ecf438999ec2e2a9d25
| +++ COPYRIGHT d117afd99593c6ba2b77cb7d4acd30cf332ca6ef
| @@ -1,8 +1,8 @@
| -Gaim
| +Purple, Pidgin and Finch
| Copyright (C) 1998-2007 by the following:
|
| -If you have contributed to Gaim, you deserve to be on this list.
| -Contact us (see: AUTHORS) and we'll add you.
| +If you have contributed to this project then you deserve to be on this
| +list. Contact us (see: AUTHORS) and we'll add you.
|
| Saleem Abdulrasool
| Dave Ahlswede
| ============================================================
| --- ChangeLog 4181ea27e18226f1fe89ee612111b38b8a7bda23
| +++ ChangeLog b8edee413af5f9a9928da091928a7af5de94f98c
| @@ -1,10 +1,5 @@
| -2007-01-24 gettextize <bug-gnu-gettext at gnu.org>
| +Pidgin and Finch: The Pimpin' Penguin IM Clients that're good for the soul
|
| - * Makefile.am (ACLOCAL_AMFLAGS): New variable.
| - (EXTRA_DIST): Add config.rpath, m4/ChangeLog.
| -
| -Gaim: The Pimpin' Penguin IM Client that's good for the soul!
| -
| version 2.0.0:
| Build Changes:
| * With the Core/UI split completed, it is now possible to build Gaim
| ============================================================
| --- ChangeLog.API e8a7ac5a65d16bdc3aa8e78c9845955d124d6067
| +++ ChangeLog.API 393b6a5509b11556df2217f4c42601f22ce9a178
| @@ -1,4 +1,4 @@
| -Gaim: The Pimpin' Penguin IM Client that's good for the soul!
| +Pidgin and Finch: The Pimpin' Penguin IM Clients that're good for the soul
|
| version 2.0.0:
| Changed:
| ============================================================
| --- Doxyfile.in d44f735b442bf91d45745775de9f1aa12751d06f
| +++ Doxyfile.in 5c9c6db3416643d223092f4fbeab8a0e4c8c5236
| @@ -431,9 +431,9 @@ WARN_LOGFILE =
| # directories like "/usr/src/myproject". Separate the files or directories
| # with spaces.
|
| -INPUT = libgaim \
| - gtk \
| - console \
| +INPUT = libpurple \
| + finch \
| + pidgin \
| doc
|
| # If the value of the INPUT tag contains directories, you can use the
| @@ -586,9 +586,9 @@ COLS_IN_ALPHA_INDEX = 3
| # The IGNORE_PREFIX tag can be used to specify one or more prefixes that
| # should be ignored while generating the index headers.
|
| -IGNORE_PREFIX = Gaim \
| - _Gaim \
| - gaim
| +IGNORE_PREFIX = Purple \
| + _Purple \
| + purple
|
| #---------------------------------------------------------------------------
| # configuration options related to the HTML output
| ============================================================
| --- doc/PERL-HOWTO.dox 06bf3adf1e3525497f10cac75c0a13e515b00618
| +++ doc/PERL-HOWTO.dox 1a7cae822c40d02a8e5fb8e51f1ef42b2f77a6b0
| @@ -333,7 +333,7 @@ sub plugin_load {
| }
| @endcode
|
| -Now we can provide an UI for manipulating these preferences in our @prefs_info
| +Now we can provide an UI for manipulating these preferences in our @c prefs_info
| function.
|
| @code
| ============================================================
| --- libpurple/account.h ad1a68fcb7a3a4ab271ef0779c9a4338c8358c76
| +++ libpurple/account.h 8f0e3721be8e9b1a889a1ade641dbb49da5e1039
| @@ -211,14 +211,14 @@ void *purple_account_request_authorizati
| /**
| * Close account requests registered for the given PurpleAccount
| *
| - * @param handle The account for which requests should be closed
| + * @param account The account for which requests should be closed
| */
| void purple_account_request_close_with_account(PurpleAccount *account);
|
| /**
| * Close the account request for the given ui handle
| *
| - * @param handle The ui specific handle for which requests should be closed
| + * @param ui_handle The ui specific handle for which requests should be closed
| */
| void purple_account_request_close(void *ui_handle);
|
| @@ -281,7 +281,7 @@ void purple_account_set_buddy_icon(Purpl
| * Sets the account's buddy icon path.
| *
| * @param account The account.
| - * @param info The buddy icon non-cached path.
| + * @param path The buddy icon non-cached path.
| */
| void purple_account_set_buddy_icon_path(PurpleAccount *account, const char *path);
|
| ============================================================
| --- libpurple/buddyicon.h 1fb5bffb38d5665206019276d7608dfb899eb501
| +++ libpurple/buddyicon.h b4bcbed6371098ee7194d84b30c23b80afe1b5c4
| @@ -182,8 +182,8 @@ const guchar *purple_buddy_icon_get_data
| * Returns the buddy icon's path.
| *
| * @param icon The buddy icon.
| - *
| - * @preturn The buddy icon's non-cached path.
| + *
| + * @return The buddy icon's non-cached path.
| */
| const gchar *purple_buddy_icon_get_path(PurpleBuddyIcon *icon);
|
| ============================================================
| --- libpurple/eventloop.h 63a66a2dfa35c7d07a971cd72d5dd999578f8b3a
| +++ libpurple/eventloop.h 089314f4df684b5508ec766da9afa821fdf535e7
| @@ -138,7 +138,7 @@ gboolean purple_input_remove(guint handl
| * implement the input_get_error UI op.
| *
| * @param fd The input file descriptor.
| - * @param errno A pointer to an int which on return will have the error, or 0 if no error.
| + * @param error A pointer to an int which on return will have the error, or 0 if no error.
| *
| * @return 0 if there is no error; -1 if there is an error, in which case errno will be set.
| */
| ============================================================
| --- libpurple/notify.h e1b4d2a2cab819638f05a12b712b1263e4250df8
| +++ libpurple/notify.h c80ecc1bba96c1e402015d438df207c8efaa82c6
| @@ -581,7 +581,7 @@ PurpleNotifyUserInfoEntryType purple_not
| * Set the type of a PurpleNotifyUserInfoEntry
| *
| * @param user_info_entry The PurpleNotifyUserInfoEntry
| - * @param The PurpleNotifyUserInfoEntryType
| + * @param type The PurpleNotifyUserInfoEntryType
| */
| void purple_notify_user_info_entry_set_type(PurpleNotifyUserInfoEntry *user_info_entry,
| PurpleNotifyUserInfoEntryType type);
| ============================================================
| --- libpurple/protocols/silc/README 2052314b74e10d02544f315962dce1fb5462f291
| +++ libpurple/protocols/silc/README a7b22f8decde0cf4452bc5e0120a5e75f66e1742
| @@ -1,12 +1,12 @@
| -SILC Gaim Plugin
| -================
| +SILC Purple Plugin
| +==================
|
| -This is Gaim protocol plugin of the protocol called Secure Internet Live
| -Conferencing (SILC). The implementation will use the SILC Toolkit,
| +This is the Purple protocol plugin of the protocol called Secure Internet
| +Live Conferencing (SILC). The implementation will use the SILC Toolkit,
| freely available from the http://silcnet.org/ site, for the actual SILC
| protocol implementation.
|
| -To include the SILC into Gaim, one needs to first compile and install
| +To include SILC into Purple, one needs to first compile and install
| the SILC Toolkit. It is done as follows:
|
| ./configure --enable-shared
| @@ -17,7 +17,7 @@ is not given to ./configure, the binarie
| is not given to ./configure, the binaries are installed into the
| /usr/local/silc directory.
|
| -Once the Toolkit is installed one needs to tell for the Gaim ./configure
| +Once the Toolkit is installed one needs to tell Purple's ./configure
| script where the SILC Toolkit is located. It is done as simply as:
|
| ./configure
| @@ -27,5 +27,5 @@ if pkg-config is installed in your syste
| ./configure --with-silc-libs=/path/to/silc/lib
| --with-silc-includes=/path/to/silc/include
|
| +If the SILC Toolkit cannot be found then the SILC protocol plugin will
| +not be compiled.
| -If the Toolkit cannot be located the SILC will not be compiled into the
| -Gaim.
| ============================================================
| --- libpurple/protocols/silc/TODO aca6580c753adbecaf8282cfa92a3ef7135d03df
| +++ libpurple/protocols/silc/TODO 03e82e50c0844649c776335abd21a481edd0d51e
| @@ -1,8 +1,8 @@ Sending images
| Features TODO (maybe)
| =====================
|
| Sending images
| - - Sending images to channel too, if Gaim allows it.
| + - Sending images to channel too, if libpurple allows it.
|
| Preferences
| - Add joined channels to buddy list automatically (during
| ============================================================
| --- libpurple/savedstatuses.h a15aec12a59cd4b1c046f830d7ba690b8e62413b
| +++ libpurple/savedstatuses.h a74a64cc7fc98b9f542377bbcc14650da61247bf
| @@ -213,9 +213,9 @@ gboolean purple_savedstatus_is_idleaway(
| /**
| * Set whether accounts in Purple are idle-away or not.
| *
| - * @param TRUE if accounts should be switched to use the
| - * idle-away saved status. FALSE if they should
| - * be switched to use the default status.
| + * @param idleaway TRUE if accounts should be switched to use the
| + * idle-away saved status. FALSE if they should
| + * be switched to use the default status.
| */
| void purple_savedstatus_set_idleaway(gboolean idleaway);
|
| ============================================================
| --- libpurple/server.h 6bb268f4555eb2d81883e98b6285ff640234a33e
| +++ libpurple/server.h f1eeff2eb723d7c1faa7ab179e4543a031c66263
| @@ -38,7 +38,7 @@ extern "C" {
| *
| * TODO: Could probably move this into the conversation API.
| *
| - * @param typing One of PURPLE_TYPING, PURPLE_TYPED, or PURPLE_NOT_TYPING.
| + * @param state One of PURPLE_TYPING, PURPLE_TYPED, or PURPLE_NOT_TYPING.
| * @return A quiet-period, specified in seconds, where Purple will not
| * send any additional typing notification messages. Most
| * protocols should return 0, which means that no additional
| @@ -94,13 +94,13 @@ void serv_got_im(PurpleConnection *gc, c
| * @param data The hash function should be g_str_hash() and the equal
| * function should be g_str_equal().
| */
| -void serv_join_chat(PurpleConnection *, GHashTable *);
| +void serv_join_chat(PurpleConnection *, GHashTable *data);
|
| /**
| * @param data The hash function should be g_str_hash() and the equal
| * function should be g_str_equal().
| */
| -void serv_reject_chat(PurpleConnection *, GHashTable *);
| +void serv_reject_chat(PurpleConnection *, GHashTable *data);
|
| /**
| * @param data The hash function should be g_str_hash() and the equal
| ============================================================
| --- pidgin/gtkutils.h eb020d784ced34bd9664b927239a8f331ec05bb7
| +++ pidgin/gtkutils.h cbdbb69407766823dd76edb47473858083a15e64
| @@ -393,7 +393,7 @@ GdkPixbuf *pidgin_create_prpl_icon(Purpl
| * @param primitive The status primitive
| * @param w The widget to render this
| * @param size The icon size to render at
| - * @retrun A GdkPixbuf, created from stock
| + * @retun A GdkPixbuf, created from stock
| */
| GdkPixbuf * pidgin_create_status_icon(PurpleStatusPrimitive primitive, GtkWidget *w, const char *size);
|
| ============================================================
| --- pidgin/pidginstock.h f9f8f02641576315c2e44fcbd6d10224456abee3
| +++ pidgin/pidginstock.h 4dce26c617dbd66b87fc58332550e596449cec5b
| @@ -1,5 +1,5 @@
| /**
| - * @file gtkstock.h GTK+ Stock resources
| + * @file pidginstock.h GTK+ Stock resources
| * @ingroup gtkui
| *
| * pidgin
| ============================================================
| --- pidgin.spec.in 6ca03af99b542c1dc6333d4ea44cd7461c99e6c7
| +++ pidgin.spec.in 5cc3d6d65e5a1a3e8baebfd57aacdadd2b18a7d7
| @@ -270,7 +270,7 @@ if [ "$1" -gt 1 -a -n "`which gconftool-
| if [ "$1" -gt 1 -a -n "`which gconftool-2 2>/dev/null`" ]; then
| export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
| gconftool-2 --makefile-uninstall-rule \
| - %{_sysconfdir}/gconf/schemas/gaim.schemas >/dev/null || :
| + %{_sysconfdir}/gconf/schemas/purple.schemas >/dev/null || :
| killall -HUP gconfd-2 || :
| fi
|
| @@ -278,7 +278,7 @@ if [ -n "`which gconftool-2 2>/dev/null`
| if [ -n "`which gconftool-2 2>/dev/null`" ]; then
| export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
| gconftool-2 --makefile-install-rule \
| - %{_sysconfdir}/gconf/schemas/gaim.schemas > /dev/null || :
| + %{_sysconfdir}/gconf/schemas/purple.schemas > /dev/null || :
| killall -HUP gconfd-2 || :
| fi
| /sbin/ldconfig
| @@ -287,7 +287,7 @@ if [ "$1" -eq 0 -a -n "`which gconftool-
| if [ "$1" -eq 0 -a -n "`which gconftool-2 2>/dev/null`" ]; then
| export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
| gconftool-2 --makefile-uninstall-rule \
| - %{_sysconfdir}/gconf/schemas/gaim.schemas > /dev/null || :
| + %{_sysconfdir}/gconf/schemas/purple.schemas > /dev/null || :
| killall -HUP gconfd-2 || :
| fi
|
| @@ -319,7 +319,7 @@ fi
| %{_datadir}/sounds/pidgin/*
| %{_datadir}/applications/*
| %{_libdir}/libpurple.so.*
| -%{_sysconfdir}/gconf/schemas/gaim.schemas
| +%{_sysconfdir}/gconf/schemas/purple.schemas
|
| %if 0%{?_with_dbus:1}
| %{_bindir}/purple-client-example
To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 003015469cdb622dd60c5e0777e6382c563f2e6b
More information about the Commits
mailing list