← Back to branch summary

~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge1

« back to all changes in this revision

Viewing changes to toolbox/toolbox-gtk.c

  • Committer: Evan Broder
  • Date: 2010-03-21 23:26:53 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: broder@mit.edu-20100321232653-5a57r7v7ch4o6byv
Merging shared upstream rev into target branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
toolbox/toolbox-gtk.c
108
108
/*
109
109
 * From toolboxInt.h
110
110
 */
111
 
GdkPixmap* pixmap;
112
 
GdkBitmap* bitmask;
113
 
GdkColormap* colormap;
 
111
GList *gIconList;
114
112
GtkWidget *optionsTimeSync;
115
113
GtkWidget *scriptsApply;
116
114
DblLnkLst_Links *gEventQueue;
356
354
   gtk_widget_show(dialog);
357
355
   gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
358
356
   gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 10);
359
 
   gdk_window_set_icon(dialog->window, NULL, pixmap, bitmask);
 
357
   gdk_window_set_icon_list(dialog->window, gIconList);
360
358
 
361
359
   label = gtk_label_new (msg);
362
360
   gtk_widget_show(label);
413
411
   gtk_widget_show(dialog);
414
412
   gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
415
413
   gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 10);
416
 
   gdk_window_set_icon(dialog->window, NULL, pixmap, bitmask);
 
414
   gdk_window_set_icon_list(dialog->window, gIconList);
417
415
   gtk_signal_connect(GTK_OBJECT(dialog), "destroy",
418
416
                      GTK_SIGNAL_FUNC(ToolsMain_YesNoBoxOnDestroy), &ret);
419
417
 
1075
1073
   Bool optIconify, optHelp, optVersion;
1076
1074
   struct sigaction olds[ARRAYSIZE(gSignals)];
1077
1075
   GKeyFile *pConfDict;
 
1076
   GdkPixbuf *iconPixbuf;
1078
1077
 
1079
1078
   if (!VmCheck_IsVirtualWorld()) {
1080
1079
      Warning("The VMware Toolbox must be run inside a virtual machine.\n");
1190
1189
                     DefaultScreen (GDK_DISPLAY ()));
1191
1190
   }
1192
1191
 
1193
 
   /* Create the icon from a pixmap */
1194
 
   colormap = gtk_widget_get_colormap(toolsMain);
1195
 
   pixmap = gdk_pixmap_colormap_create_from_xpm_d(NULL,colormap,&bitmask,NULL,
1196
 
                                                  smallIcon_xpm);
1197
 
   gdk_window_set_icon(toolsMain->window, NULL, pixmap, bitmask);
 
1192
   /*
 
1193
    * Cast below is needed, in perfect world gdk_pixbuf_new_from_xpm_data
 
1194
    * should be taking 'const char * const * data', not 'const char **data'.
 
1195
    */
 
1196
   iconPixbuf = gdk_pixbuf_new_from_xpm_data((const char**)smallIcon_xpm);
 
1197
   gIconList = g_list_append(gIconList, iconPixbuf);
 
1198
 
 
1199
   gdk_window_set_icon_list(toolsMain->window, gIconList);
1198
1200
 
1199
1201
   gXDisplay = GDK_WINDOW_XDISPLAY(toolsMain->window);
1200
1202
   gXRoot = RootWindow(gXDisplay, DefaultScreen(gXDisplay));
1214
1216
   Signal_ResetGroupHandler(gSignals, olds, ARRAYSIZE(gSignals));
1215
1217
   System_FreeNativeEnviron(gNativeEnviron);
1216
1218
 
1217
 
   gdk_pixmap_unref(pixmap);
1218
 
   gdk_bitmap_unref(bitmask);
 
1219
   g_list_foreach(gIconList, (GFunc)gdk_pixbuf_unref, NULL);
 
1220
   g_list_free(gIconList);
 
1221
 
1219
1222
   g_free(hlpDir);
1220
1223
 
1221
1224
   return 0;