pidgin/gtkconv.c

changeset 17689
a93d038c9521
parent 17649
b3b0b027605c
child 17715
9536709ee696
equal deleted inserted replaced
17688:810f2c7f3835 17689:a93d038c9521
1854 switch (event->keyval) { 1854 switch (event->keyval) {
1855 case GDK_Up: 1855 case GDK_Up:
1856 if (!gtkconv->send_history) 1856 if (!gtkconv->send_history)
1857 break; 1857 break;
1858 1858
1859 if (gtkconv->entry != entry)
1860 break;
1861
1859 if (!gtkconv->send_history->prev) { 1862 if (!gtkconv->send_history->prev) {
1860 GtkTextIter start, end; 1863 GtkTextIter start, end;
1861 1864
1862 g_free(gtkconv->send_history->data); 1865 g_free(gtkconv->send_history->data);
1863 1866
1900 return TRUE; 1903 return TRUE;
1901 break; 1904 break;
1902 1905
1903 case GDK_Down: 1906 case GDK_Down:
1904 if (!gtkconv->send_history) 1907 if (!gtkconv->send_history)
1908 break;
1909
1910 if (gtkconv->entry != entry)
1905 break; 1911 break;
1906 1912
1907 if (gtkconv->send_history->prev && gtkconv->send_history->prev->data) { 1913 if (gtkconv->send_history->prev && gtkconv->send_history->prev->data) {
1908 GObject *object; 1914 GObject *object;
1909 GtkTextIter iter; 1915 GtkTextIter iter;
2005 else 2011 else
2006 { 2012 {
2007 switch (event->keyval) 2013 switch (event->keyval)
2008 { 2014 {
2009 case GDK_Tab: 2015 case GDK_Tab:
2016 if (gtkconv->entry != entry)
2017 break;
2010 return tab_complete(conv); 2018 return tab_complete(conv);
2011 break; 2019 break;
2012 2020
2013 case GDK_Page_Up: 2021 case GDK_Page_Up:
2014 gtk_imhtml_page_up(GTK_IMHTML(gtkconv->imhtml)); 2022 gtk_imhtml_page_up(GTK_IMHTML(gtkconv->imhtml));
4252 G_CALLBACK(topic_callback), gtkconv); 4260 G_CALLBACK(topic_callback), gtkconv);
4253 } 4261 }
4254 4262
4255 gtk_box_pack_start(GTK_BOX(hbox), gtkchat->topic_text, TRUE, TRUE, 0); 4263 gtk_box_pack_start(GTK_BOX(hbox), gtkchat->topic_text, TRUE, TRUE, 0);
4256 gtk_widget_show(gtkchat->topic_text); 4264 gtk_widget_show(gtkchat->topic_text);
4265 g_signal_connect(G_OBJECT(gtkchat->topic_text), "key_press_event",
4266 G_CALLBACK(entry_key_press_cb), gtkconv);
4257 } 4267 }
4258 4268
4259 /* Setup the horizontal pane. */ 4269 /* Setup the horizontal pane. */
4260 hpaned = gtk_hpaned_new(); 4270 hpaned = gtk_hpaned_new();
4261 gtk_box_pack_start(GTK_BOX(vbox), hpaned, TRUE, TRUE, 0); 4271 gtk_box_pack_start(GTK_BOX(vbox), hpaned, TRUE, TRUE, 0);

mercurial