Index: gnome1.2/gnome-utils-1.2.0/configure diff -c gnome1.2/gnome-utils-1.2.0/configure:1.1 gnome1.2/gnome-utils-1.2.0/configure:1.2 *** gnome1.2/gnome-utils-1.2.0/configure:1.1 Mon Jun 12 16:56:32 2000 --- gnome1.2/gnome-utils-1.2.0/configure Mon Aug 28 16:33:05 2000 *************** *** 6355,6373 **** echo "configure: warning: *** gfloppy will not be built." 1>&2 fi ! if $build_gfloppy; then ! subdirs="gfloppy" - fi ! ! if test "$build_gfloppy" = true; then ! BUILD_GFLOPPY_TRUE= ! BUILD_GFLOPPY_FALSE='#' ! else BUILD_GFLOPPY_TRUE='#' BUILD_GFLOPPY_FALSE= ! fi withval="" --- 6355,6374 ---- echo "configure: warning: *** gfloppy will not be built." 1>&2 fi ! # AIX do not build gfloppy ! #if $build_gfloppy; then ! # subdirs="gfloppy" ! # ! #fi ! #if test "$build_gfloppy" = true; then ! # BUILD_GFLOPPY_TRUE= ! # BUILD_GFLOPPY_FALSE='#' ! #else BUILD_GFLOPPY_TRUE='#' BUILD_GFLOPPY_FALSE= ! #fi withval="" Index: gnome1.2/gnome-utils-1.2.0/gcalc/gcalc.c diff -c gnome1.2/gnome-utils-1.2.0/gcalc/gcalc.c:1.1 gnome1.2/gnome-utils-1.2.0/gcalc/gcalc.c:1.2 *** gnome1.2/gnome-utils-1.2.0/gcalc/gcalc.c:1.1 Mon Jun 12 16:56:38 2000 --- gnome1.2/gnome-utils-1.2.0/gcalc/gcalc.c Mon Aug 28 16:34:30 2000 *************** *** 12,18 **** enum { TARGET_STRING, TARGET_TEXT, ! TARGET_COMPOUND_TEXT, }; static GtkWidget *app; --- 12,18 ---- enum { TARGET_STRING, TARGET_TEXT, ! TARGET_COMPOUND_TEXT }; static GtkWidget *app; Index: gnome1.2/gnome-utils-1.2.0/gdialog/colors.h diff -c gnome1.2/gnome-utils-1.2.0/gdialog/colors.h:1.1 gnome1.2/gnome-utils-1.2.0/gdialog/colors.h:1.2 *** gnome1.2/gnome-utils-1.2.0/gdialog/colors.h:1.1 Mon Jun 12 16:56:51 2000 --- gnome1.2/gnome-utils-1.2.0/gdialog/colors.h Thu Aug 31 12:17:29 2000 *************** *** 157,161 **** int value; } color_names_st; ! extern color_names_st color_names[]; extern int color_table[][3]; --- 157,161 ---- int value; } color_names_st; ! extern color_names_st mycolor_names[]; extern int color_table[][3]; Index: gnome1.2/gnome-utils-1.2.0/gdialog/dialog.c diff -c gnome1.2/gnome-utils-1.2.0/gdialog/dialog.c:1.1 gnome1.2/gnome-utils-1.2.0/gdialog/dialog.c:1.2 *** gnome1.2/gnome-utils-1.2.0/gdialog/dialog.c:1.1 Mon Jun 12 16:56:51 2000 --- gnome1.2/gnome-utils-1.2.0/gdialog/dialog.c Thu Aug 31 12:09:41 2000 *************** *** 63,69 **** int main(int argc, char *argv[]) { ! int offset = 0, clear_screen = 0, end_common_opts = 0, retval; const char *title = NULL; #ifdef LOCALE --- 63,69 ---- int main(int argc, char *argv[]) { ! int offset = 0, myclear_screen = 0, end_common_opts = 0, retval; const char *title = NULL; #ifdef LOCALE *************** *** 122,128 **** separate_output = 1; offset++; } else if (!strcmp(argv[offset + 1], "--clear")) { ! if (clear_screen) { /* Hey, "--clear" can't appear twice! */ Usage(argv[0]); exit(-1); } else if (argc == 2) { /* we only want to clear the screen */ --- 122,128 ---- separate_output = 1; offset++; } else if (!strcmp(argv[offset + 1], "--clear")) { ! if (myclear_screen) { /* Hey, "--clear" can't appear twice! */ Usage(argv[0]); exit(-1); } else if (argc == 2) { /* we only want to clear the screen */ *************** *** 131,137 **** end_dialog(); return 0; } else { ! clear_screen = 1; offset++; } } else /* no more common options */ --- 131,137 ---- end_dialog(); return 0; } else { ! myclear_screen = 1; offset++; } } else /* no more common options */ *************** *** 160,166 **** init_dialog(); retval = (*(modePtr->jumper)) (title, argc - offset, (const char * const *)argv + offset); ! if (clear_screen) { /* clear screen before exit */ attr_clear(stdscr, LINES, COLS, screen_attr); if(!gnome_mode) refresh(); } --- 160,166 ---- init_dialog(); retval = (*(modePtr->jumper)) (title, argc - offset, (const char * const *)argv + offset); ! if (myclear_screen) { /* clear screen before exit */ attr_clear(stdscr, LINES, COLS, screen_attr); if(!gnome_mode) refresh(); } Index: gnome1.2/gnome-utils-1.2.0/gdialog/rc.c diff -c gnome1.2/gnome-utils-1.2.0/gdialog/rc.c:1.1 gnome1.2/gnome-utils-1.2.0/gdialog/rc.c:1.2 *** gnome1.2/gnome-utils-1.2.0/gdialog/rc.c:1.1 Mon Jun 12 16:56:51 2000 --- gnome1.2/gnome-utils-1.2.0/gdialog/rc.c Thu Aug 31 12:17:49 2000 *************** *** 25,31 **** /* * For matching color names with color values */ ! color_names_st color_names[] = { {"BLACK", COLOR_BLACK}, {"RED", COLOR_RED}, --- 25,31 ---- /* * For matching color names with color values */ ! color_names_st mycolor_names[] = { {"BLACK", COLOR_BLACK}, {"RED", COLOR_RED}, *************** *** 427,439 **** strcpy (str, "("); /* foreground */ ! for (i = 0; fg != color_names[i].value; i++); ! strcat (str, color_names[i].name); strcat (str, ","); /* background */ ! for (i = 0; bg != color_names[i].value; i++); ! strcat (str, color_names[i].name); /* highlight */ strcat (str, hl ? ",ON)" : ",OFF)"); --- 427,439 ---- strcpy (str, "("); /* foreground */ ! for (i = 0; fg != mycolor_names[i].value; i++); ! strcat (str, mycolor_names[i].name); strcat (str, ","); /* background */ ! for (i = 0; bg != mycolor_names[i].value; i++); ! strcat (str, mycolor_names[i].name); /* highlight */ strcat (str, hl ? ",ON)" : ",OFF)"); *************** *** 489,503 **** return -1; /* invalid representation */ } tempstr[i++] = '\0'; /* skip the ',' */ ! for (j = 0; j < COLOR_COUNT && strcasecmp (part, color_names[j].name); j++); if (j == COLOR_COUNT) /* invalid color name */ return -1; if (get_fg) { ! *fg = color_names[j].value; get_fg = 0; /* next we have to get the background */ } else { ! *bg = color_names[j].value; break; } } /* got foreground and background */ --- 489,503 ---- return -1; /* invalid representation */ } tempstr[i++] = '\0'; /* skip the ',' */ ! for (j = 0; j < COLOR_COUNT && strcasecmp (part, mycolor_names[j].name); j++); if (j == COLOR_COUNT) /* invalid color name */ return -1; if (get_fg) { ! *fg = mycolor_names[j].value; get_fg = 0; /* next we have to get the background */ } else { ! *bg = mycolor_names[j].value; break; } } /* got foreground and background */ Index: gnome1.2/gnome-utils-1.2.0/gdictsrc/Makefile.in diff -c gnome1.2/gnome-utils-1.2.0/gdictsrc/Makefile.in:1.1 gnome1.2/gnome-utils-1.2.0/gdictsrc/Makefile.in:1.2 *** gnome1.2/gnome-utils-1.2.0/gdictsrc/Makefile.in:1.1 Mon Jun 12 16:56:43 2000 --- gnome1.2/gnome-utils-1.2.0/gdictsrc/Makefile.in Thu Aug 31 11:58:32 2000 *************** *** 165,171 **** gdict_SOURCES = gdict-about.c gdict-about.h gdict-pref.c gdict-pref.h gdict-pref-dialog.c gdict-pref-dialog.h gdict-app.c gdict-app.h gdict-applet.c gdict-applet.h gdict-defbox.c gdict-defbox.h gdict-speller.c gdict-speller.h dict.c dict.h main.c ! gdict_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(GNOME_APPLETS_LIBS) $(GNOME_PRINT_LIBS) EXTRA_DIST = GDict.desktop gdict.desktop gdict.gnorba gdict.png --- 165,171 ---- gdict_SOURCES = gdict-about.c gdict-about.h gdict-pref.c gdict-pref.h gdict-pref-dialog.c gdict-pref-dialog.h gdict-app.c gdict-app.h gdict-applet.c gdict-applet.h gdict-defbox.c gdict-defbox.h gdict-speller.c gdict-speller.h dict.c dict.h main.c ! gdict_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(GNOME_APPLETS_LIBS) $(GNOME_PRINT_LIBS) $(INTLLIBS) EXTRA_DIST = GDict.desktop gdict.desktop gdict.gnorba gdict.png Index: gnome1.2/gnome-utils-1.2.0/logview/log_repaint.c diff -c gnome1.2/gnome-utils-1.2.0/logview/log_repaint.c:1.1 gnome1.2/gnome-utils-1.2.0/logview/log_repaint.c:1.2 *** gnome1.2/gnome-utils-1.2.0/logview/log_repaint.c:1.1 Mon Jun 12 16:56:36 2000 --- gnome1.2/gnome-utils-1.2.0/logview/log_repaint.c Mon Aug 28 16:36:33 2000 *************** *** 589,596 **** --- 589,603 ---- { char buf[100]; int h, centery, skip; + #ifdef _AIX + GdkColor color[3]; + color[0] = cfg->blue1; + color[1] = cfg->blue; + color[2] = cfg->blue3; + #else GdkColor color[] = {cfg->blue1, cfg->blue, cfg->blue3}; + #endif h = cfg->headingb->ascent - cfg->headingb->descent; skip = (log_line_sep - cfg->fixed->ascent + cfg->fixed->descent); *************** *** 613,620 **** --- 620,634 ---- void DrawLogCursor (int y) { + #ifdef _AIX + GdkColor color[3]; + color[0] = cfg->gray25; + color[1] = cfg->gray50; + color[2] = cfg->gray75; + #else GdkColor color[] = {cfg->gray25, cfg->gray50, cfg->gray75}; + #endif Draw3DBox (canvas, gc, 5, y - log_line_sep + 3, canvas_width - 10, log_line_sep, color); }