org.handhelds.familiar/packages/gaim/files/01-optional-icons-in-dialogs.patch

   1 Index: gaim/src/gtkblist.c
   2 ===================================================================
   3 --- gaim.orig/src/gtkblist.c    2005-08-19 23:23:45.000000000 +0200
   4 +++ gaim/src/gtkblist.c 2005-08-21 02:32:13.989658832 +0200
   5 @@ -873,16 +873,23 @@
   6  void
   7  gaim_gtk_blist_joinchat_show(void)
   8  {
   9 -       GtkWidget *hbox, *vbox;
  10 +       GtkWidget *vbox;
  11         GtkWidget *rowbox;
  12         GtkWidget *label;
  13 +       GtkWidget *pri_label;
  14         GaimGtkBuddyList *gtkblist;
  15 +       GtkWidget *sw;
  16 +#if ICONS_IN_DIALOGS
  17 +       GtkWidget *hbox;
  18         GtkWidget *img = NULL;
  19 +#endif
  20         GaimGtkJoinChatData *data = NULL;
  21
  22         gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
  23 +#if ICONS_IN_DIALOGS
  24         img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
  25                                                                    GTK_ICON_SIZE_DIALOG);
  26 +#endif
  27         data = g_new0(GaimGtkJoinChatData, 1);
  28
  29         data->window = gtk_dialog_new_with_buttons(_("Join a Chat"),
  30 @@ -897,6 +904,7 @@
  31                 GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), GAIM_HIG_BOX_SPACE);
  32         gtk_window_set_role(GTK_WINDOW(data->window), "join_chat");
  33
  34 +#if ICONS_IN_DIALOGS
  35         hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
  36         gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
  37         gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
  38 @@ -905,6 +913,9 @@
  39         vbox = gtk_vbox_new(FALSE, 5);
  40         gtk_container_set_border_width(GTK_CONTAINER(vbox), 0);
  41         gtk_container_add(GTK_CONTAINER(hbox), vbox);
  42 +#else
  43 +       vbox = GTK_DIALOG(data->window)->vbox;
  44 +#endif
  45
  46         label = gtk_label_new(_("Please enter the appropriate information "
  47                                                         "about the chat you would like to join.\n"));
  48 @@ -4304,9 +4315,13 @@
  49  {
  50         GtkWidget *table;
  51         GtkWidget *label;
  52 +       GtkWidget *pri_label;
  53         GtkWidget *hbox;
  54         GtkWidget *vbox;
  55 +       GtkWidget *sw;
  56 +#if ICONS_IN_DIALOGS
  57         GtkWidget *img;
  58 +#endif
  59         GaimGtkBuddyList *gtkblist;
  60         GaimGtkAddBuddyData *data = g_new0(GaimGtkAddBuddyData, 1);
  61
  62 @@ -4315,8 +4330,10 @@
  63                  ? account
  64                  : gaim_connection_get_account(gaim_connections_get_all()->data));
  65
  66 +#if ICONS_IN_DIALOGS
  67         img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
  68                                                                    GTK_ICON_SIZE_DIALOG);
  69 +#endif
  70
  71         gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
  72
  73 @@ -4335,6 +4352,7 @@
  74         gtk_window_set_type_hint(GTK_WINDOW(data->window),
  75                                                          GDK_WINDOW_TYPE_HINT_DIALOG);
  76
  77 +#if ICONS_IN_DIALOGS
  78         hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
  79         gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
  80         gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
  81 @@ -4342,6 +4360,9 @@
  82
  83         vbox = gtk_vbox_new(FALSE, 0);
  84         gtk_container_add(GTK_CONTAINER(hbox), vbox);
  85 +#else
  86 +       vbox = GTK_DIALOG(data->window)->vbox;
  87 +#endif
  88
  89         label = gtk_label_new(
  90                 _("Please enter the screen name of the person you would like "
  91 @@ -4663,10 +4684,14 @@
  92         GList *l;
  93         GaimConnection *gc;
  94         GtkWidget *label;
  95 +       GtkWidget *pri_label;
  96         GtkWidget *rowbox;
  97 -       GtkWidget *hbox;
  98         GtkWidget *vbox;
  99 +       GtkWidget *sw;
 100 +#if ICONS_IN_DIALOGS
 101 +       GtkWidget *hbox;
 102         GtkWidget *img;
 103 +#endif
 104
 105         if (account != NULL) {
 106                 gc = gaim_account_get_connection(account);
 107 @@ -4698,8 +4723,10 @@
 108         data->account = account;
 109         data->default_chat_name = g_strdup(name);
 110
 111 +#if ICONS_IN_DIALOGS
 112         img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
 113                                                                    GTK_ICON_SIZE_DIALOG);
 114 +#endif
 115
 116         gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
 117
 118 @@ -4720,6 +4747,7 @@
 119         gtk_window_set_type_hint(GTK_WINDOW(data->window),
 120                                                          GDK_WINDOW_TYPE_HINT_DIALOG);
 121
 122 +#if ICONS_IN_DIALOGS
 123         hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
 124         gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
 125         gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
 126 @@ -4727,6 +4755,9 @@
 127
 128         vbox = gtk_vbox_new(FALSE, 5);
 129         gtk_container_add(GTK_CONTAINER(hbox), vbox);
 130 +#else
 131 +       vbox = GTK_DIALOG(data->window)->vbox;
 132 +#endif
 133
 134         label = gtk_label_new(
 135                 _("Please enter an alias, and the appropriate information "
 136 Index: gaim/src/gtkconn.c
 137 ===================================================================
 138 --- gaim.orig/src/gtkconn.c     2005-08-19 23:23:45.000000000 +0200
 139 +++ gaim/src/gtkconn.c  2005-08-19 23:27:18.000000000 +0200
 140 @@ -371,7 +371,10 @@
 141
 142         /* Build the window if it isn't there yet */
 143         if (!disconnect_window) {
 144 -               GtkWidget *hbox, *vbox, *img;
 145 +               GtkWidget *hbox, *vbox;
 146 +       #if ICONS_IN_DIALOGS
 147 +               GtkWidget *img;
 148 +       #endif
 149                 GtkCellRenderer *rend, *rend2;
 150
 151                 disconnect_window = g_new0(struct disconnect_window, 1);
 152 @@ -384,6 +387,7 @@
 153                 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(disconnect_window->window)->vbox), GAIM_HIG_BORDER);
 154                 gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(disconnect_window->window)->vbox), GAIM_HIG_BOX_SPACE);
 155
 156 +#if ICONS_IN_DIALOGS
 157                 hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
 158                 gtk_container_add(GTK_CONTAINER(GTK_DIALOG(disconnect_window->window)->vbox), hbox);
 159                 img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG);
 160 @@ -392,6 +396,9 @@
 161
 162                 vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
 163                 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
 164 +#else
 165 +       vbox = GTK_DIALOG(disconnect_window->window)->vbox;
 166 +#endif
 167
 168                 disconnect_window->label = gtk_label_new(label_text);
 169
 170 Index: gaim/src/gtkconv.c
 171 ===================================================================
 172 --- gaim.orig/src/gtkconv.c     2005-08-19 23:23:45.000000000 +0200
 173 +++ gaim/src/gtkconv.c  2005-08-19 23:27:18.000000000 +0200
 174 @@ -847,10 +847,12 @@
 175                 GtkWidget *label;
 176                 GtkWidget *vbox, *hbox;
 177                 GtkWidget *table;
 178 +#if ICONS_IN_DIALOGS
 179                 GtkWidget *img;
 180
 181                 img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
 182                                                                            GTK_ICON_SIZE_DIALOG);
 183 +#endif
 184
 185                 info = g_new0(InviteBuddyInfo, 1);
 186                 info->conv = conv;
 187 @@ -880,6 +882,7 @@
 188                 gtk_box_set_spacing(GTK_BOX(vbox), GAIM_HIG_BORDER);
 189                 gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BOX_SPACE);
 190
 191 +#if ICONS_IN_DIALOGS
 192                 /* Setup the inner hbox and put the dialog's icon in it. */
 193                 hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
 194                 gtk_container_add(GTK_CONTAINER(vbox), hbox);
 195 @@ -889,6 +892,7 @@
 196                 /* Setup the right vbox. */
 197                 vbox = gtk_vbox_new(FALSE, 0);
 198                 gtk_container_add(GTK_CONTAINER(hbox), vbox);
 199 +#endif
 200
 201                 /* Put our happy label in it. */
 202                 label = gtk_label_new(_("Please enter the name of the user you wish "
 203 @@ -1107,8 +1111,10 @@
 204         GaimGtkWindow *gtkwin = GAIM_GTK_WINDOW(win);
 205         GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
 206         GtkWidget *hbox;
 207 +#if ICONS_IN_DIALOGS
 208         GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
 209                                                                                           GTK_ICON_SIZE_DIALOG);
 210 +#endif
 211         GtkWidget *label;
 212         struct _search *s;
 213
 214 @@ -1139,9 +1145,11 @@
 215         hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
 216         gtk_container_add(GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox),
 217                                           hbox);
 218 +#if ICONS_IN_DIALOGS
 219         gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
 220
 221         gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
 222 +#endif
 223         gtk_dialog_set_response_sensitive(GTK_DIALOG(gtkconv->dialogs.search),
 224                                                                           GTK_RESPONSE_OK, FALSE);
 225
 226 Index: gaim/src/gtkdebug.c
 227 ===================================================================
 228 --- gaim.orig/src/gtkdebug.c    2005-08-19 23:23:45.000000000 +0200
 229 +++ gaim/src/gtkdebug.c 2005-08-19 23:27:18.000000000 +0200
 230 @@ -149,7 +149,10 @@
 231  static void
 232  find_cb(GtkWidget *w, DebugWindow *win)
 233  {
 234 -       GtkWidget *hbox, *img, *label;
 235 +       GtkWidget *hbox, *label;
 236 +#if ICONS_IN_DIALOGS
 237 +       GtkWidget *img;
 238 +#endif
 239         struct _find *f;
 240
 241         if(win->find)
 242 @@ -179,11 +182,13 @@
 243         hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
 244         gtk_container_add(GTK_CONTAINER(GTK_DIALOG(win->find)->vbox),
 245                                           hbox);
 246 +#if ICONS_IN_DIALOGS
 247         img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
 248                                                                    GTK_ICON_SIZE_DIALOG);
 249         gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
 250
 251         gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
 252 +#endif
 253         gtk_dialog_set_response_sensitive(GTK_DIALOG(win->find),
 254                                                                           GTK_RESPONSE_OK, FALSE);
 255
 256 Index: gaim/src/gtkdialogs.c
 257 ===================================================================
 258 --- gaim.orig/src/gtkdialogs.c  2005-08-19 23:23:45.000000000 +0200
 259 +++ gaim/src/gtkdialogs.c       2005-08-19 23:27:18.000000000 +0200
 260 @@ -534,7 +534,9 @@
 261         GtkWidget *window;
 262         GtkWidget *hbox;
 263         GtkWidget *label;
 264 +#if ICONS_IN_DIALOGS
 265         GtkWidget *img;
 266 +#endif
 267         gchar *norm = gaim_strreplace(ee, "rocksmyworld", "");
 268
 269         label = gtk_label_new(NULL);
 270 @@ -582,8 +584,10 @@
 271
 272         hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
 273         gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), hbox);
 274 +#if ICONS_IN_DIALOGS
 275         img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_COOL, gtk_icon_size_from_name(GAIM_ICON_SIZE_DIALOG_COOL));
 276         gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
 277 +#endif
 278
 279         gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
 280         gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 281 Index: gaim/src/gtkgaim.h
 282 ===================================================================
 283 --- gaim.orig/src/gtkgaim.h     2005-08-19 23:26:29.000000000 +0200
 284 +++ gaim/src/gtkgaim.h  2005-08-21 02:32:29.270335816 +0200
 285 @@ -61,5 +61,10 @@
 286  #define GAIM_HIG_BORDER        12
 287  #define GAIM_HIG_BOX_SPACE      6
 288
 289 +/**
 290 + * Do we want icons in dialogs?
 291 + */
 292 +#define ICONS_IN_DIALOGS 1
 293 +
 294  #endif /* _GAIM_GTKGAIM_H_ */
 295
 296 Index: gaim/src/gtknotify.c
 297 ===================================================================
 298 --- gaim.orig/src/gtknotify.c   2005-08-19 23:23:45.000000000 +0200
 299 +++ gaim/src/gtknotify.c        2005-08-21 02:32:03.765213184 +0200
 300 @@ -125,7 +125,9 @@
 301         GtkWidget *dialog;
 302         GtkWidget *hbox;
 303         GtkWidget *label;
 304 +#if ICONS_IN_DIALOGS
 305         GtkWidget *img = NULL;
 306 +#endif
 307         char label_text[2048];
 308         const char *icon_name = NULL;
 309         char *primary_esc, *secondary_esc;
 310 @@ -149,11 +151,13 @@
 311                         break;
 312         }
 313
 314 +#if ICONS_IN_DIALOGS
 315         if (icon_name != NULL)
 316         {
 317                 img = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_DIALOG);
 318                 gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
 319         }
 320 +#endif
 321
 322         dialog = gtk_dialog_new_with_buttons(title ? title : GAIM_ALERT_TITLE,
 323                                                                                  NULL, 0, GTK_STOCK_CLOSE,
 324 @@ -173,8 +177,10 @@
 325         hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
 326         gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
 327
 328 +#if ICONS_IN_DIALOGS
 329         if (img != NULL)
 330                 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
 331 +#endif
 332
 333         primary_esc = g_markup_escape_text(primary, -1);
 334         secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL;
 335 @@ -218,9 +224,11 @@
 336         GaimNotifyMailData *data;
 337         GtkWidget *dialog;
 338         GtkWidget *vbox;
 339 -       GtkWidget *hbox;
 340         GtkWidget *label;
 341 +#if ICONS_IN_DIALOGS
 342 +       GtkWidget *hbox;
 343         GtkWidget *img;
 344 +#endif
 345         char *detail_text;
 346         char *label_text;
 347
 348 @@ -248,6 +256,7 @@
 349         gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
 350         gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
 351
 352 +#if ICONS_IN_DIALOGS
 353         /* Setup the main horizontal box */
 354         hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
 355         gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
 356 @@ -262,6 +271,9 @@
 357         vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
 358
 359         gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
 360 +#else
 361 +       vbox = GTK_DIALOG(dialog)->vbox;
 362 +#endif
 363
 364         /* Descriptive label */
 365         detail_text = g_strdup_printf(ngettext("%s has %d new message.",
 366 Index: gaim/src/gtkrequest.c
 367 ===================================================================
 368 --- gaim.orig/src/gtkrequest.c  2005-08-19 23:23:45.000000000 +0200
 369 +++ gaim/src/gtkrequest.c       2005-08-21 02:32:15.943361824 +0200
 370 @@ -281,10 +281,12 @@
 371         GaimGtkRequestData *data;
 372         GtkWidget *dialog;
 373         GtkWidget *vbox;
 374 -       GtkWidget *hbox;
 375         GtkWidget *label;
 376         GtkWidget *entry;
 377 +#if ICONS_IN_DIALOGS
 378 +       GtkWidget *hbox;
 379         GtkWidget *img;
 380 +#endif
 381         GtkWidget *toolbar;
 382         char *label_text;
 383         char *primary_esc, *secondary_esc;
 384 @@ -318,6 +320,7 @@
 385         gtk_dialog_set_default_response(GTK_DIALOG(dialog), 0);
 386         gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
 387
 388 +#if ICONS_IN_DIALOGS
 389         /* Setup the main horizontal box */
 390         hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
 391         gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
 392 @@ -332,6 +335,9 @@
 393         vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
 394
 395         gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
 396 +#else
 397 +       vbox = GTK_DIALOG(dialog)->vbox;
 398 +#endif
 399
 400         /* Descriptive label */
 401         primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL;
 402 @@ -435,9 +441,11 @@
 403         GaimGtkRequestData *data;
 404         GtkWidget *dialog;
 405         GtkWidget *vbox, *vbox2;
 406 -       GtkWidget *hbox;
 407         GtkWidget *label;
 408 +#if ICONS_IN_DIALOGS
 409 +       GtkWidget *hbox;
 410         GtkWidget *img;
 411 +#endif
 412         GtkWidget *radio = NULL;
 413         char *label_text;
 414         char *radio_text;
 415 @@ -475,6 +483,7 @@
 416         gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
 417         gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
 418
 419 +#if ICONS_IN_DIALOGS
 420         /* Setup the main horizontal box */
 421         hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
 422         gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
 423 @@ -488,6 +497,9 @@
 424         /* Vertical box */
 425         vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
 426         gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
 427 +#else
 428 +       vbox = GTK_DIALOG(dialog)->vbox;
 429 +#endif
 430
 431         /* Descriptive label */
 432         primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL;
 433 @@ -536,9 +548,11 @@
 434         GaimGtkRequestData *data;
 435         GtkWidget *dialog;
 436         GtkWidget *vbox;
 437 -       GtkWidget *hbox;
 438         GtkWidget *label;
 439 +#if ICONS_IN_DIALOGS
 440 +       GtkWidget *hbox;
 441         GtkWidget *img;
 442 +#endif
 443         void **buttons;
 444         char *label_text;
 445         char *primary_esc, *secondary_esc;
 446 @@ -584,6 +598,7 @@
 447         gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
 448         gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
 449
 450 +#if ICONS_IN_DIALOGS
 451         /* Setup the main horizontal box */
 452         hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
 453         gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
 454 @@ -597,7 +612,10 @@
 455         /* Vertical box */
 456         vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
 457         gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
 458 -
 459 +#else
 460 +       vbox = GTK_DIALOG(dialog)->vbox;
 461 +#endif
 462 +
 463         /* Descriptive label */
 464         primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL;
 465         secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL;
 466 @@ -620,10 +638,12 @@
 467
 468
 469      if (default_action == GAIM_DEFAULT_ACTION_NONE) {
 470 +#if ICONS_IN_DIALOGS
 471                 GTK_WIDGET_SET_FLAGS(img, GTK_CAN_DEFAULT);
 472                 GTK_WIDGET_SET_FLAGS(img, GTK_CAN_FOCUS);
 473                 gtk_widget_grab_focus(img);
 474                 gtk_widget_grab_default(img);
 475 +#endif
 476      } else
 477                 gtk_dialog_set_default_response(GTK_DIALOG(dialog), default_action);
 478
 479 @@ -1351,13 +1371,15 @@
 480         GtkWidget *win;
 481         GtkWidget *vbox;
 482         GtkWidget *vbox2;
 483 -       GtkWidget *hbox;
 484         GtkWidget *bbox;
 485         GtkWidget *frame;
 486         GtkWidget *label;
 487         GtkWidget *table;
 488         GtkWidget *button;
 489 +#if ICONS_IN_DIALOGS
 490 +       GtkWidget *hbox;
 491         GtkWidget *img;
 492 +#endif
 493         GtkWidget *sw;
 494         GtkSizeGroup *sg;
 495         GList *gl, *fl;
 496 @@ -1392,6 +1414,7 @@
 497         g_signal_connect(G_OBJECT(win), "delete_event",
 498                                          G_CALLBACK(destroy_multifield_cb), data);
 499
 500 +#if ICONS_IN_DIALOGS
 501         /* Setup the main horizontal box */
 502         hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
 503         gtk_container_add(GTK_CONTAINER(win), hbox);
 504 @@ -1407,6 +1430,10 @@
 505         /* Setup the vbox */
 506         vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
 507         gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
 508 +#else
 509 +       vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
 510 +       gtk_container_add(GTK_CONTAINER(win), vbox);
 511 +#endif
 512         gtk_widget_show(vbox);
 513
 514         sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);