im.pidgin.pidgin.2.2.3: 38ed9d0c3fe234b3ae6472afbde65e0c1168ef00
rekkanoryo at pidgin.im
rekkanoryo at pidgin.im
Fri Nov 9 13:27:28 EST 2007
-----------------------------------------------------------------
Revision: 38ed9d0c3fe234b3ae6472afbde65e0c1168ef00
Ancestor: 3e41952270bf5671f5d2fd8f01fc6449b066c10f
Author: rekkanoryo at pidgin.im
Date: 2007-11-09T16:56:52
Branch: im.pidgin.pidgin.2.2.3
Modified files:
doc/pidgin.1.in finch/libgnt/gnt.h
finch/libgnt/gntbindable.h finch/libgnt/gntfilesel.c
finch/libgnt/gntfilesel.h finch/libgnt/gntkeys.h
finch/libgnt/gntlabel.h finch/libgnt/gntline.h
finch/libgnt/gntmain.c finch/libgnt/gntmenu.h
finch/libgnt/gntmenuitem.h finch/libgnt/gntmenuitemcheck.h
finch/libgnt/gntstyle.h finch/libgnt/gnttextview.h
finch/libgnt/gntutils.h finch/libgnt/gntwidget.c
finch/libgnt/gntwidget.h finch/libgnt/gntwindow.h
finch/libgnt/gntwm.c finch/libgnt/gntwm.h
libpurple/tests/test_util.c pidgin/gtkprefs.c
pidgin/gtkstatusbox.c
ChangeLog:
applied changes from 1f57ebe4e6d16159c74db823ecff2ec0f4c46936
through ff5b50d410a4c5d305fbbaacab5465581332c254
applied changes from c92bfd23eea356d86913789cfa3f66ad6f156bce
through 645aa07330425e8ec239e478449e818df8061bdf
applied changes from 023bbf40f2ace632a36775360d2101e19370b4e5
through eb14385d2f3d84e0bdd1b158200baa76f86da3a2
applied changes from 18bfb4a38162cf6920d87b437ceb20124a26e028
through 2a7b93b8c57bc86dafb9f1d9af64676de420ef0a
applied changes from 2a7b93b8c57bc86dafb9f1d9af64676de420ef0a
through b2523913e5ed5b4237eedbf8ed4999736dc78137
-------------- next part --------------
============================================================
--- doc/pidgin.1.in 708873c3a92f9414907360edd228dd8a588ddc0e
+++ doc/pidgin.1.in 00e5db948b642a41b2c6a9df5d1941b63f100665
@@ -227,76 +227,113 @@ Lets the user choose when and what sound
.SH Network
.TP
-.B IP Address
-\fIAutodetect IP Address\fR: Pidgin will attempt to automatically determine
-your IP address for use in file transfers and Direct IMs.
+.B STUN server
+This allows specifying a server which uses the STUN protocol to determine
+a host's public IP address. This can be particularly useful for some
+protocols.
-\fIPublic IP\fR: What IP address to use for file transfer and Direct IMs. This
-is mainly useful for users with multiple network interfaces or behind NAT.
+.TP
+.B Autodetect IP address
+When checked, causes Pidign to attempt to determine the public IP address
+of the host on which Pidgin is running and disables the \fBPublic IP\fR
+text field listed below.
.TP
-.B Ports
-\fIManually specify range of ports to listen on\fR: Specify specific ports to
-listen on, overriding any defaults.
+.B Public IP
+If \fBAutodetect IP address\fR is disabled, this field allows manually
+specifying the public IP address for the host on which Pidgin is running.
+This is mainly useful for users with multiple network interfaces or behind
+NATs.
.TP
+.B Manually specify range of ports to listen on
+Specify a range ports to listen on, overriding any defaults. This is
+sometimes useful for file transfers and Direct IM.
+
+.TP
.B Proxy Server
The configuration section to enable Pidgin to operate through a proxy
server. Pidgin currently supports SOCKS 4/5 and HTTP proxies.
.SH Browser
+.TP
+.B Browser
Allows the user to select Pidgin's default web browser. Firefox, Galeon,
Konqueror, Mozilla, Netscape and Opera are supported natively. The user
can also manually enter a command to be executed when a link is clicked
(\fI%s\fR expands to the URL). For example, \fIxterm -e lynx "%s"\fR will
-open the link with lynx. \fIOpen new window by default\fR makes the
-browser use a new window instead of using the current window (or spawning a
-new tab).
+open the link with lynx.
+.TP
+.B Open link in
+Allows the user to specify whether to use an existing window, a new tab, a
+new window, or to let the browser to decide what to do when calling the
+browser to open a link. Which options are available will depend on which
+browser is selected.
+
.SH Logging
-\fIMessage Logs\fR lets the user choose whether \fBConversations\fR and/or
-\fBBuddy Chats\fR will be logged as well as whether logs will be in HTML or
-plain text format. \fISystem Logs\fR describes the types of events to be
-logged.
+.TP
+.B Log format
+Specifies how to log. Pidgin supports HTML and plain text, but plugins can
+provide other logging methods.
-.SH Away / Idle
+.TP
+.B Log all instant messages
+When enabled, all IM conversations are logged. This can be overridden on a
+per-conversation basis in the conversation window.
-\fIQueue new messages when away\fR: Messages received since going Away will
-not be shown until away status is removed.
+.TP
+.B Log all chats
+When enabled, all chat conversations are logged. This can be overridden on a
+per-conversation basis in the conversation window.
-\fISend auto-response\fR: If someone messages you while away, your
-auto-response will be sent.
+.TP
+.B Log all status changes to system log
+When enabled, status changes are logged.
-\fIOnly send auto-response when idle\fR: If someone messages you while
-away, your auto-response will only be sent if Pidgin decides that the
-connection is idle.
+.SH Status / Idle
-\fIIdle time reporting\fR: If \fINone\fR is selected, account idle time
-will not be reported. \fIPidgin usage\fR infers your idle time from your
-usage of Pidgin. \fIX usage\fR infers your idle time from \fBX\fR
-(this option may not be universally available).
+.TP
+.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.
-\fIAuto-away\fR: Determines if and under what conditions Pidgin will
-automatically turn on the Away status.
+.TP
+.B Auto-reply
+Determines when to send an auto-reply on protocols which support it
+(currently only AIM).
.TP
-.B Away Messages
-Lets the user add/edit/remove available \fBAway Messages\fR.
+.B Change status when idle
+When enabled, this uses the \fBMinutes before becoming idle\fR and \fBChange
+status to\fR preferences described below to set status on idle.
-.SH Plugins
+.TP
+.B Minutes before becoming idle
+Specifies how many minutes of inactivity are required before considering the
+user to be idle.
-Allows the user to enable add-on plugins for Pidgin. Several of these
-come with Pidgin, while others must be downloaded separately. The
-\fIDescription\fR field gives the plugin author's description of the
-plugin, while the \fIDetails\fR field gives the plugin's authorship, URL,
-and file name/location information.
+.TP
+.B Change status to
+Specifies which "primitive" or "saved" status to use when setting status on
+idle.
-Some plugins can be configured. If you load such a plugin, its
-configuration preferences will appear as a submenu to \fBPlugins\fR, with
-the submenu title determined by the plugin's name.
+.TP
+.B Use status from last exit at startup
+If this is checked, Pidgin will remember what status was active when the
+user closed Pidgin and restore it at the next run. When disabled, Pidgin
+will always set the status selected in \fBStatus to apply at startup\fR
+at startup.
+.TP
+.B Status to apply at startup
+When \fBUse status from last exit at startup\fR is disabled, this specifies
+which "primitive" or "saved" status to use at startup.
+
.SH CONVERSATIONS
When starting a new conversation, the user is presented with the
\fBConversation\fR window. The conversation appears in the upper text box
@@ -530,4 +567,8 @@ Our retired crazy patch writers include:
.br
+This manpage was originally written by Dennis Ristuccia
+<\fIdennis at dennisr.net\fR>. It has been updated and largely rewritten by
+Sean Egan <\fIseanegan at gmail.com\fR>,
+Ben Tegarden <\fItegarden at uclink.berkeley.edu\fR>,
+and John Bailey <\fIrekkanoryo at pidgin.im\fR>.
-This manpage was originally written by Dennis Ristuccia <\fIdennis at dennisr.net\fR>. It has been updated and largely rewritten by Sean Egan <\fIseanegan at gmail.com\fR> and Ben Tegarden <\fItegarden at uclink.berkeley.edu\fR>.
============================================================
--- finch/libgnt/gnt.h 5257f76f6cd8bd756d7f508cf3d54f5d93c5b1bf
+++ finch/libgnt/gnt.h 38710a3478510a51fa52f176b392ba20e7314c27
@@ -46,123 +46,150 @@
#endif
/**
- *
+ * Initialize GNT.
*/
void gnt_init(void);
/**
- *
+ * Start running the mainloop for gnt.
*/
void gnt_main(void);
/**
- *
+ * Check whether the terminal is capable of UTF8 display.
*
- * @return
+ * @return @c FALSE if the terminal is capable of drawing UTF-8, @c TRUE otherwise.
*/
gboolean gnt_ascii_only(void);
void gnt_window_present(GntWidget *window);
+
/**
- *
- * @param widget
+ * @internal
+ * Use #gnt_widget_show instead.
*/
void gnt_screen_occupy(GntWidget *widget);
/**
- *
- * @param widget
+ * @internal
+ * Use #gnt_widget_hide instead.
*/
void gnt_screen_release(GntWidget *widget);
/**
- *
- * @param widget
+ * @internal
+ * Use #gnt_widget_draw instead.
*/
void gnt_screen_update(GntWidget *widget);
/**
- *
- * @param widget
- * @param width
- * @param height
+ * Resize a widget.
+ *
+ * @param widget The widget to resize.
+ * @param width The desired width.
+ * @param height The desired height.
*/
void gnt_screen_resize_widget(GntWidget *widget, int width, int height);
/**
- *
- * @param widget
- * @param x
- * @param y
+ * Move a widget.
+ *
+ * @param widget The widget to move.
+ * @param x The desired x-coordinate.
+ * @param y The desired y-coordinate.
*/
void gnt_screen_move_widget(GntWidget *widget, int x, int y);
/**
- *
- * @param widget
- * @param text
+ * Rename a widget.
+ *
+ * @param widget The widget to rename.
+ * @param text The new name for the widget.
*/
void gnt_screen_rename_widget(GntWidget *widget, const char *text);
/**
- *
- * @param widget
+ * Check whether a widget has focus.
*
- * @return
+ * @param widget The widget.
+ *
+ * @return @c TRUE if the widget has the current focus, @c FALSE otherwise.
*/
gboolean gnt_widget_has_focus(GntWidget *widget);
/**
- *
- * @param widget
+ * Set the URGENT hint for a widget.
+ *
+ * @param widget The widget to set the URGENT hint for.
*/
void gnt_widget_set_urgent(GntWidget *widget);
/**
- *
- * @param label
- * @param callback
+ * Register a global action.
+ *
+ * @param label The user-visible label for the action.
+ * @param callback The callback function for the action.
*/
void gnt_register_action(const char *label, void (*callback)());
/**
- *
- * @param menu
+ * Show a menu.
*
- * @return
+ * @param menu The menu to display.
+ *
+ * @return @c TRUE if the menu is displayed, @c FALSE otherwise (e.g., if another menu is currently displayed).
*/
gboolean gnt_screen_menu_show(gpointer menu);
/**
- *
+ * Terminate the mainloop of gnt.
*/
void gnt_quit(void);
/**
- *
+ * Get the global clipboard.
*
- * @return
+ * @return The clipboard.
*/
GntClipboard * gnt_get_clipboard(void);
/**
- *
+ * Get the string in the clipboard.
*
- * @return
+ * @return A copy of the string in the clipboard. The caller must @c g_free the string.
*/
gchar * gnt_get_clipboard_string(void);
/**
- *
- * @param string
+ * Set the contents of the global clipboard.
+ *
+ * @param string The new content of the new clipboard.
*/
-void gnt_set_clipboard_string(gchar *string);
+void gnt_set_clipboard_string(const gchar *string);
/**
* Spawn a different application that will consume the console.
+ *
+ * @param wd The working directory for the new application.
+ * @param argv The argument vector.
+ * @param envp The environment, or @c NULL.
+ * @param stin Location to store the child's stdin, or @c NULL.
+ * @param stout Location to store the child's stdout, or @c NULL.
+ * @param sterr Location to store the child's stderr, or @c NULL.
+ * @param callback The callback to call after the child exits.
+ * @param data The data to pass to the callback.
+ *
+ * @return @c TRUE if the child was successfully spawned, @c FALSE otherwise.
*/
gboolean gnt_giveup_console(const char *wd, char **argv, char **envp,
gint *stin, gint *stout, gint *sterr,
void (*callback)(int status, gpointer data), gpointer data);
+/**
+ * Check whether a child process is in control of the current terminal.
+ *
+ * @return @c TRUE if a child process (eg., PAGER) is occupying the current
+ * terminal, @c FALSE otherwise.
+ */
gboolean gnt_is_refugee(void);
+
============================================================
--- finch/libgnt/gntbindable.h 9e7af7ad9534107c652956dcfc02af39efb20f84
+++ finch/libgnt/gntbindable.h fb55171a25f5d1fedc6c404855c1ca7f7b2694a5
@@ -160,9 +160,9 @@ gboolean gnt_bindable_perform_action_nam
/**
* Returns a GntTree populated with "key" -> "binding" for the widget.
- *
- * @param widget The object to list the bindings for.
*
+ * @param bind The object to list the bindings for.
+ *
* @return The GntTree.
*/
GntBindable * gnt_bindable_bindings_view(GntBindable *bind);
@@ -170,9 +170,9 @@ GntBindable * gnt_bindable_bindings_view
/**
* Builds a window that list the key bindings for a GntBindable object.
* From this window a user can select a listing to rebind a new key for the given action.
- *
+ *
* @param bindable The object to list the bindings for.
- *
+ *
* @return @c TRUE
*/
============================================================
--- finch/libgnt/gntfilesel.c eb1241ed87d27c4878ad567bd116f3a91fbd2368
+++ finch/libgnt/gntfilesel.c b5af89246f2622dd131a7d7cd0bbab1f7052f471
@@ -719,6 +719,7 @@ void gnt_file_sel_set_suggested_filename
void gnt_file_sel_set_suggested_filename(GntFileSel *sel, const char *suggest)
{
+ g_free(sel->suggest);
sel->suggest = g_strdup(suggest);
}
============================================================
--- finch/libgnt/gntfilesel.h 75f832581ce55551a3e0fc7ba48f454dc39147a9
+++ finch/libgnt/gntfilesel.h 2dfdd9267b201dfbdace9277964041f2979371ff
@@ -98,113 +98,123 @@ G_BEGIN_DECLS
G_BEGIN_DECLS
/**
- *
- *
- * @return
+ * @return GType for GntFileSel.
*/
GType gnt_file_sel_get_gtype(void);
/**
- *
+ * Create a new file selector.
*
- * @return
+ * @return The newly created file selector.
*/
GntWidget * gnt_file_sel_new(void);
/**
- *
- * @param sel
- * @param path
+ * Set the current location of the file selector.
*
- * @return
+ * @param sel The file selector.
+ * @param path The current path of the selector.
+ *
+ * @return @c TRUE if the current location was successfully changed, @c FALSE otherwise.
*/
gboolean gnt_file_sel_set_current_location(GntFileSel *sel, const char *path);
/**
- *
- * @param sel
- * @param dirs
+ * Set wheter to only allow selecting directories.
+ *
+ * @param sel The file selector.
+ * @param dirs @c TRUE if only directories can be selected, @c FALSE if files
+ * can also be selected.
*/
void gnt_file_sel_set_dirs_only(GntFileSel *sel, gboolean dirs);
/**
- *
- * @param sel
+ * Check whether the file selector allows only selecting directories.
*
- * @return
+ * @param sel The file selector.
+ *
+ * @return @c TRUE if only directories can be selected.
*/
gboolean gnt_file_sel_get_dirs_only(GntFileSel *sel);
/**
- *
- * @param sel
- * @param must
+ * Set whether a selected file must exist.
+ *
+ * @param sel The file selector.
+ * @param must @c TRUE if the selected file must exist.
*/
void gnt_file_sel_set_must_exist(GntFileSel *sel, gboolean must);
/**
- *
- * @param sel
+ * Check whether the selector allows selecting non-existent files.
*
- * @return
+ * @param sel The file selector.
+ *
+ * @return @c TRUE if the selected file must exist, @c FALSE if a non-existent
+ * file can be selected.
*/
gboolean gnt_file_sel_get_must_exist(GntFileSel *sel);
/**
- *
- * @param sel
+ * Get the selected file in the selector.
*
- * @return
+ * @param sel The file selector.
+ *
+ * @return The path of the selected file. The caller should g_free the returned
+ * string.
*/
char * gnt_file_sel_get_selected_file(GntFileSel *sel);
- /* The returned value should be free'd */
-
/**
- *
- * @param sel
+ * Get the list of selected files in the selector.
*
- * @return
+ * @param sel The file selector.
+ *
+ * @return A list of paths for the selected files. The caller must g_free the
+ * contents of the list, and g_list_free the list.
*/
GList * gnt_file_sel_get_selected_multi_files(GntFileSel *sel);
/**
- *
- * @param sel
- * @param set
+ * Allow selecting multiple files.
+ *
+ * @param sel The file selector.
+ * @param set @c TRUE if selecting multiple files should be allowed.
*/
void gnt_file_sel_set_multi_select(GntFileSel *sel, gboolean set);
/**
- *
- * @param sel
- * @param suggest
+ * Set the suggested file to have selected at startup.
+ *
+ * @param sel The file selector.
+ * @param suggest The suggested filename.
*/
void gnt_file_sel_set_suggested_filename(GntFileSel *sel, const char *suggest);
/**
- *
- * @param sel
- * @param path
- * @param files
- * @param error)
+ * Set custom functions to read the names of files.
+ *
+ * @param sel The file selector.
+ * @param read_fn The custom read function.
*/
void gnt_file_sel_set_read_fn(GntFileSel *sel, gboolean (*read_fn)(const char *path, GList **files, GError **error));
/**
- *
- * @param name
- * @param size
+ * Create a new GntFile.
*
- * @return
+ * @param name The name of the file.
+ * @param size The size of the file.
+ *
+ * @return The newly created GntFile.
*/
GntFile* gnt_file_new(const char *name, unsigned long size);
/**
- *
- * @param name
+ * Create a new GntFile for a directory.
*
- * @return
+ * @param name The name of the directory.
+ *
+ * @return The newly created GntFile.
*/
GntFile* gnt_file_new_dir(const char *name);
============================================================
--- finch/libgnt/gntkeys.h 8f016e6005588633ad4c165e3676d584c8eb0874
+++ finch/libgnt/gntkeys.h ef5720a7efca56f6436265845fe9eb9ec6d79c59
@@ -104,41 +104,59 @@ extern char *gnt_key_cright;
#define GNT_KEY_F12 SAFE(key_f12)
/**
- * This will do stuff with the terminal settings and stuff.
+ * Initialize the keys.
*/
-/**
- *
- */
void gnt_init_keys(void);
/**
- *
- * @param text
+ * Refine input text. This usually looks at what the terminal claims it is,
+ * and tries to change the text to work around some oft-broken terminfo entries.
+ *
+ * @param text The input text to refine.
*/
void gnt_keys_refine(char *text);
+/**
+ * Translate a user-readable representation of an input to a machine-readable representation.
+ *
+ * @param name The user-readable representation of an input (eg.: c-t)
+ *
+ * @return A machine-readable representation of the input.
+ */
const char *gnt_key_translate(const char *name);
+
+/**
+ * Translate a machine-readable representation of an input to a user-readable representation.
+ *
+ * @param key The machine-readable representation of an input.
+ *
+ * @return A user-readable representation of the input (eg.: c-t).
+ */
const char *gnt_key_lookup(const char *key);
/**
- *
- * @param path
+ * Add a key combination to the internal key-tree.
+ *
+ * @param key The key to add
*/
-void gnt_keys_add_combination(const char *path);
+void gnt_keys_add_combination(const char *key);
/**
- *
- * @param path
+ * Remove a key combination from the internal key-tree.
+ *
+ * @param key The key to remove.
*/
-void gnt_keys_del_combination(const char *path);
+void gnt_keys_del_combination(const char *key);
/**
- *
- * @param path
+ * Find a combination from the given string.
*
- * @return
+ * @param key The input string.
+ *
+ * @return The number of bytes in the combination that starts at the beginning
+ * of key (can be 0).
*/
-int gnt_keys_find_combination(const char *path);
+int gnt_keys_find_combination(const char *key);
/* A lot of commonly used variable names are defined in <term.h>.
* #undef them to make life easier for everyone. */
============================================================
--- finch/libgnt/gntlabel.h 73047ef6b9da8425bf5e1c3345c1b9c7e367fb2b
+++ finch/libgnt/gntlabel.h 3a095e67d9506bb2f9a4b7722c6291963b003fd9
@@ -67,33 +67,34 @@ G_BEGIN_DECLS
G_BEGIN_DECLS
/**
- *
- *
- * @return
+ * @return GType for GntLabel.
*/
GType gnt_label_get_gtype(void);
/**
- *
- * @param text
+ * Create a new GntLabel.
*
- * @return
+ * @param text The text of the label.
+ *
+ * @return The newly created label.
*/
GntWidget * gnt_label_new(const char *text);
/**
- *
- * @param text
- * @param flags
+ * Create a new label with specified text attributes.
*
- * @return
+ * @param text The text.
+ * @param flags Text attributes for the text.
+ *
+ * @return The newly created label.
*/
GntWidget * gnt_label_new_with_format(const char *text, GntTextFormatFlags flags);
/**
- *
- * @param label
- * @param text
+ * Change the text of a label.
+ *
+ * @param label The label.
+ * @param text The new text to set in the label.
*/
void gnt_label_set_text(GntLabel *label, const char *text);
============================================================
--- finch/libgnt/gntline.h 9c2fd44593c25f2df83b6d44ea1c89bd01ebcd60
+++ finch/libgnt/gntline.h 7e2a32659c679581ba5106d63b0fee60ff993fdd
@@ -67,9 +67,7 @@ G_BEGIN_DECLS
G_BEGIN_DECLS
/**
- *
- *
- * @return
+ * @return GType for GntLine.
*/
GType gnt_line_get_gtype(void);
@@ -77,10 +75,11 @@ GType gnt_line_get_gtype(void);
#define gnt_vline_new() gnt_line_new(TRUE)
/**
- *
- * @param vertical
+ * Create new line
*
- * @return
+ * @param vertical @c TRUE if the line should be vertical, @c FALSE for a horizontal line.
+ *
+ * @return The newly created line.
*/
GntWidget * gnt_line_new(gboolean vertical);
============================================================
--- finch/libgnt/gntmain.c 7ddfbc8f64142c8b3f27e408710c3e096e961fdd
+++ finch/libgnt/gntmain.c 220e72c21c519368f72b092ac5c55f13f5deea29
@@ -646,7 +646,7 @@ gboolean gnt_screen_menu_show(gpointer n
return TRUE;
}
-void gnt_set_clipboard_string(gchar *string)
+void gnt_set_clipboard_string(const gchar *string)
{
gnt_clipboard_set_string(clipboard, string);
}
============================================================
--- finch/libgnt/gntmenu.h 1c2f3274f300a2e3a833b6ef1c737dadda8ee0ce
+++ finch/libgnt/gntmenu.h 1e74b637c82b82fb4e3012c953b25ee9b1b1edac
@@ -86,24 +86,24 @@ G_BEGIN_DECLS
G_BEGIN_DECLS
/**
- *
- *
- * @return
+ * @return The GType for GntMenu.
*/
GType gnt_menu_get_gtype(void);
/**
- *
- * @param type
+ * Create a new menu.
*
- * @return
+ * @param type The type of the menu, whether it's a toplevel menu or a popup menu.
+ *
+ * @return The newly created menu.
*/
GntWidget * gnt_menu_new(GntMenuType type);
/**
- *
- * @param menu
- * @param item
+ * Add an item to the menu.
+ *
+ * @param menu The menu.
+ * @param item The item to add to the menu.
*/
void gnt_menu_add_item(GntMenu *menu, GntMenuItem *item);
============================================================
--- finch/libgnt/gntmenuitem.h 47117283f62ee0919dba3e083e622a43bc68f5c0
+++ finch/libgnt/gntmenuitem.h 0c479460ce09dd544eecfcf3cc1f5b7a28906165
@@ -86,32 +86,33 @@ G_BEGIN_DECLS
G_BEGIN_DECLS
/**
- *
- *
- * @return
+ * @return GType for GntMenuItem.
*/
GType gnt_menuitem_get_gtype(void);
/**
- *
- * @param text
+ * Create a new menuitem.
*
- * @return
+ * @param text Label for the menuitem.
+ *
+ * @return The newly created menuitem.
*/
GntMenuItem * gnt_menuitem_new(const char *text);
/**
- *
- * @param item
- * @param callback
- * @param data
+ * Set a callback function for a menuitem.
+ *
+ * @param item The menuitem.
+ * @param callback The callback function.
+ * @param data Data to send to the callback function.
*/
void gnt_menuitem_set_callback(GntMenuItem *item, GntMenuItemCallback callback, gpointer data);
/**
- *
- * @param item
- * @param menu
+ * Set a submenu for a menuitem. A menuitem with a submenu cannot have a callback.
+ *
+ * @param item The menuitem.
+ * @param menu The submenu.
*/
void gnt_menuitem_set_submenu(GntMenuItem *item, GntMenu *menu);
============================================================
--- finch/libgnt/gntmenuitemcheck.h 65b7bdc04f469ab96edeb89f05220d31d1e95d62
+++ finch/libgnt/gntmenuitemcheck.h 7795dfa90e72b85917d8eb71fb8fa23dd23b07ab
@@ -66,32 +66,33 @@ G_BEGIN_DECLS
G_BEGIN_DECLS
/**
- *
- *
- * @return
+ * @return GType for GntMenuItemCheck.
*/
GType gnt_menuitem_check_get_gtype(void);
/**
- *
- * @param text
+ * Create a new menuitem.
*
- * @return
+ * @param text The text for the menuitem.
+ *
+ * @return The newly created menuitem.
*/
GntMenuItem * gnt_menuitem_check_new(const char *text);
/**
- *
- * @param item
+ * Check whether the menuitem is checked or not.
*
- * @return
+ * @param item The menuitem.
+ *
+ * @return @c TRUE if the item is checked, @c FALSE otherwise.
*/
gboolean gnt_menuitem_check_get_checked(GntMenuItemCheck *item);
/**
- *
- * @param item
- * @param set
+ * Set whether the menuitem is checked or not.
+ *
+ * @param item The menuitem.
+ * @param set @c TRUE if the item should be checked, @c FALSE otherwise.
*/
void gnt_menuitem_check_set_checked(GntMenuItemCheck *item, gboolean set);
============================================================
--- finch/libgnt/gntstyle.h e199c542fe349f6230a49167aab3c06ae23e5516
+++ finch/libgnt/gntstyle.h 4f1bc57c3ebbaf368b08fbf89c7d6d51202feab4
@@ -38,11 +38,17 @@ typedef enum
} GntStyle;
/**
- *
- * @param filename
+ * Read configuration from a file.
+ *
+ * @param filename The filename to read configuration from.
*/
void gnt_style_read_configure_file(const char *filename);
+/**
+ * Get the user-setting for a style.
+ * @param style The style.
+ * @return The user-setting, or @c NULL.
+ */
const char *gnt_style_get(GntStyle style);
/**
@@ -66,38 +72,40 @@ gboolean gnt_style_parse_bool(const char
gboolean gnt_style_parse_bool(const char *value);
/**
- *
- * @param style
- * @param def
+ * Get the boolean value for a user-setting.
*
- * @return
+ * @param style The style.
+ * @param def The default value (i.e, the value if the user didn't define
+ * any value)
+ *
+ * @return The value of the setting.
*/
gboolean gnt_style_get_bool(GntStyle style, gboolean def);
-/* This should be called only once for the each type */
/**
- *
- * @param type
- * @param hash
+ * @internal
*/
void gnt_styles_get_keyremaps(GType type, GHashTable *hash);
/**
- *
- * @param type
- * @param klass
+ * @internal
*/
void gnt_style_read_actions(GType type, GntBindableClass *klass);
+/**
+ * @internal
+ * Read workspace information.
+ */
void gnt_style_read_workspaces(GntWM *wm);
/**
- *
+ * Initialize style settings.
*/
void gnt_init_styles(void);
/**
- *
+ * Uninitialize style settings.
*/
void gnt_uninit_styles(void);
+
============================================================
--- finch/libgnt/gnttextview.h 272d83ddd199c4f56dc9c2a15c24b019f6646825
+++ finch/libgnt/gnttextview.h 1a7bc1b096fd29ced0b688b90a6bf132ce805ff4
@@ -88,116 +88,144 @@ G_BEGIN_DECLS
G_BEGIN_DECLS
/**
- *
- *
- * @return
+ * @return GType for GntTextView.
*/
GType gnt_text_view_get_gtype(void);
-/* XXX: For now, don't set a textview to have any border.
- * If you want borders real bad, put it in a box. */
/**
- *
+ * Create a new textview.
*
- * @return
+ * @return The newly created textview.
*/
GntWidget * gnt_text_view_new(void);
-/* scroll > 0 means scroll up, < 0 means scroll down, == 0 means scroll to the end */
/**
- *
- * @param view
- * @param scroll
+ * Scroll the textview.
+ * @param view The textview to scroll.
+ * @param scroll scroll > 0 means scroll up, < 0 means scroll down, == 0 means scroll to the end.
*/
void gnt_text_view_scroll(GntTextView *view, int scroll);
/**
- *
- * @param view
- * @param text
- * @param flags
+ * Append new text in a textview.
+ *
+ * @param view The textview.
+ * @param text The text to append to the textview.
+ * @param flags The text-flags to apply to the new text.
*/
void gnt_text_view_append_text_with_flags(GntTextView *view, const char *text, GntTextFormatFlags flags);
/**
- *
- * @param view
- * @param text
- * @param flags
- * @param tag
+ * Append text in the textview, with some identifier (tag) for the added text.
+ *
+ * @param view The textview.
+ * @param text The text to append.
+ * @param flags The text-flags to apply to the new text.
+ * @param tag The tag for the appended text, so it can be changed later (@see gnt_text_view_tag_change)
*/
void gnt_text_view_append_text_with_tag(GntTextView *view, const char *text, GntTextFormatFlags flags, const char *tag);
-/* Move the cursor to the beginning of the next line and resets text-attributes.
- * It first completes the current line with the current text-attributes. */
/**
- *
- * @param view
+ * Move the cursor to the beginning of the next line and resets text-attributes.
+ * It first completes the current line with the current text-attributes.
+ *
+ * @param view The textview.
*/
void gnt_text_view_next_line(GntTextView *view);
/**
- *
- * @param flags
+ * Convert GNT-text formats to ncurses-text attributes.
*
- * @return
+ * @param flags The GNT text format.
+ *
+ * @return Nucrses text attribute.
*/
chtype gnt_text_format_flag_to_chtype(GntTextFormatFlags flags);
/**
- *
- * @param view
+ * Clear the contents of the textview.
+ *
+ * @param view The textview.
*/
void gnt_text_view_clear(GntTextView *view);
/**
- *
- * @param view
+ * The number of lines below the bottom-most visible line.
*
- * @return
+ * @param view The textview.
+ *
+ * @return Number of lines below the bottom-most visible line.
*/
int gnt_text_view_get_lines_below(GntTextView *view);
/**
- *
- * @param view
+ * The number of lines above the topmost visible line.
*
- * @return
+ * @param view The textview.
+ *
+ * @return Number of lines above the topmost visible line.
*/
int gnt_text_view_get_lines_above(GntTextView *view);
-/* If text is NULL, then the tag is removed. */
/**
- *
- * @param view
- * @param name
- * @param text
- * @param all
+ * Change the text of a tag.
*
- * @return
+ * @param view The textview.
+ * @param name The name of the tag.
+ * @param text The new text for the text. If 'text' is @c NULL, the tag is removed.
+ * @param all @c TRUE if all of the instancess of the tag should be changed, @c FALSE if
+ * only the first instance should be changed.
+ *
+ * @return The number of instances changed.
*/
int gnt_text_view_tag_change(GntTextView *view, const char *name, const char *text, gboolean all);
/**
- *
- * @param view
- * @param widget
+ * Setup hooks so that pressing up/down/page-up/page-down keys when 'widget' is
+ * in focus scrolls the textview.
+ *
+ * @param view The textview.
+ * @param widget The trigger widget.
*/
void gnt_text_view_attach_scroll_widget(GntTextView *view, GntWidget *widget);
/**
- *
- * @param view
- * @param widget
+ * Setup appropriate hooks so that pressing some keys when the 'pager' widget
+ * is in focus triggers the PAGER to popup with the contents of the textview
+ * in it.
+ *
+ * The default key-combination to trigger the pager is a-v, and the default
+ * PAGER application is $PAGER. Both can be changed in ~/.gntrc like this:
+ *
+ * @code
+ * [pager]
+ * key = a-v
+ * path = /path/to/pager
+ * @endcode
+ *
+ * @param view The textview.
+ * @param pager The widget to trigger the PAGER.
*/
void gnt_text_view_attach_pager_widget(GntTextView *view, GntWidget *pager);
/**
- *
- * @param view
- * @param widget
+ * Setup appropriate hooks so that pressing some keys when 'widget'
+ * is in focus triggers the EDITOR to popup with the contents of the textview
+ * in it.
+ *
+ * The default key-combination to trigger the pager is a-e, and the default
+ * EDITOR application is $EDITOR. Both can be changed in ~/.gntrc like this:
+ *
+ * @code
+ * [editor]
+ * key = a-e
+ * path = /path/to/editor
+ * @endcode
+ *
+ * @param view The textview.
+ * @param widget The widget to trigger the EDITOR.
*/
-void gnt_text_view_attach_editor_widget(GntTextView *view, GntWidget *pager);
+void gnt_text_view_attach_editor_widget(GntTextView *view, GntWidget *widget);
/**
* Set a GntTextViewFlag for the textview widget.
============================================================
--- finch/libgnt/gntutils.h 3dda56fc6097becc1fd4209e0705e5e7df723057
+++ finch/libgnt/gntutils.h 12209b6c1c7ff6564a889e221a3a2aa54ff57520
@@ -149,5 +149,5 @@ gboolean gnt_util_parse_xhtml_to_textvie
* @param key The key to trigger the button
* @param button The button to trigger
*/
-void gnt_util_set_trigger_widget(GntWidget *wid, const char *text, GntWidget *button);
+void gnt_util_set_trigger_widget(GntWidget *widget, const char *key, GntWidget *button);
============================================================
--- finch/libgnt/gntwidget.c 63a45f2a1c67c8092a3d4063039c04873cdfff1a
+++ finch/libgnt/gntwidget.c d432b9322d2ce0a6900cb0c2446e721604650598
@@ -617,7 +617,7 @@ void gnt_widget_queue_update(GntWidget *
return;
while (widget->parent)
widget = widget->parent;
-
+
if (!g_object_get_data(G_OBJECT(widget), "gnt:queue_update"))
{
int id = g_timeout_add(0, update_queue_callback, widget);
============================================================
--- finch/libgnt/gntwidget.h aab8d841b58b295bd3f9df38c07bc120f16f1b8f
+++ finch/libgnt/gntwidget.h e99942bee9da195bf60c8f51ce3016570457f863
@@ -140,167 +140,176 @@ G_BEGIN_DECLS
G_BEGIN_DECLS
/**
- *
- *
- * @return
+ * @return GType for GntWidget.
*/
GType gnt_widget_get_gtype(void);
/**
- *
- * @param widget
+ * Destroy a widget.
+ * @param widget The widget to destroy.
*/
void gnt_widget_destroy(GntWidget *widget);
/**
- *
- * @param widget
+ * Show a widget. This should only be used for toplevel widgets. For the rest
+ * of the widgets, use #gnt_widget_draw instead.
+ *
+ * @param widget The widget to show.
*/
void gnt_widget_show(GntWidget *widget);
/**
- *
- * @param widget
+ * Draw a widget.
+ * @param widget The widget to draw.
*/
void gnt_widget_draw(GntWidget *widget);
/**
- *
- * @param widget
- * @param x
- * @param y
- * @param width
- * @param height
+ * @internal
+ * Expose part of a widget.
*/
void gnt_widget_expose(GntWidget *widget, int x, int y, int width, int height);
/**
- *
- * @param widget
+ * Hide a widget.
+ * @param widget The widget to hide.
*/
void gnt_widget_hide(GntWidget *widget);
/**
- *
- * @param widget
- * @param x
- * @param y
+ * Get the position of a widget.
+ *
+ * @param widget The widget.
+ * @param x Location to store the x-coordinate of the widget.
+ * @param y Location to store the y-coordinate of the widget.
*/
void gnt_widget_get_position(GntWidget *widget, int *x, int *y);
/**
- *
- * @param widget
- * @param x
- * @param y
+ * Set the position of a widget.
+ * @param widget The widget to reposition.
+ * @param x The x-coordinate of the widget.
+ * @param y The x-coordinate of the widget.
*/
void gnt_widget_set_position(GntWidget *widget, int x, int y);
/**
- *
- * @param widget
+ * Request a widget to calculate its desired size.
+ * @param widget The widget.
*/
void gnt_widget_size_request(GntWidget *widget);
/**
- *
- * @param widget
- * @param width
- * @param height
+ * Get the size of a widget.
+ * @param widget The widget.
+ * @param width Location to store the width of the widget.
+ * @param height Location to store the height of the widget.
*/
void gnt_widget_get_size(GntWidget *widget, int *width, int *height);
/**
- *
- * @param widget
- * @param width
- * @param height
+ * Set the size of a widget.
*
- * @return
+ * @param widget The widget to resize.
+ * @param width The width of the widget.
+ * @param height The height of the widget.
+ *
+ * @return If the widget was resized to the new size.
*/
gboolean gnt_widget_set_size(GntWidget *widget, int width, int height);
/**
- *
- * @param widget
- * @param width
- * @param height
+ * Confirm a requested a size for a widget.
*
- * @return
+ * @param widget The widget.
+ * @param width The requested width.
+ * @param height The requested height.
+ *
+ * @return @c TRUE if the new size was confirmed, @c FALSE otherwise.
*/
gboolean gnt_widget_confirm_size(GntWidget *widget, int width, int height);
/**
- *
- * @param widget
- * @param keys
+ * Trigger the key-press callbacks for a widget.
*
- * @return
+ * @param widget The widget.
+ * @param keys The keypress on the widget.
+ *
+ * @return @c TRUE if the key-press was handled, @c FALSE otherwise.
*/
gboolean gnt_widget_key_pressed(GntWidget *widget, const char *keys);
/**
- *
- * @param widget
- * @param event
- * @param x
- * @param y
+ * Trigger the 'click' callback of a widget.
*
- * @return
+ * @param widget The widget.
+ * @param event The mouseevent.
+ * @param x The x-coordinate of the mouse.
+ * @param y The y-coordinate of the mouse.
+ *
+ * @return @c TRUE if the event was handled, @c FALSE otherwise.
*/
gboolean gnt_widget_clicked(GntWidget *widget, GntMouseEvent event, int x, int y);
/**
- *
- * @param widget
- * @param set
+ * Give or remove focus to a widget.
+ * @param widget The widget.
+ * @param set @c TRUE of focus should be given to the widget, @c FALSE if
+ * focus should be removed.
*
- * @return
+ * @return @c TRUE if the focus has been changed, @c FALSE otherwise.
*/
gboolean gnt_widget_set_focus(GntWidget *widget, gboolean set);
/**
- *
- * @param widget
+ * Activate a widget. This only applies to widgets that can be activated (eg. GntButton)
+ * @param widget The widget to activate.
*/
void gnt_widget_activate(GntWidget *widget);
/**
- *
- * @param widget
- * @param name
+ * Set the name of a widget.
+ * @param widget The widget.
+ * @param name A new name for the widget.
*/
void gnt_widget_set_name(GntWidget *widget, const char *name);
+/**
+ * Get the name of a widget.
+ * @param widget The widget.
+ * @return The name of the widget.
+ */
const char *gnt_widget_get_name(GntWidget *widget);
-/* Widget-subclasses should call this from the draw-callback.
- * Applications should just call gnt_widget_draw instead of this. */
/**
- *
- * @param widget
+ * @internal
+ * Use #gnt_widget_draw instead.
*/
void gnt_widget_queue_update(GntWidget *widget);
/**
- *
- * @param widget
- * @param set
+ * Set whether a widget can take focus or not.
+ *
+ * @param widget The widget.
+ * @param set @c TRUE if the widget can take focus.
*/
void gnt_widget_set_take_focus(GntWidget *widget, gboolean set);
/**
- *
- * @param widget
- * @param set
+ * Set the visibility of a widget.
+ *
+ * @param widget The widget.
+ * @param set Whether the widget is visible or not.
*/
void gnt_widget_set_visible(GntWidget *widget, gboolean set);
/**
- *
- * @param widget
+ * Check whether the widget has shadows.
*
- * @return
+ * @param widget The widget.
+ *
+ * @return @c TRUE if the widget has shadows. This checks both the user-setting
+ * and whether the widget can have shadows at all.
*/
gboolean gnt_widget_has_shadow(GntWidget *widget);
============================================================
--- finch/libgnt/gntwindow.h 333e0971fbfd4ab3532308372d163499a02f8d08
+++ finch/libgnt/gntwindow.h 655a09aba58380e2414c0e27c970884c94e9e076
@@ -77,25 +77,27 @@ GType gnt_window_get_gtype(void);
#define gnt_hwindow_new(homo) gnt_window_box_new(homo, FALSE)
/**
- *
+ * Create a new window.
*
- * @return
+ * @return The newly created window.
*/
GntWidget * gnt_window_new(void);
/**
- *
- * @param homo
- * @param vert
+ * Create a new window.
*
- * @return
+ * @param homo @c TRUE if the widgets inside the window should have the same dimensions.
+ * @param vert @c TRUE if the widgets inside the window should be stacked vertically.
+ *
+ * @return The newly created window.
*/
GntWidget * gnt_window_box_new(gboolean homo, gboolean vert);
/**
- *
- * @param window
- * @param menu
+ * Set the menu for a window.
+ *
+ * @param window The window.
+ * @param menu The menu for the window.
*/
void gnt_window_set_menu(GntWindow *window, GntMenu *menu);
============================================================
--- finch/libgnt/gntwm.c 96bbd1e5294684c8c9dd797b2d3409be768e1e99
+++ finch/libgnt/gntwm.c 39a95c4af37c0b57aa6df683d9345dab13749073
@@ -1675,7 +1675,7 @@ void gnt_wm_new_window(GntWM *wm, GntWid
{
while (widget->parent)
widget = widget->parent;
-
+
if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_INVISIBLE) ||
g_hash_table_lookup(wm->nodes, widget)) {
update_screen(wm);
============================================================
--- finch/libgnt/gntwm.h 0ab1e279541f0f76ce7a1dbde6bd2964184348f1
+++ finch/libgnt/gntwm.h 3b01184634b20d381c377f0c398bcb8117853028
@@ -113,7 +113,7 @@ struct _GntWM
* whether to give focus to a new window.
*/
gboolean event_stack;
-
+
GntKeyPressMode mode;
GHashTable *positions;
@@ -184,108 +184,149 @@ G_BEGIN_DECLS
G_BEGIN_DECLS
/**
- *
- *
- * @return
+ * @return GType for GntWM.
*/
GType gnt_wm_get_gtype(void);
+/**
+ * Add a workspace.
+ * @param wm The window-manager.
+ * @param ws The workspace to add.
+ */
void gnt_wm_add_workspace(GntWM *wm, GntWS *ws);
+/**
+ * Switch to a workspace.
+ * @param wm The window-manager.
+ * @param n Index of the workspace to switch to.
+ *
+ * @return @c TRUE if the switch was successful.
+ */
gboolean gnt_wm_switch_workspace(GntWM *wm, gint n);
+
+/**
+ * Switch to the previous workspace from the current one.
+ * @param wm The window-manager.
+ */
gboolean gnt_wm_switch_workspace_prev(GntWM *wm);
+
+/**
+ * Switch to the next workspace from the current one.
+ * @param wm The window-manager.
+ */
gboolean gnt_wm_switch_workspace_next(GntWM *wm);
+
+/**
+ * Move a window to a specific workspace.
+ * @param wm The window manager.
+ * @param neww The new workspace.
+ * @param widget The widget to move.
+ */
void gnt_wm_widget_move_workspace(GntWM *wm, GntWS *neww, GntWidget *widget);
+
+/**
+ * Set the list of workspaces .
+ * @param wm The window manager.
+ * @param workspaces The list of workspaces.
+ */
void gnt_wm_set_workspaces(GntWM *wm, GList *workspaces);
+
+/**
+ * Find the workspace that contains a specific widget.
+ * @param wm The window-manager.
+ * @param widget The widget to find.
+ * @return The workspace that has the widget.
+ */
GntWS *gnt_wm_widget_find_workspace(GntWM *wm, GntWidget *widget);
/**
- *
- * @param wm
- * @param widget
+ * Process a new window.
+ *
+ * @param wm The window-manager.
+ * @param widget The new window.
*/
void gnt_wm_new_window(GntWM *wm, GntWidget *widget);
/**
- *
- * @param wm
- * @param widget
+ * Decorate a window.
+ * @param wm The window-manager.
+ * @param widget The widget to decorate.
*/
void gnt_wm_window_decorate(GntWM *wm, GntWidget *widget);
/**
- *
- * @param wm
- * @param widget
+ * Close a window.
+ * @param wm The window-manager.
+ * @param widget The window to close.
*/
void gnt_wm_window_close(GntWM *wm, GntWidget *widget);
/**
- *
- * @param wm
- * @param string
+ * Process input.
*
- * @return
+ * @param wm The window-manager.
+ * @param string The input string to process.
+ *
+ * @return @c TRUE of the string was processed, @c FALSE otherwise.
*/
gboolean gnt_wm_process_input(GntWM *wm, const char *string);
/**
- *
- * @param wm
- * @param event
- * @param x
- * @param y
- * @param widget
+ * Process a click event.
+ * @param wm The window manager.
+ * @param event The mouse event.
+ * @param x The x-coordinate of the mouse.
+ * @param y The y-coordinate of the mouse.
+ * @param widget The widget under the mouse.
*
- * @return
+ * @return @c TRUE if the event was handled, @c FALSE otherwise.
*/
gboolean gnt_wm_process_click(GntWM *wm, GntMouseEvent event, int x, int y, GntWidget *widget);
/**
- *
- * @param wm
- * @param widget
- * @param width
- * @param height
+ * Resize a window.
+ * @param wm The window manager.
+ * @param widget The window to resize.
+ * @param width The desired width of the window.
+ * @param height The desired height of the window.
*/
void gnt_wm_resize_window(GntWM *wm, GntWidget *widget, int width, int height);
/**
- *
- * @param wm
- * @param widget
- * @param x
- * @param y
+ * Move a window.
+ * @param wm The window manager.
+ * @param widget The window to move.
+ * @param x The desired x-coordinate of the window.
+ * @param y The desired y-coordinate of the window.
*/
void gnt_wm_move_window(GntWM *wm, GntWidget *widget, int x, int y);
/**
- *
- * @param wm
- * @param widget
+ * Update a window.
+ * @param wm The window-manager.
+ * @param widget The window to update.
*/
void gnt_wm_update_window(GntWM *wm, GntWidget *widget);
/**
- *
- * @param wm
- * @param widget
+ * Raise a window.
+ * @param wm The window-manager.
+ * @param widget The window to raise.
*/
void gnt_wm_raise_window(GntWM *wm, GntWidget *widget);
/**
- *
- * @param wm
- * @param set
+ * @internal
*/
void gnt_wm_set_event_stack(GntWM *wm, gboolean set);
+/**
+ * @internal
+ */
void gnt_wm_copy_win(GntWidget *widget, GntNode *node);
/**
- *
- *
- * @return
+ * @return The idle time of the user.
*/
time_t gnt_wm_get_idle_time(void);
============================================================
--- libpurple/tests/test_util.c c05c0df6789e2520a3d145080d2eebf76afec7c6
+++ libpurple/tests/test_util.c ea544aa2e1e78081673ca49960c37b54ff558b08
@@ -81,6 +81,18 @@ END_TEST
}
END_TEST
+START_TEST(test_markup_html_to_xhtml)
+{
+ gchar *xhtml = NULL;
+ gchar *plaintext = NULL;
+ purple_markup_html_to_xhtml("<a>", &xhtml, &plaintext);
+ fail_unless(strcmp("<a href=''></a>", xhtml) == 0, NULL);
+ g_free(xhtml);
+ fail_unless(strcmp("", plaintext) == 0, NULL);
+ g_free(plaintext);
+}
+END_TEST
+
Suite *
util_suite(void)
{
@@ -113,5 +125,9 @@ util_suite(void)
tcase_add_test(tc, test_util_str_to_time);
suite_add_tcase(s, tc);
+ tc = tcase_create("Markup");
+ tcase_add_test(tc, test_markup_html_to_xhtml);
+ suite_add_tcase(s, tc);
+
return s;
}
============================================================
--- pidgin/gtkprefs.c 0e79a16328731490355a032056c4bcc592ecd4c3
+++ pidgin/gtkprefs.c e3f0f5b92886a4011a67faa229976fc9e42214ef
@@ -895,8 +895,8 @@ interface_page()
label = pidgin_prefs_dropdown(vbox, _("_Show system tray icon:"), PURPLE_PREF_STRING,
PIDGIN_PREFS_ROOT "/docklet/show",
_("Always"), "always",
+ _("On unread messages"), "pending",
_("Never"), "never",
- _("On unread messages"), "pending",
NULL);
gtk_size_group_add_widget(sg, label);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
============================================================
--- pidgin/gtkstatusbox.c aba6feec768a3d78df9c9f2f83f6f141ce9a9175
+++ pidgin/gtkstatusbox.c 8bec40c0ca82e78949692e3188e47e3453a976df
@@ -1069,8 +1069,8 @@ pidgin_status_box_regenerate(PidginStatu
add_popular_statuses(status_box);
pidgin_status_box_add_separator(PIDGIN_STATUS_BOX(status_box));
- pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_CUSTOM, NULL, _("New..."), NULL, NULL);
- pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_SAVED, NULL, _("Saved..."), NULL, NULL);
+ pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_CUSTOM, NULL, _("New status..."), NULL, NULL);
+ pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_SAVED, NULL, _("Saved statuses..."), NULL, NULL);
if (pixbuf) g_object_unref(G_OBJECT(pixbuf));
status_menu_refresh_iter(status_box);
More information about the Commits
mailing list