xdialog/repos/community-x86_64/xdialog-2.3.1-gtk2.patch

   1 diff -Naur Xdialog-2.3.1-orig/src/interface.c Xdialog-2.3.1/src/interface.c
   2 --- Xdialog-2.3.1-orig/src/interface.c  2006-08-18 18:13:12.000000000 +0200
   3 +++ Xdialog-2.3.1/src/interface.c       2006-10-17 21:33:45.000000000 +0200
   4 @@ -183,6 +183,11 @@
   5         /* Open a new GTK top-level window */
   6         window = Xdialog.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   7
   8 +       /* Set window icon (in GTK2 mode only)  */
   9 +       #ifdef USE_GTK2
  10 +               gtk_window_set_icon_name(window, Xdialog.icon_file);
  11 +       #endif
  12 +
  13         /* Apply the custom GTK+ theme, if any. */
  14         parse_rc_file();
  15
  16 @@ -276,9 +281,6 @@
  17  {
  18         GtkWidget *label;
  19         GtkWidget *hbox;
  20 -       GdkBitmap *mask;
  21 -       GdkColor  transparent;
  22 -       GdkPixmap *pixmap;
  23         GtkWidget *icon;
  24         gchar     text[MAX_LABEL_LENGTH];
  25         int icon_width = 0;
  26 @@ -287,6 +289,22 @@
  27         gtk_box_pack_start(Xdialog.vbox, hbox, expand, TRUE, ymult/3);
  28
  29         if (Xdialog.icon) {
  30 +
  31 +#ifdef USE_GTK2
  32 +               if (Xdialog.icon_file != NULL) {
  33 +                       icon = gtk_image_new_from_icon_name (Xdialog.icon_file, GTK_ICON_SIZE_DIALOG);
  34 +                       /*icon = gtk_image_new_from_file (Xdialog.icon_file);*/
  35 +
  36 +                       gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, FALSE, 2);
  37 +                       gtk_widget_show(icon);
  38 +                       icon_width = 60;
  39 +               }
  40 +
  41 +#else
  42 +
  43 +         GdkBitmap *mask;
  44 +         GdkColor  transparent;
  45 +         GdkPixmap *pixmap;
  46                 pixmap = gdk_pixmap_create_from_xpm(Xdialog.window->window,
  47                                                     &mask, &transparent,
  48                                                     Xdialog.icon_file);
  49 @@ -298,6 +316,9 @@
  50                         gtk_widget_show(icon);
  51                         icon_width = icon->requisition.width + 4;
  52                 }
  53 +
  54 +#endif
  55 +
  56         }
  57
  58         trim_string(label_text, text, MAX_LABEL_LENGTH);