comparison: pidgin/gtkrequest.c
pidgin/gtkrequest.c
- branch
- soc.2013.gobjectification.plugins
- changeset 37144
- 8b63b9948107
- parent 37140
- 25d39bb4d758
- parent 35989
- 2b5a26ddbb69
- child 37158
- 96b5ab42da00
equal
deleted
inserted
replaced
| 37143:728319cb659f | 37144:8b63b9948107 |
|---|---|
| 2163 { | 2163 { |
| 2164 GList *field_list; | 2164 GList *field_list; |
| 2165 size_t field_count = 0; | 2165 size_t field_count = 0; |
| 2166 size_t cols = 1; | 2166 size_t cols = 1; |
| 2167 size_t rows; | 2167 size_t rows; |
| 2168 #if 0 | |
| 2168 size_t col_num; | 2169 size_t col_num; |
| 2170 #endif | |
| 2169 size_t row_num = 0; | 2171 size_t row_num = 0; |
| 2170 guint tab_no; | 2172 guint tab_no; |
| 2171 gboolean contains_resizable = FALSE, frame_fill; | 2173 gboolean contains_resizable = FALSE, frame_fill; |
| 2172 | 2174 |
| 2173 group = gl->data; | 2175 group = gl->data; |
| 2186 } | 2188 } |
| 2187 else | 2189 else |
| 2188 frame = pages[tab_no]; | 2190 frame = pages[tab_no]; |
| 2189 | 2191 |
| 2190 field_count = g_list_length(field_list); | 2192 field_count = g_list_length(field_list); |
| 2191 /* | 2193 #if 0 |
| 2192 if (field_count > 9) | 2194 if (field_count > 9) |
| 2193 { | 2195 { |
| 2194 rows = field_count / 2; | 2196 rows = field_count / 2; |
| 2195 cols++; | 2197 cols++; |
| 2196 } | 2198 } |
| 2197 else | 2199 else |
| 2198 */ | 2200 #endif |
| 2199 rows = field_count; | 2201 rows = field_count; |
| 2200 | 2202 |
| 2203 #if 0 | |
| 2201 col_num = 0; | 2204 col_num = 0; |
| 2205 #endif | |
| 2202 | 2206 |
| 2203 for (fl = field_list; fl != NULL; fl = fl->next) | 2207 for (fl = field_list; fl != NULL; fl = fl->next) |
| 2204 { | 2208 { |
| 2205 PurpleRequestFieldType type; | 2209 PurpleRequestFieldType type; |
| 2206 | 2210 |
| 2211 if (type == PURPLE_REQUEST_FIELD_DATASHEET) | 2215 if (type == PURPLE_REQUEST_FIELD_DATASHEET) |
| 2212 contains_resizable = TRUE; | 2216 contains_resizable = TRUE; |
| 2213 | 2217 |
| 2214 if (type == PURPLE_REQUEST_FIELD_LABEL) | 2218 if (type == PURPLE_REQUEST_FIELD_LABEL) |
| 2215 { | 2219 { |
| 2220 #if 0 | |
| 2216 if (col_num > 0) | 2221 if (col_num > 0) |
| 2217 rows++; | 2222 rows++; |
| 2223 #endif | |
| 2218 | 2224 |
| 2219 rows++; | 2225 rows++; |
| 2220 } | 2226 } |
| 2221 else if ((type == PURPLE_REQUEST_FIELD_LIST) || | 2227 else if ((type == PURPLE_REQUEST_FIELD_LIST) || |
| 2222 (type == PURPLE_REQUEST_FIELD_STRING && | 2228 (type == PURPLE_REQUEST_FIELD_STRING && |
| 2223 purple_request_field_string_is_multiline(field))) | 2229 purple_request_field_string_is_multiline(field))) |
| 2224 { | 2230 { |
| 2231 #if 0 | |
| 2225 if (col_num > 0) | 2232 if (col_num > 0) |
| 2226 rows++; | 2233 rows++; |
| 2234 #endif | |
| 2227 | 2235 |
| 2228 rows += 2; | 2236 rows += 2; |
| 2229 } else if (compact && type != PURPLE_REQUEST_FIELD_BOOLEAN) | 2237 } else if (compact && type != PURPLE_REQUEST_FIELD_BOOLEAN) |
| 2230 rows++; | 2238 rows++; |
| 2231 | 2239 |
| 2240 #if 0 | |
| 2232 col_num++; | 2241 col_num++; |
| 2233 | 2242 |
| 2234 if (col_num >= cols) | 2243 if (col_num >= cols) |
| 2235 col_num = 0; | 2244 col_num = 0; |
| 2245 #endif | |
| 2236 } | 2246 } |
| 2237 | 2247 |
| 2238 if (compact) | 2248 if (compact) |
| 2239 table = gtk_table_new(rows, cols, FALSE); | 2249 table = gtk_table_new(rows, cols, FALSE); |
| 2240 else | 2250 else |
| 2248 | 2258 |
| 2249 for (row_num = 0, fl = field_list; | 2259 for (row_num = 0, fl = field_list; |
| 2250 row_num < rows && fl != NULL; | 2260 row_num < rows && fl != NULL; |
| 2251 row_num++) | 2261 row_num++) |
| 2252 { | 2262 { |
| 2263 #if 0 | |
| 2253 for (col_num = 0; | 2264 for (col_num = 0; |
| 2254 col_num < cols && fl != NULL; | 2265 col_num < cols && fl != NULL; |
| 2255 col_num++, fl = fl->next) | 2266 col_num++, fl = fl->next) |
| 2267 #else | |
| 2268 gboolean dummy_counter = TRUE; | |
| 2269 /* it's the same as loop above */ | |
| 2270 for (; dummy_counter && fl != NULL; dummy_counter = FALSE, fl = fl->next) | |
| 2271 #endif | |
| 2256 { | 2272 { |
| 2273 #if 0 | |
| 2257 size_t col_offset = col_num * 2; | 2274 size_t col_offset = col_num * 2; |
| 2275 #else | |
| 2276 size_t col_offset = 0; | |
| 2277 #endif | |
| 2258 PurpleRequestFieldType type; | 2278 PurpleRequestFieldType type; |
| 2259 GtkWidget *widget = NULL; | 2279 GtkWidget *widget = NULL; |
| 2260 gchar *field_label; | 2280 gchar *field_label; |
| 2261 | 2281 |
| 2262 label = NULL; | 2282 label = NULL; |
| 2263 field = fl->data; | 2283 field = fl->data; |
| 2264 | 2284 |
| 2265 if (!purple_request_field_is_visible(field)) { | 2285 if (!purple_request_field_is_visible(field)) { |
| 2286 #if 0 | |
| 2266 col_num--; | 2287 col_num--; |
| 2288 #endif | |
| 2267 continue; | 2289 continue; |
| 2268 } | 2290 } |
| 2269 | 2291 |
| 2270 type = purple_request_field_get_field_type(field); | 2292 type = purple_request_field_get_field_type(field); |
| 2271 field_label = pidgin_request_escape(cpar, | 2293 field_label = pidgin_request_escape(cpar, |
| 2293 if (type == PURPLE_REQUEST_FIELD_LABEL || | 2315 if (type == PURPLE_REQUEST_FIELD_LABEL || |
| 2294 type == PURPLE_REQUEST_FIELD_LIST || | 2316 type == PURPLE_REQUEST_FIELD_LIST || |
| 2295 (type == PURPLE_REQUEST_FIELD_STRING && | 2317 (type == PURPLE_REQUEST_FIELD_STRING && |
| 2296 purple_request_field_string_is_multiline(field))) | 2318 purple_request_field_string_is_multiline(field))) |
| 2297 { | 2319 { |
| 2320 #if 0 | |
| 2298 if(col_num > 0) | 2321 if(col_num > 0) |
| 2299 row_num++; | 2322 row_num++; |
| 2323 #endif | |
| 2300 | 2324 |
| 2301 gtk_table_attach_defaults(GTK_TABLE(table), label, | 2325 gtk_table_attach_defaults(GTK_TABLE(table), label, |
| 2302 0, 2 * cols, | 2326 0, 2 * cols, |
| 2303 row_num, row_num + 1); | 2327 row_num, row_num + 1); |
| 2304 | 2328 |
| 2305 row_num++; | 2329 row_num++; |
| 2330 #if 0 | |
| 2306 col_num=cols; | 2331 col_num=cols; |
| 2332 #endif | |
| 2307 } | 2333 } |
| 2308 else | 2334 else |
| 2309 { | 2335 { |
| 2310 gtk_table_attach_defaults(GTK_TABLE(table), label, | 2336 gtk_table_attach_defaults(GTK_TABLE(table), label, |
| 2311 col_offset, col_offset + 1, | 2337 col_offset, col_offset + 1, |
| 2510 else if (g_file_test(filename, G_FILE_TEST_EXISTS)) | 2536 else if (g_file_test(filename, G_FILE_TEST_EXISTS)) |
| 2511 gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), filename); | 2537 gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), filename); |
| 2512 } | 2538 } |
| 2513 | 2539 |
| 2514 #ifdef _WIN32 | 2540 #ifdef _WIN32 |
| 2515 | |
| 2516 if (savedialog) { | 2541 if (savedialog) { |
| 2517 current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_save_folder"); | 2542 current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_save_folder"); |
| 2518 } else { | 2543 } else { |
| 2519 current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_open_folder"); | 2544 current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_open_folder"); |
| 2520 } | 2545 } |
| 2532 GTK_FILE_CHOOSER(filesel), my_documents); | 2557 GTK_FILE_CHOOSER(filesel), my_documents); |
| 2533 | 2558 |
| 2534 g_free(my_documents); | 2559 g_free(my_documents); |
| 2535 } | 2560 } |
| 2536 } | 2561 } |
| 2537 | |
| 2538 #endif | 2562 #endif |
| 2563 | |
| 2539 g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(filesel)), "response", | 2564 g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(filesel)), "response", |
| 2540 G_CALLBACK(file_ok_check_if_exists_cb), data); | 2565 G_CALLBACK(file_ok_check_if_exists_cb), data); |
| 2541 | 2566 |
| 2542 pidgin_auto_parent_window(filesel); | 2567 pidgin_auto_parent_window(filesel); |
| 2543 | 2568 |
