Mercurial > pidgin.yaz

--- a/doc/pidgin.1.in	Sat Nov 10 16:34:33 2007 +0000
+++ b/doc/pidgin.1.in	Sun Nov 11 03:06:23 2007 +0000
@@ -58,22 +58,22 @@
 .TP
 .B \-l, \-\-login[=\fINAME\fR,\fINAME\fR,...]
 Sign in the comma-separated list of accounts provided, in addition to the
-accounts that would be logged in anyway.  If you do not specify such a
-comma-separated list, your first account will be signed in.
+accounts that would be logged in anyway.  If the user does not specify such a
+comma-separated list, the first account in accounts.xml will be signed in.
 .TP
 .B \-v, \-\-version
 Print the current version and exit.

 .SH BUDDY LIST
 The \fBBuddy List\fR window is Pidgin's main interface window.  Using
-this window you can see which of your buddies is online, away, idle, etc.
-You can also add and remove buddies from your buddy list.
+this window a user can see which of his/her buddies is online, away, idle,
+etc.  The user can also add buddies to and remove buddies from the buddy list.

-The \fBBuddy List\fR window contains a list of your buddies who are online
-and have allowed you to be notified of their presence.  The icon to the
-left of each buddy indicates the buddy's current status.  Double clicking
-a buddy will open a new \fBConversation\fR window.  Right clicking will
-pop up a menu:
+The \fBBuddy List\fR window contains a list of the user's buddies who are
+online and have allowed the user to be notified of their presence.  The icon
+to the left of each buddy indicates the buddy's current status.  Double
+clicking a buddy will open a new \fBConversation\fR window.  Right clicking
+will pop up a menu:
 .TP
 .B Get Info
 Retrieves and displays information about the buddy.  This information is
@@ -121,9 +121,9 @@
 them.  It can be accessed by selecting \fBManage\fR from the Tools menu.
 Clicking \fIDelete\fR will delete the currently selected account.
 Clicking \fIAdd\fR or \fIModify\fR will invoke a \fBModify Account\fR
-window.  Here, you can add or alter account information.  When creating a
-new account, you will submit your screen name and password.  You will also
-choose your protocol.
+window.  Here, the user  can add or alter account information.  When creating
+a new account, the user will submit a screen name and password.  The user will
+also choose the protocol for the account.

 If \fIRemember Password\fR is chosen, the password will be saved in
 Pidgin's \fI~/.purple/accounts.xml\fR configuration file.
@@ -143,7 +143,7 @@

 .TP
 .B Show system tray icon
-Specifies when to show a Pidgin icon in the notification area of your
+Specifies when to show a Pidgin icon in the notification area of the user's
 panel (commonly referred to as the System Tray).

 .TP
@@ -299,8 +299,8 @@
 .B Report idle time
 Determines under which conditions to report idle time.  \fBBased on keyboard
 and mouse use\fR uses keyboard and mouse activity to determine idle time.
-\fBFrom last sent message\fR uses the time at which you last sent a message
-in Pidgin to determine idle.  \fBNever\fR disables idle reporting.
+\fBFrom last sent message\fR uses the time at which the user last sent a
+message in Pidgin to determine idle.  \fBNever\fR disables idle reporting.

 .TP
 .B Auto-reply
@@ -358,8 +358,7 @@
 For protocols that allow it, \fBChats\fR can be entered through the
 \fIBuddies\fR menu.

-
-Additional commands available in chat, depending on the protocol are:
+Additional features available in chat, depending on the protocol are:
 .TP
 .B Whisper
 The text will appear in the chat conversation, but it will only be visible
@@ -374,6 +373,10 @@
 .B Set Topic
 Set the topic of the chat room.  This is usually a brief sentence
 describing the nature of the chat--an explanation of the chat room's name.
+.TP
+.B Private Message (IM)
+Send a message to a specific person in the chat.  Messages sent this way will
+not appear in the chat window, but instead open a new IM conversation.

 .SH STATUS MESSAGES
 Most protocols allow for status messages.  By using status messages, a user
@@ -457,7 +460,7 @@
 button.  A pounce can be set to occur on any combination of the
 events listed, and any combination of actions can result.  If \fIPounce
 only when my status is not Available\fR is checked, the pounce will occur
-only if you are set to a non-available status, such as invisible, do not
+only if the user is set to a non-available status, such as invisible, do not
 disturb, away, etc.  If \fIRecurring\fR is checked, the pounce will remain
 until removed by the \fBDelete\fR button.

@@ -487,20 +490,20 @@

 .SH D-Bus
 Pidgin allows for interaction via D-Bus.  Currently very little documentation
-on this interaction exists.
+about this interaction exists.

 .SH FILES
   \fI@prefix@/bin/pidgin\fR: Pidgin's location.
 .br
   \fI~/.purple/blist.xml\fR: the buddy list.
 .br
-  \fI~/.purple/accounts.xml\fR: information about your accounts.
+  \fI~/.purple/accounts.xml\fR: information about the user's accounts.
 .br
-  \fI~/.purple/pounces.xml\fR: stores your buddy pounces.
+  \fI~/.purple/pounces.xml\fR: stores the user's buddy pounces.
 .br
   \fI~/.purple/prefs.xml\fR: Pidgin's configuration file.
 .br
-  \fI~/.purple/status.xml\fR: stores your away messages.
+  \fI~/.purple/status.xml\fR: stores the user's away messages.
 .br
   \fI~/.purple/logs/PROTOCOL/ACCOUNT/SCREENNAME/DATE.{html,txt}\fR: conversation logs.
--- a/pidgin/gtkblist.c	Sat Nov 10 16:34:33 2007 +0000
+++ b/pidgin/gtkblist.c	Sun Nov 11 03:06:23 2007 +0000
@@ -3063,10 +3063,19 @@
 			!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/enabled"));
 }

+static void (*show_with_parent_funcs[5])(GtkWindow *parent) =
+{
+	NULL,
+	pidgin_pounces_manager_show_with_parent,
+	pidgin_plugin_dialog_show_with_parent,
+	pidgin_syslog_show_with_parent,
+	pidgin_dialogs_about_with_parent
+};
+
 static void
-pidgin_blist_show_with_parent(gpointer data1, void (*callback)(GtkWindow *parent), gpointer data3)
-{
-	callback(GTK_WINDOW(gtkblist->window));
+pidgin_blist_show_with_parent(gpointer data1, gint show_with_parent_idx, gpointer data3)
+{
+	show_with_parent_funcs[show_with_parent_idx](GTK_WINDOW(gtkblist->window));
 }

 /***************************************************
@@ -3101,15 +3110,15 @@

 	/* Tools */
 	{ N_("/_Tools"), NULL, NULL, 0, "<Branch>", NULL },
-	{ N_("/Tools/Buddy _Pounces"), NULL, pidgin_blist_show_with_parent, (int)pidgin_pounces_manager_show_with_parent, "<Item>", NULL },
+	{ N_("/Tools/Buddy _Pounces"), NULL, pidgin_blist_show_with_parent, 1, "<Item>", NULL },
 	{ N_("/Tools/_Certificates"), NULL, pidgin_certmgr_show, 0, "<Item>", NULL },
-	{ N_("/Tools/Plu_gins"), "<CTL>U", pidgin_blist_show_with_parent, (int)pidgin_plugin_dialog_show_with_parent, "<StockItem>", PIDGIN_STOCK_TOOLBAR_PLUGINS },
+	{ N_("/Tools/Plu_gins"), "<CTL>U", pidgin_blist_show_with_parent, 2, "<StockItem>", PIDGIN_STOCK_TOOLBAR_PLUGINS },
 	{ N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES },
 	{ N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL },
 	{ "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL },
 	{ N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<Item>", NULL },
 	{ N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL },
-	{ N_("/Tools/System _Log"), NULL, pidgin_blist_show_with_parent, (int)pidgin_syslog_show_with_parent, "<Item>", NULL },
+	{ N_("/Tools/System _Log"), NULL, pidgin_blist_show_with_parent, 3, "<Item>", NULL },
 	{ "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL },
 	{ N_("/Tools/Mute _Sounds"), "<CTL>S", pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL },
 	/* Help */
@@ -3117,9 +3126,9 @@
 	{ N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
 	{ N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL },
 #if GTK_CHECK_VERSION(2,6,0)
-	{ N_("/Help/_About"), NULL, pidgin_blist_show_with_parent, (int)pidgin_dialogs_about_with_parent, "<StockItem>", GTK_STOCK_ABOUT },
+	{ N_("/Help/_About"), NULL, pidgin_blist_show_with_parent, 4, "<StockItem>", GTK_STOCK_ABOUT },
 #else
-	{ N_("/Help/_About"), NULL, pidgin_blist_show_with_parent, (int)pidgin_dialogs_about_with_parent, "<Item>", NULL },
+	{ N_("/Help/_About"), NULL, pidgin_blist_show_with_parent, 4, "<Item>", NULL },
 #endif
 };
--- a/pidgin/gtkconv.c	Sat Nov 10 16:34:33 2007 +0000
+++ b/pidgin/gtkconv.c	Sun Nov 11 03:06:23 2007 +0000
@@ -3074,6 +3074,9 @@
 					chat, (GDestroyNotify)purple_blist_remove_chat);
 		}
 	} else {
+		if (!purple_account_is_connected(conv->account))
+			return FALSE;
+
 		buddy = purple_find_buddy(conv->account, conv->name);

 		/* gotta remain bug-compatible :( libpurple < 2.0.2 didn't handle
--- a/pidgin/gtkpounce.c	Sat Nov 10 16:34:33 2007 +0000
+++ b/pidgin/gtkpounce.c	Sun Nov 11 03:06:23 2007 +0000
@@ -531,6 +531,7 @@
 	gtk_window_set_title(GTK_WINDOW(window), (cur_pounce == NULL ? _("New Buddy Pounce") : _("Edit Buddy Pounce")));
 	gtk_window_set_role(GTK_WINDOW(window), "buddy_pounce");
 	gtk_container_set_border_width(GTK_CONTAINER(dialog->window), PIDGIN_HIG_BORDER);
+	gtk_window_set_transient_for(GTK_WINDOW(window), parent);

 	g_signal_connect(G_OBJECT(window), "delete_event",
 					 G_CALLBACK(delete_win_cb), dialog);
--- a/pidgin/gtkrequest.c	Sat Nov 10 16:34:33 2007 +0000
+++ b/pidgin/gtkrequest.c	Sun Nov 11 03:06:23 2007 +0000
@@ -29,7 +29,6 @@
 #include "prefs.h"
 #include "util.h"

-#include "gtkblist.h"
 #include "gtkimhtml.h"
 #include "gtkimhtmltoolbar.h"
 #include "gtkrequest.h"