--- a/pidgin/gtkconvwin.h Wed Feb 26 04:06:48 2014 +0530 +++ b/pidgin/gtkconvwin.h Wed Feb 26 04:37:11 2014 +0530 @@ -28,17 +28,17 @@ * @title: Conversation Window API */ -#define PIDGIN_TYPE_WINDOW (pidgin_window_get_type()) +#define PIDGIN_TYPE_CONV_WINDOW (pidgin_conv_window_get_type()) -typedef struct _PidginWindowMenu PidginWindowMenu; -typedef struct _PidginWindow PidginWindow; +typedef struct _PidginConvWindowMenu PidginConvWindowMenu; +typedef struct _PidginConvWindow PidginConvWindow; /************************************************************************** * Structures **************************************************************************/ -struct _PidginWindowMenu +struct _PidginConvWindowMenu { GtkUIManager *ui; GtkWidget *menubar; @@ -77,7 +77,7 @@ }; /** - * PidginWindow: + * PidginConvWindow: * @window: The window. * @notebook: The notebook of conversations. * @notebook_menu: The menu on the notebook. @@ -86,7 +86,7 @@ * A GTK+ representation of a graphical window containing one or more * conversations. */ -struct _PidginWindow +struct _PidginConvWindow { /*< private >*/ gint box_count; @@ -98,7 +98,7 @@ PidginConversation *clicked_tab; GList *gtkconvs; - PidginWindowMenu *menu; + PidginConvWindowMenu *menu; /* Tab dragging stuff. */ gboolean in_drag; @@ -119,29 +119,30 @@ **************************************************************************/ /** - * pidgin_window_get_type: + * pidgin_conv_window_get_type: * - * Returns: The #GType for the #PidginWindow boxed structure. + * Returns: The #GType for the #PidginConvWindow boxed structure. */ -GType pidgin_window_get_type(void); +GType pidgin_conv_window_get_type(void); /** * pidgin_conv_window_new: * - * Returns: A new #PidginWindow. + * Returns: A new #PidginConvWindow. */ -PidginWindow * pidgin_conv_window_new(void); +PidginConvWindow * pidgin_conv_window_new(void); /** * pidgin_conv_window_destroy: * @win: The conversation window to destroy */ -void pidgin_conv_window_destroy(PidginWindow *win); +void pidgin_conv_window_destroy(PidginConvWindow *win); /** * pidgin_conv_windows_get_list: * - * Returns: (transfer none) (element-type Pidgin.Window): The list of windows. + * Returns: (transfer none) (element-type Pidgin.ConvWindow): The list of + * windows. */ GList *pidgin_conv_windows_get_list(void); @@ -149,40 +150,40 @@ * pidgin_conv_window_show: * @win: The conversation window to show */ -void pidgin_conv_window_show(PidginWindow *win); +void pidgin_conv_window_show(PidginConvWindow *win); /** * pidgin_conv_window_hide: * @win: The conversation window to hide */ -void pidgin_conv_window_hide(PidginWindow *win); +void pidgin_conv_window_hide(PidginConvWindow *win); /** * pidgin_conv_window_raise: * @win: The conversation window to raise */ -void pidgin_conv_window_raise(PidginWindow *win); +void pidgin_conv_window_raise(PidginConvWindow *win); /** * pidgin_conv_window_switch_gtkconv: * @win: The conversation window * @gtkconv: The pidgin conversation to switch to */ -void pidgin_conv_window_switch_gtkconv(PidginWindow *win, PidginConversation *gtkconv); +void pidgin_conv_window_switch_gtkconv(PidginConvWindow *win, PidginConversation *gtkconv); /** * pidgin_conv_window_add_gtkconv: * @win: The conversation window * @gtkconv: The pidgin conversation to add */ -void pidgin_conv_window_add_gtkconv(PidginWindow *win, PidginConversation *gtkconv); +void pidgin_conv_window_add_gtkconv(PidginConvWindow *win, PidginConversation *gtkconv); /** * pidgin_conv_window_remove_gtkconv: * @win: The conversation window * @gtkconv: The pidgin conversation to remove */ -void pidgin_conv_window_remove_gtkconv(PidginWindow *win, PidginConversation *gtkconv); +void pidgin_conv_window_remove_gtkconv(PidginConvWindow *win, PidginConversation *gtkconv); /** * pidgin_conv_window_get_gtkconv_at_index: @@ -191,7 +192,7 @@ * * Returns: The conversation in @win at @index */ -PidginConversation *pidgin_conv_window_get_gtkconv_at_index(const PidginWindow *win, int index); +PidginConversation *pidgin_conv_window_get_gtkconv_at_index(const PidginConvWindow *win, int index); /** * pidgin_conv_window_get_active_gtkconv: @@ -199,7 +200,7 @@ * * Returns: The active #PidginConversation in @win. */ -PidginConversation *pidgin_conv_window_get_active_gtkconv(const PidginWindow *win); +PidginConversation *pidgin_conv_window_get_active_gtkconv(const PidginConvWindow *win); /** * pidgin_conv_window_get_active_conversation: @@ -207,7 +208,7 @@ * * Returns: The active #PurpleConversation in @win. */ -PurpleConversation *pidgin_conv_window_get_active_conversation(const PidginWindow *win); +PurpleConversation *pidgin_conv_window_get_active_conversation(const PidginConvWindow *win); /** * pidgin_conv_window_is_active_conversation: @@ -223,15 +224,15 @@ * * Returns: %TRUE if @win has focus, %FALSE otherwise. */ -gboolean pidgin_conv_window_has_focus(PidginWindow *win); +gboolean pidgin_conv_window_has_focus(PidginConvWindow *win); /** * pidgin_conv_window_get_at_event: * @event: The event * - * Returns: The #PidginWindow on which @event occured. + * Returns: The #PidginConvWindow on which @event occured. */ -PidginWindow *pidgin_conv_window_get_at_event(GdkEvent *event); +PidginConvWindow *pidgin_conv_window_get_at_event(GdkEvent *event); /** * pidgin_conv_window_get_gtkconvs: @@ -240,7 +241,7 @@ * Returns: (transfer none) (element-type Pidgin.Conversation): A list of * #PidginConversation's in @win. */ -GList *pidgin_conv_window_get_gtkconvs(PidginWindow *win); +GList *pidgin_conv_window_get_gtkconvs(PidginConvWindow *win); /** * pidgin_conv_window_get_gtkconv_count: @@ -248,35 +249,35 @@ * * Returns: The number of conversations in @win */ -guint pidgin_conv_window_get_gtkconv_count(PidginWindow *win); +guint pidgin_conv_window_get_gtkconv_count(PidginConvWindow *win); /** * pidgin_conv_window_first_im: * * Returns: The window which has the first IM, %NULL if no IM is found. */ -PidginWindow *pidgin_conv_window_first_im(void); +PidginConvWindow *pidgin_conv_window_first_im(void); /** * pidgin_conv_window_last_im: * * Returns: The window which has the last IM, %NULL if no IM is found. */ -PidginWindow *pidgin_conv_window_last_im(void); +PidginConvWindow *pidgin_conv_window_last_im(void); /** * pidgin_conv_window_first_chat: * * Returns: The window which has the first chat, %NULL if no chat is found. */ -PidginWindow *pidgin_conv_window_first_chat(void); +PidginConvWindow *pidgin_conv_window_first_chat(void); /** * pidgin_conv_window_last_chat: * * Returns: The window which has the last chat, %NULL if no chat is found. */ -PidginWindow *pidgin_conv_window_last_chat(void); +PidginConvWindow *pidgin_conv_window_last_chat(void); /************************************************************************** * GTK+ Conversation Placement API