Mercurial > pidgin.yaz
comparison pidgin/gtkconv.c @ 17285:b7fa0e44d723
merge of '82aa02e0b2bd8284accf4fd32088facc9e4d033d'
and 'a1c04042b2aa9af25eb7fd9dd61735303e6d11a0'
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Thu, 24 May 2007 21:47:33 +0000 |
parents | 319bcb73eb4e 3cc729673b62 |
children | 9c4bd2458677 |
comparison
equal
deleted
inserted
replaced
17275:319bcb73eb4e | 17285:b7fa0e44d723 |
---|---|
4199 gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(imhtml_sw), | 4199 gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(imhtml_sw), |
4200 &imhtml_sw_hscroll, NULL); | 4200 &imhtml_sw_hscroll, NULL); |
4201 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(imhtml_sw), | 4201 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(imhtml_sw), |
4202 imhtml_sw_hscroll, GTK_POLICY_ALWAYS); | 4202 imhtml_sw_hscroll, GTK_POLICY_ALWAYS); |
4203 | 4203 |
4204 gtk_widget_set_size_request(gtkconv->imhtml, | |
4205 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/default_width"), | |
4206 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/default_height")); | |
4207 g_signal_connect(G_OBJECT(gtkconv->imhtml), "size-allocate", | 4204 g_signal_connect(G_OBJECT(gtkconv->imhtml), "size-allocate", |
4208 G_CALLBACK(size_allocate_cb), gtkconv); | 4205 G_CALLBACK(size_allocate_cb), gtkconv); |
4209 | 4206 |
4210 g_signal_connect_after(G_OBJECT(gtkconv->imhtml), "button_press_event", | 4207 g_signal_connect_after(G_OBJECT(gtkconv->imhtml), "button_press_event", |
4211 G_CALLBACK(entry_stop_rclick_cb), NULL); | 4208 G_CALLBACK(entry_stop_rclick_cb), NULL); |
4378 gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(imhtml_sw), | 4375 gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(imhtml_sw), |
4379 &imhtml_sw_hscroll, NULL); | 4376 &imhtml_sw_hscroll, NULL); |
4380 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(imhtml_sw), | 4377 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(imhtml_sw), |
4381 imhtml_sw_hscroll, GTK_POLICY_ALWAYS); | 4378 imhtml_sw_hscroll, GTK_POLICY_ALWAYS); |
4382 | 4379 |
4383 gtk_widget_set_size_request(gtkconv->imhtml, | |
4384 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_width"), | |
4385 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_height")); | |
4386 g_signal_connect(G_OBJECT(gtkconv->imhtml), "size-allocate", | 4380 g_signal_connect(G_OBJECT(gtkconv->imhtml), "size-allocate", |
4387 G_CALLBACK(size_allocate_cb), gtkconv); | 4381 G_CALLBACK(size_allocate_cb), gtkconv); |
4388 | 4382 |
4389 g_signal_connect_after(G_OBJECT(gtkconv->imhtml), "button_press_event", | 4383 g_signal_connect_after(G_OBJECT(gtkconv->imhtml), "button_press_event", |
4390 G_CALLBACK(entry_stop_rclick_cb), NULL); | 4384 G_CALLBACK(entry_stop_rclick_cb), NULL); |
7706 if (purple_conversation_get_type(conv) != PURPLE_CONV_TYPE_IM) | 7700 if (purple_conversation_get_type(conv) != PURPLE_CONV_TYPE_IM) |
7707 return; | 7701 return; |
7708 | 7702 |
7709 gtkconv = PIDGIN_CONVERSATION(conv); | 7703 gtkconv = PIDGIN_CONVERSATION(conv); |
7710 | 7704 |
7705 if (gtkconv->u.im->typing_timer != 0) { | |
7706 g_source_remove(gtkconv->u.im->typing_timer); | |
7707 gtkconv->u.im->typing_timer = 0; | |
7708 } | |
7709 | |
7711 stop_anim(NULL, gtkconv); | 7710 stop_anim(NULL, gtkconv); |
7712 } | 7711 } |
7713 static void | 7712 static void |
7714 close_window(GtkWidget *w, PidginWindow *win) | 7713 close_window(GtkWidget *w, PidginWindow *win) |
7715 { | 7714 { |
8038 /* Create the window. */ | 8037 /* Create the window. */ |
8039 win->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); | 8038 win->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); |
8040 gtk_window_set_role(GTK_WINDOW(win->window), "conversation"); | 8039 gtk_window_set_role(GTK_WINDOW(win->window), "conversation"); |
8041 gtk_window_set_resizable(GTK_WINDOW(win->window), TRUE); | 8040 gtk_window_set_resizable(GTK_WINDOW(win->window), TRUE); |
8042 gtk_container_set_border_width(GTK_CONTAINER(win->window), 0); | 8041 gtk_container_set_border_width(GTK_CONTAINER(win->window), 0); |
8043 GTK_WINDOW(win->window)->allow_shrink = TRUE; | 8042 gtk_window_set_default_size(win->window, |
8044 | 8043 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_width"), |
8044 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_height")); | |
8045 if (available_list == NULL) { | 8045 if (available_list == NULL) { |
8046 create_icon_lists(win->window); | 8046 create_icon_lists(win->window); |
8047 } | 8047 } |
8048 | 8048 |
8049 g_signal_connect(G_OBJECT(win->window), "delete_event", | 8049 g_signal_connect(G_OBJECT(win->window), "delete_event", |