/soc/2013/ankitkv/gobjectification: 301131c1844c: Merged default...

[Ankit Vani]

Changeset: 301131c1844c47f0e51e30a12b9e0ce5e9a5a14a
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-02-28 14:31 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/301131c1844c

Description:

Merged default branch

diffstat:

 ChangeLog.API        |  1 +
 pidgin/gtkconv.c     |  3 +++
 pidgin/gtkinternal.h |  9 +++++++++
 pidgin/pidgin.c      |  6 +++++-
 4 files changed, 18 insertions(+), 1 deletions(-)

diffs (83 lines):

diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -571,6 +571,7 @@ version 3.0.0 (??/??/????):
 		* smiley_list renamed to PidginSmileyList
 		* smiley_parse_markup renamed to pidgin_smiley_parse_markup
 		* smiley_theme renamed to PidginSmileyTheme
+		* PidginWindow renamed to PidginConvWindow
 
 		Removed:
 		* GtkIMHtml.clipboard_html_string
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -5665,6 +5665,7 @@ setup_common_pane(PidginConversation *gt
 	/* Setup the webkit widget */
 	frame = pidgin_create_webview(FALSE, &gtkconv->webview, &webview_sw);
 	g_object_set(G_OBJECT(gtkconv->webview), "expand", TRUE, NULL);
+	_pidgin_widget_set_accessible_name(frame, "Conversation Pane");
 
 	load_conv_theme(gtkconv);
 
@@ -5708,6 +5709,7 @@ setup_common_pane(PidginConversation *gt
 	gtk_box_pack_start(GTK_BOX(gtkconv->lower_hbox), frame, TRUE, TRUE, 0);
 	gtk_widget_show(frame);
 
+	_pidgin_widget_set_accessible_name(frame, "Message Input");
 	gtk_widget_set_name(gtkconv->entry, "pidgin_conv_entry");
 	pidgin_webview_set_protocol_name(PIDGIN_WEBVIEW(gtkconv->entry),
 			purple_account_get_protocol_name(purple_conversation_get_account(conv)));
@@ -10232,6 +10234,7 @@ pidgin_conv_window_new()
 
 	/* Create the window. */
 	win->window = pidgin_create_window(NULL, 0, "conversation", TRUE);
+	/*_pidgin_widget_set_accessible_name(win->window, "Conversations");*/
 	if (!gtk_get_current_event_state(&state))
 		gtk_window_set_focus_on_map(GTK_WINDOW(win->window), FALSE);
 
diff --git a/pidgin/gtkinternal.h b/pidgin/gtkinternal.h
--- a/pidgin/gtkinternal.h
+++ b/pidgin/gtkinternal.h
@@ -30,9 +30,18 @@
 
 G_BEGIN_DECLS
 
+static inline void
+_pidgin_widget_set_accessible_name(GtkWidget *widget, const gchar *name);
+
 PurpleStoredImage *
 _pidgin_e2ee_stock_icon_get(const gchar *stock_name);
 
 G_END_DECLS
 
+static inline void
+_pidgin_widget_set_accessible_name(GtkWidget *widget, const gchar *name)
+{
+	atk_object_set_name(gtk_widget_get_accessible(widget), name);
+}
+
 #endif /* _PIDGIN_INTERNAL_H_ */
diff --git a/pidgin/pidgin.c b/pidgin/pidgin.c
--- a/pidgin/pidgin.c
+++ b/pidgin/pidgin.c
@@ -32,6 +32,8 @@ int __cdecl pidgin_main(HINSTANCE hint, 
 int main(int argc, char *argv[])
 #endif
 {
+	const gchar *test_prgname;
+
 #if !GLIB_CHECK_VERSION(2, 32, 0)
 	/* GLib threading system is automaticaly initialized since 2.32.
 	 * For earlier versions, it have to be initialized before calling any
@@ -40,7 +42,9 @@ int main(int argc, char *argv[])
 	g_thread_init(NULL);
 #endif
 
-	g_set_prgname("Pidgin");
+	/* This is for UI testing purposes only, don't use it! */
+	test_prgname = g_getenv("PIDGIN_TEST_PRGNAME");
+	g_set_prgname(test_prgname ? test_prgname : "Pidgin");
 	g_set_application_name(PIDGIN_NAME);
 
 #ifdef _WIN32