1 Identiske underkataloger: src2/CVS og src/CVS
2 Identiske underkataloger: src2/.deps og src/.deps
3 Index: gaim/src/gtkblist.c
4 ===================================================================
5 --- gaim.orig/src/gtkblist.c 2005-08-19 21:57:30.272074856 +0200
6 +++ gaim/src/gtkblist.c 2005-08-19 21:57:42.030287336 +0200
8 joinchat_set_sensitive_if_input_cb(NULL, data);
10 gtk_widget_show_all(data->entries_box);
13 + children = GTK_BOX(data->entries_box)->children;
16 + //Let the prilabel handle the maxsize
17 + gtk_widget_set_size_request(((GtkBoxChild*)(children->data))->widget, 0, -1);
18 + children = children->next;
25 vbox = GTK_DIALOG(data->window)->vbox;
28 + //Make a scrollview to accomodate it all
29 + sw = gtk_scrolled_window_new(NULL, NULL);
30 + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
31 + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
32 + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
34 + gtk_widget_set_size_request(sw, -1, 200);
35 + gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
36 + gtk_widget_show(sw);
38 + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
39 + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox);
41 label = gtk_label_new(_("Please enter the appropriate information "
42 "about the chat you would like to join.\n"));
43 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
44 gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
45 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
48 rowbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
49 gtk_box_pack_start(GTK_BOX(vbox), rowbox, TRUE, TRUE, 0);
51 g_object_unref(data->sg);
53 gtk_widget_show_all(data->window);
55 + //Wait for the window to have recieved its "configure_event",
56 + //which means it has been resized by the WM
57 + while (gtk_events_pending ()) gtk_main_iteration ();
59 + //Get allocated size, and adjust widgets accordingly
61 + gtk_window_get_size(GTK_WINDOW(data->window), &w, &h);
63 + // Window_border Scrollbar (FFH)
64 + w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4;
65 + gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1);
67 + //Let the prilabel handle the maxsize
68 + gtk_widget_set_size_request(GTK_WIDGET(data->account_menu), 0, -1);
69 + gtk_widget_set_size_request(GTK_WIDGET(data->entries_box), 0, -1);
72 static void gtk_blist_row_expanded_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) {
73 @@ -4364,6 +4403,19 @@
74 vbox = GTK_DIALOG(data->window)->vbox;
77 + //Make a scrollview to accomodate it all
78 + sw = gtk_scrolled_window_new(NULL, NULL);
79 + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
80 + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
81 + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
83 + gtk_widget_set_size_request(sw, -1, 200);
84 + gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
85 + gtk_widget_show(sw);
87 + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
88 + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox);
90 label = gtk_label_new(
91 _("Please enter the screen name of the person you would like "
92 "to add to your buddy list. You may optionally enter an alias, "
94 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
95 gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
96 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
99 hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
100 gtk_container_add(GTK_CONTAINER(vbox), hbox);
101 @@ -4446,6 +4499,25 @@
104 gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(data->combo)->entry), group);
106 + //Wait for the window to have recieved its "configure_event",
107 + //which means it has been resized by the WM
108 + while (gtk_events_pending ()) gtk_main_iteration ();
110 + //Get allocated size, and adjust widgets accordingly
111 + int w, h, field_labels_w;
112 + gtk_window_get_size(GTK_WINDOW(data->window), &w, &h);
113 + field_labels_w = label->allocation.width + GAIM_HIG_BORDER*2; //The width of the largest field-label
115 + // Window_border Scrollbar (FFH)
116 + w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4;
117 + gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1);
118 + //Set the size of the input fields
119 + gtk_widget_set_size_request(GTK_WIDGET(data->entry), w-field_labels_w, -1);
120 + gtk_widget_set_size_request(GTK_WIDGET(data->entry_for_alias), w-field_labels_w, -1);
121 + gtk_widget_set_size_request(GTK_WIDGET(data->combo), w-field_labels_w, -1);
122 + gtk_widget_set_size_request(GTK_WIDGET(data->account_box), w-field_labels_w, -1);
127 @@ -4572,6 +4644,9 @@
128 GHashTable *defaults = NULL;
129 struct proto_chat_entry *pce;
130 gboolean focus = TRUE;
135 g_return_if_fail(data->account != NULL);
137 @@ -4596,10 +4671,6 @@
139 for (tmp = list; tmp; tmp = tmp->next)
147 rowbox = gtk_hbox_new(FALSE, 5);
148 @@ -4657,6 +4728,15 @@
149 addchat_set_sensitive_if_input_cb(NULL, data);
151 gtk_widget_show_all(data->entries_box);
154 + children = GTK_BOX(data->entries_box)->children;
157 + //Let the prilabel handle the maxsize
158 + gtk_widget_set_size_request(((GtkBoxChild*)(children->data))->widget, 0, -1);
159 + children = children->next;
164 @@ -4759,6 +4839,19 @@
165 vbox = GTK_DIALOG(data->window)->vbox;
168 + //Make a scrollview to accomodate it all
169 + sw = gtk_scrolled_window_new(NULL, NULL);
170 + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
171 + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
172 + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
174 + gtk_widget_set_size_request(sw, -1, 200);
175 + gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
176 + gtk_widget_show(sw);
178 + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
179 + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox);
181 label = gtk_label_new(
182 _("Please enter an alias, and the appropriate information "
183 "about the chat you would like to add to your buddy list.\n"));
184 @@ -4766,7 +4859,8 @@
185 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
186 gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
187 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
191 rowbox = gtk_hbox_new(FALSE, 5);
192 gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0);
194 @@ -4825,6 +4919,24 @@
195 G_CALLBACK(add_chat_resp_cb), data);
197 gtk_widget_show_all(data->window);
199 + //Wait for the window to have recieved its "configure_event",
200 + //which means it has been resized by the WM
201 + while (gtk_events_pending ()) gtk_main_iteration ();
203 + //Get allocated size, and adjust the label accordingly
205 + gtk_window_get_size(GTK_WINDOW(data->window), &w, &h);
207 + // Window_border Scrollbar (FFH)
208 + w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4;
209 + gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1);
210 + //Let the prilabel handle the maxsize
211 + gtk_widget_set_size_request(GTK_WIDGET(data->account_menu), 0, -1);
212 + gtk_widget_set_size_request(GTK_WIDGET(data->entries_box), 0, -1);
213 + gtk_widget_set_size_request(GTK_WIDGET(data->alias_entry), 0, -1);
214 + gtk_widget_set_size_request(GTK_WIDGET(data->group_combo), 0, -1);
219 Index: gaim/src/gtkrequest.c
220 ===================================================================
221 --- gaim.orig/src/gtkrequest.c 2005-08-19 21:57:30.273074704 +0200
222 +++ gaim/src/gtkrequest.c 2005-08-19 21:58:05.468724152 +0200
224 /* Show everything. */
225 gtk_widget_show_all(dialog);
227 + //Wait for the window to have recieved its "configure_event",
228 + //which means it has been resized by the WM
229 + while (gtk_events_pending ()) gtk_main_iteration ();
231 + //Get allocated size, and adjust widgets accordingly
233 + gtk_window_get_size(GTK_WINDOW(dialog), &w, &h);
235 + w = w - GAIM_HIG_BORDER * 2;
236 + gtk_widget_set_size_request(GTK_WIDGET(label), w, -1);