Mercurial > pidgin3 / changeset

--- a/pidgin/gtkconv.c	Wed Jul 01 02:21:14 2020 -0500
+++ b/pidgin/gtkconv.c	Sun Jul 05 04:29:48 2020 -0500
@@ -456,7 +456,7 @@
 check_for_and_do_command(PurpleConversation *conv)
 {
 	PidginConversation *gtkconv;
-	GtkWidget *view = NULL;
+	GtkWidget *input = NULL;
 	GtkTextBuffer *buffer = NULL;
 	gchar *cmd;
 	const gchar *prefix;
@@ -465,8 +465,8 @@
 	gtkconv = PIDGIN_CONVERSATION(conv);
 	prefix = pidgin_get_cmd_prefix();
 
-	view = talkatu_editor_get_view(TALKATU_EDITOR(gtkconv->editor));
-	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(view));
+	input = talkatu_editor_get_input(TALKATU_EDITOR(gtkconv->editor));
+	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(input));
 
 	cmd = talkatu_buffer_get_plain_text(TALKATU_BUFFER(buffer));
 
@@ -1799,7 +1799,7 @@
 static gboolean
 refocus_entry_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-	GtkWidget *view = NULL;
+	GtkWidget *input = NULL;
 	PidginConversation *gtkconv = data;
 
 	/* If we have a valid key for the conversation display, then exit */
@@ -1831,9 +1831,9 @@
 		return FALSE;
 	}
 
-	view = talkatu_editor_get_view(TALKATU_EDITOR(gtkconv->editor));
-	gtk_widget_grab_focus(view);
-	gtk_widget_event(view, (GdkEvent *)event);
+	input = talkatu_editor_get_input(TALKATU_EDITOR(gtkconv->editor));
+	gtk_widget_grab_focus(input);
+	gtk_widget_event(input, (GdkEvent *)event);
 
 	return TRUE;
 }
@@ -4116,7 +4116,7 @@
 static GtkWidget *
 setup_common_pane(PidginConversation *gtkconv)
 {
-	GtkWidget *vbox, *sw, *event_box, *view;
+	GtkWidget *vbox, *sw, *event_box, *input;
 	GtkCellRenderer *rend;
 	GtkTreePath *path;
 	PurpleConversation *conv = gtkconv->active_conv;
@@ -4262,11 +4262,11 @@
 	talkatu_editor_set_buffer(TALKATU_EDITOR(gtkconv->editor), talkatu_html_buffer_new());
 	gtk_box_pack_start(GTK_BOX(gtkconv->lower_hbox), gtkconv->editor, TRUE, TRUE, 0);
 
-	view = talkatu_editor_get_view(TALKATU_EDITOR(gtkconv->editor));
-	gtk_widget_set_name(view, "pidgin_conv_entry");
-	talkatu_view_set_send_binding(TALKATU_VIEW(view), TALKATU_VIEW_SEND_BINDING_RETURN | TALKATU_VIEW_SEND_BINDING_KP_ENTER);
+	input = talkatu_editor_get_input(TALKATU_EDITOR(gtkconv->editor));
+	gtk_widget_set_name(input, "pidgin_conv_entry");
+	talkatu_input_set_send_binding(TALKATU_INPUT(input), TALKATU_INPUT_SEND_BINDING_RETURN | TALKATU_INPUT_SEND_BINDING_KP_ENTER);
 	g_signal_connect(
-		G_OBJECT(view),
+		G_OBJECT(input),
 		"send-message",
 		G_CALLBACK(send_cb),
 		gtkconv

--- a/pidgin/gtkpluginpref.c	Wed Jul 01 02:21:14 2020 -0500
+++ b/pidgin/gtkpluginpref.c	Sun Jul 05 04:29:48 2020 -0500
@@ -92,7 +92,7 @@
 				GtkWidget *hbox;
 				GtkWidget *spacer;
 				GtkWidget *editor;
-				GtkWidget *view;
+				GtkWidget *input;
 				GtkTextBuffer *buffer;
 
 				box = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
@@ -117,7 +117,7 @@
 				gtk_widget_show(spacer);
 
 				editor = talkatu_editor_new();
-				view = talkatu_editor_get_view(TALKATU_EDITOR(editor));
+				input = talkatu_editor_get_input(TALKATU_EDITOR(editor));
 
 				if ((format & PURPLE_STRING_FORMAT_TYPE_HTML) != 0) {
 					buffer = talkatu_html_buffer_new();
@@ -125,7 +125,7 @@
 					buffer = talkatu_buffer_new(NULL);
 				}
 
-				gtk_text_view_set_buffer(GTK_TEXT_VIEW(view), buffer);
+				gtk_text_view_set_buffer(GTK_TEXT_VIEW(input), buffer);
 
 				if (format & PURPLE_STRING_FORMAT_TYPE_MULTILINE) {
 					gchar *tmp = purple_strreplace(purple_prefs_get_string(pref_name), "\n", "<br>");
@@ -135,7 +135,7 @@
 					talkatu_markup_set_html(TALKATU_BUFFER(buffer), purple_prefs_get_string(pref_name), -1);
 				}
 
-				gtk_label_set_mnemonic_widget(GTK_LABEL(gtk_label), view);
+				gtk_label_set_mnemonic_widget(GTK_LABEL(gtk_label), input);
 				gtk_widget_show_all(editor);
 				g_object_set_data(G_OBJECT(buffer), "pref-key", (gpointer)pref_name);
 				g_signal_connect(G_OBJECT(buffer), "changed",

--- a/pidgin/gtkpounce.c	Wed Jul 01 02:21:14 2020 -0500
+++ b/pidgin/gtkpounce.c	Sun Jul 05 04:29:48 2020 -0500
@@ -707,7 +707,7 @@
 		= gtk_check_button_new_with_mnemonic(_("P_lay a sound"));
 
 	editor = talkatu_editor_new();
-	dialog->send_msg_entry = talkatu_editor_get_view(TALKATU_EDITOR(editor));
+	dialog->send_msg_entry = talkatu_editor_get_input(TALKATU_EDITOR(editor));
 	reset_send_msg_entry(dialog, NULL);
 
 	dialog->exec_cmd_entry    = gtk_entry_new();

--- a/pidgin/gtkrequest.c	Wed Jul 01 02:21:14 2020 -0500
+++ b/pidgin/gtkrequest.c	Sun Jul 05 04:29:48 2020 -0500
@@ -568,11 +568,11 @@
 
 	if(multiline || purple_strequal(data->u.input.hint, "html")) {
 		GtkWidget *editor = talkatu_editor_new();
-		GtkWidget *view = talkatu_editor_get_view(TALKATU_EDITOR(editor));
+		GtkWidget *input = talkatu_editor_get_input(TALKATU_EDITOR(editor));
 		GtkTextBuffer *buffer = NULL;
 
-		gtk_widget_set_size_request(view, 320, 130);
-		gtk_widget_set_name(view, "pidgin_request_view");
+		gtk_widget_set_size_request(input, 320, 130);
+		gtk_widget_set_name(input, "pidgin_request_input");
 		gtk_box_pack_start(GTK_BOX(vbox), editor, TRUE, TRUE, 0);
 		gtk_widget_show(editor);
 
@@ -590,9 +590,9 @@
 			}
 		}
 
-		gtk_text_view_set_buffer(GTK_TEXT_VIEW(view), buffer);
-
-		data->u.input.entry = view;
+		gtk_text_view_set_buffer(GTK_TEXT_VIEW(input), buffer);
+
+		data->u.input.entry = input;
 	} else {
 		GtkWidget *entry = gtk_entry_new();
 

--- a/pidgin/gtksavedstatuses.c	Wed Jul 01 02:21:14 2020 -0500
+++ b/pidgin/gtksavedstatuses.c	Sun Jul 05 04:29:48 2020 -0500
@@ -1135,7 +1135,7 @@
 	/* Status message */
 	editor = talkatu_editor_new();
 
-	dialog->message_view = talkatu_editor_get_view(TALKATU_EDITOR(editor));
+	dialog->message_view = talkatu_editor_get_input(TALKATU_EDITOR(editor));
 	hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Message:"), sg, editor, TRUE, NULL);
 
 	dialog->message_buffer = talkatu_html_buffer_new();
@@ -1459,7 +1459,7 @@
 	editor = talkatu_editor_new();
 	gtk_box_pack_start(GTK_BOX(hbox), editor, TRUE, TRUE, 0);
 
-	dialog->message_view = talkatu_editor_get_view(TALKATU_EDITOR(editor));
+	dialog->message_view = talkatu_editor_get_input(TALKATU_EDITOR(editor));
 	dialog->message_buffer = talkatu_html_buffer_new();
 	gtk_text_view_set_buffer(GTK_TEXT_VIEW(dialog->message_view), dialog->message_buffer);
 

--- a/pidgin/gtkstatusbox.c	Wed Jul 01 02:21:14 2020 -0500
+++ b/pidgin/gtkstatusbox.c	Sun Jul 05 04:29:48 2020 -0500
@@ -838,7 +838,7 @@
 		 * Suppress the "changed" signal because the status
 		 * was changed programmatically.
 		 */
-		gtk_widget_set_sensitive(GTK_WIDGET(status_box->view), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(status_box->input), FALSE);
 
 		talkatu_buffer_clear(TALKATU_BUFFER(status_box->buffer));
 
@@ -855,7 +855,7 @@
 			talkatu_markup_set_html(TALKATU_BUFFER(status_box->buffer), message, -1);
 		}
 
-		gtk_widget_set_sensitive(GTK_WIDGET(status_box->view), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(status_box->input), TRUE);
 		update_size(status_box);
 	}
 
@@ -1707,9 +1707,9 @@
 
 	status_box->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, FALSE);
 	status_box->editor = talkatu_editor_new();
-	status_box->view = talkatu_editor_get_view(TALKATU_EDITOR(status_box->editor));
+	status_box->input = talkatu_editor_get_input(TALKATU_EDITOR(status_box->editor));
 	status_box->buffer = talkatu_html_buffer_new();
-	gtk_text_view_set_buffer(GTK_TEXT_VIEW(status_box->view), status_box->buffer);
+	gtk_text_view_set_buffer(GTK_TEXT_VIEW(status_box->input), status_box->buffer);
 
 	g_signal_connect(G_OBJECT(status_box->buffer), "changed",
 	                 G_CALLBACK(pidgin_status_box_buffer_changed_cb),
@@ -1719,7 +1719,7 @@
 	                 G_CALLBACK(toggle_key_press_cb), status_box);
 	g_signal_connect(G_OBJECT(status_box->toggle_button), "button-press-event",
 	                 G_CALLBACK(toggled_cb), status_box);
-	g_signal_connect(G_OBJECT(status_box->view), "key-press-event",
+	g_signal_connect(G_OBJECT(status_box->input), "key-press-event",
 	                 G_CALLBACK(editor_remove_focus), status_box);
 
 	gtk_widget_set_parent(status_box->vbox, GTK_WIDGET(status_box));
@@ -2491,7 +2491,7 @@
 
 			gtk_widget_show_all(status_box->vbox);
 			status_box->typing = g_timeout_add_seconds(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box);
-			gtk_widget_grab_focus(status_box->view);
+			gtk_widget_grab_focus(status_box->input);
 
 			gtk_text_buffer_get_start_iter(status_box->buffer, &start);
 			gtk_text_buffer_get_end_iter(status_box->buffer, &end);

--- a/pidgin/gtkstatusbox.h	Wed Jul 01 02:21:14 2020 -0500
+++ b/pidgin/gtkstatusbox.h	Sun Jul 05 04:29:48 2020 -0500
@@ -90,7 +90,7 @@
 	GtkWidget *vbox;
 	gboolean editor_visible;
 	GtkWidget *editor;
-	GtkWidget *view;
+	GtkWidget *input;
 	GtkTextBuffer *buffer;
 
 	PurpleImage *buddy_icon_img;

--- a/pidgin/pidgintalkatu.c	Wed Jul 01 02:21:14 2020 -0500
+++ b/pidgin/pidgintalkatu.c	Sun Jul 05 04:29:48 2020 -0500
@@ -24,16 +24,15 @@
 
 GtkWidget *
 pidgin_talkatu_editor_new_for_connection(PurpleConnection *pc) {
-	GtkWidget *editor = NULL;
-	GtkWidget *view = NULL;
+	GtkWidget *editor = NULL, *input = NULL;
 
 	g_return_val_if_fail(pc != NULL, NULL);
 
 	editor = talkatu_editor_new();
-	view = talkatu_editor_get_view(TALKATU_EDITOR(editor));
+	input = talkatu_editor_get_input(TALKATU_EDITOR(editor));
 
 	gtk_text_view_set_buffer(
-		GTK_TEXT_VIEW(view),
+		GTK_TEXT_VIEW(input),
 		pidgin_talkatu_buffer_new_for_connection(pc)
 	);
 
@@ -58,4 +57,4 @@
 	}
 
 	return buffer;
-}
\ No newline at end of file
+}