comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- branch
- seanegan.convwindow
- changeset 17300
- 6e8f285962e7
- parent 17298
- b69ba13b3b94
- child 17303
- 138cbb17e5cd
- child 17320
- ac9f4dea7209
equal
deleted
inserted
replaced
| 17299:211cd8a67896 | 17300:6e8f285962e7 |
|---|---|
| 4205 gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(imhtml_sw), | 4205 gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(imhtml_sw), |
| 4206 &imhtml_sw_hscroll, NULL); | 4206 &imhtml_sw_hscroll, NULL); |
| 4207 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(imhtml_sw), | 4207 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(imhtml_sw), |
| 4208 imhtml_sw_hscroll, GTK_POLICY_ALWAYS); | 4208 imhtml_sw_hscroll, GTK_POLICY_ALWAYS); |
| 4209 | 4209 |
| 4210 gtk_widget_set_size_request(gtkconv->imhtml, | |
| 4211 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/default_width"), | |
| 4212 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/default_height")); | |
| 4213 g_signal_connect(G_OBJECT(gtkconv->imhtml), "size-allocate", | 4210 g_signal_connect(G_OBJECT(gtkconv->imhtml), "size-allocate", |
| 4214 G_CALLBACK(size_allocate_cb), gtkconv); | 4211 G_CALLBACK(size_allocate_cb), gtkconv); |
| 4215 | 4212 |
| 4216 g_signal_connect_after(G_OBJECT(gtkconv->imhtml), "button_press_event", | 4213 g_signal_connect_after(G_OBJECT(gtkconv->imhtml), "button_press_event", |
| 4217 G_CALLBACK(entry_stop_rclick_cb), NULL); | 4214 G_CALLBACK(entry_stop_rclick_cb), NULL); |
| 4384 gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(imhtml_sw), | 4381 gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(imhtml_sw), |
| 4385 &imhtml_sw_hscroll, NULL); | 4382 &imhtml_sw_hscroll, NULL); |
| 4386 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(imhtml_sw), | 4383 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(imhtml_sw), |
| 4387 imhtml_sw_hscroll, GTK_POLICY_ALWAYS); | 4384 imhtml_sw_hscroll, GTK_POLICY_ALWAYS); |
| 4388 | 4385 |
| 4389 gtk_widget_set_size_request(gtkconv->imhtml, | |
| 4390 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_width"), | |
| 4391 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_height")); | |
| 4392 g_signal_connect(G_OBJECT(gtkconv->imhtml), "size-allocate", | 4386 g_signal_connect(G_OBJECT(gtkconv->imhtml), "size-allocate", |
| 4393 G_CALLBACK(size_allocate_cb), gtkconv); | 4387 G_CALLBACK(size_allocate_cb), gtkconv); |
| 4394 | 4388 |
| 4395 g_signal_connect_after(G_OBJECT(gtkconv->imhtml), "button_press_event", | 4389 g_signal_connect_after(G_OBJECT(gtkconv->imhtml), "button_press_event", |
| 4396 G_CALLBACK(entry_stop_rclick_cb), NULL); | 4390 G_CALLBACK(entry_stop_rclick_cb), NULL); |
| 8044 /* Create the window. */ | 8038 /* Create the window. */ |
| 8045 win->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); | 8039 win->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); |
| 8046 gtk_window_set_role(GTK_WINDOW(win->window), "conversation"); | 8040 gtk_window_set_role(GTK_WINDOW(win->window), "conversation"); |
| 8047 gtk_window_set_resizable(GTK_WINDOW(win->window), TRUE); | 8041 gtk_window_set_resizable(GTK_WINDOW(win->window), TRUE); |
| 8048 gtk_container_set_border_width(GTK_CONTAINER(win->window), 0); | 8042 gtk_container_set_border_width(GTK_CONTAINER(win->window), 0); |
| 8049 GTK_WINDOW(win->window)->allow_shrink = TRUE; | 8043 gtk_window_set_default_size(win->window, |
| 8050 | 8044 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_width"), |
| 8045 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_height")); | |
| 8051 if (available_list == NULL) { | 8046 if (available_list == NULL) { |
| 8052 create_icon_lists(win->window); | 8047 create_icon_lists(win->window); |
| 8053 } | 8048 } |
| 8054 | 8049 |
| 8055 g_signal_connect(G_OBJECT(win->window), "delete_event", | 8050 g_signal_connect(G_OBJECT(win->window), "delete_event", |
