/pidgin/main: 1e26b193b3a5: Comment out some stuff that doesn't ...

Elliott Sales de Andrade qulogic at pidgin.im
Tue Aug 14 04:03:27 EDT 2012


Changeset: 1e26b193b3a508efd745051c4096fb8b400e9ce8
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2012-08-14 01:47 -0400
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/1e26b193b3a5

Description:

Comment out some stuff that doesn't work yet.

diffstat:

 pidgin/gtkconv.c |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (47 lines):

diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -538,7 +538,6 @@ check_for_and_do_command(PurpleConversat
 	PidginConversation *gtkconv;
 	char *cmd;
 	const char *prefix;
-	GtkTextIter start;
 	gboolean retval = FALSE;
 
 	gtkconv = PIDGIN_CONVERSATION(conv);
@@ -1622,12 +1621,17 @@ menu_chat_add_remove_cb(GtkWidget *w, Pi
 static GtkTextMark *
 get_mark_for_user(PidginConversation *gtkconv, const char *who)
 {
+#if 0
+	/* TODO WebKit */
 	GtkTextBuffer *buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->webview));
 	char *tmp = g_strconcat("user:", who, NULL);
 	GtkTextMark *mark = gtk_text_buffer_get_mark(buf, tmp);
 
 	g_free(tmp);
 	return mark;
+#else
+	return NULL;
+#endif
 }
 
 static void
@@ -4757,6 +4761,8 @@ entry_popup_menu_cb(GtkWebView *webview,
 static gboolean
 resize_webview_cb(PidginConversation *gtkconv)
 {
+#if 0
+	/* TODO WebKit: entry sizing */
 	GtkTextBuffer *buffer;
 	GtkTextIter iter;
 	int lines;
@@ -4820,6 +4826,8 @@ resize_webview_cb(PidginConversation *gt
 
 	gtk_widget_set_size_request(gtkconv->lower_hbox, -1,
 		diff + lower_hbox_allocation.height);
+#endif
+	gtk_widget_set_size_request(gtkconv->lower_hbox, -1, -1);
 
 	return FALSE;
 }



More information about the Commits mailing list