diff -uNr gnome-core-0.25/Makefile.am gnome-core-0.27/Makefile.am --- gnome-core-0.25/Makefile.am Wed Aug 5 19:51:47 1998 +++ gnome-core-0.27/Makefile.am Thu Aug 13 08:07:41 1998 @@ -5,7 +5,7 @@ SUBDIRS = intl po macros \ panel applets \ gsm pixmaps desktop-links desktop-properties help-browser \ - gnome-terminal core-docs $(gmenu) + gnome-terminal core-docs $(gmenu) ## to automatically rebuild aclocal.m4 if any of the macros in `macros/' change @MAINT@include macros/macros.dep diff -uNr gnome-core-0.25/Makefile.in gnome-core-0.27/Makefile.in --- gnome-core-0.25/Makefile.in Wed Aug 5 20:25:27 1998 +++ gnome-core-0.27/Makefile.in Thu Aug 13 08:15:11 1998 @@ -123,7 +123,7 @@ SUBDIRS = intl po macros \ panel applets \ gsm pixmaps desktop-links desktop-properties help-browser \ - gnome-terminal core-docs $(gmenu) + gnome-terminal core-docs $(gmenu) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h diff -uNr gnome-core-0.25/applets/ChangeLog gnome-core-0.27/applets/ChangeLog --- gnome-core-0.25/applets/ChangeLog Mon Aug 3 13:34:05 1998 +++ gnome-core-0.27/applets/ChangeLog Thu Aug 13 00:19:21 1998 @@ -1,3 +1,19 @@ +Wed Aug 12 21:08:46 1998 George Lebl + + * cpuload/cpuload.c: fixed a memory leak + +Wed Aug 12 21:04:42 1998 George Lebl + + * cpumemusage/procbar.c: check for cases of allocation being + 0x0, and don't draw in those cases + +Tue Aug 11 11:30:04 1998 Owen Taylor + + * cpumemusage/proc.c (proc_read_mem): Account for + buffers when computing totals. + + * cpumemusage/procbar.c: Make bars switch orientation with panel. + 1998-08-02 Raja R Harinath * Makefile.am (cdplayer,mixer,modemlights): New variables. diff -uNr gnome-core-0.25/applets/applet-dirs/Amusements.directory gnome-core-0.27/applets/applet-dirs/Amusements.directory --- gnome-core-0.25/applets/applet-dirs/Amusements.directory Thu Jul 9 15:39:29 1998 +++ gnome-core-0.27/applets/applet-dirs/Amusements.directory Mon Aug 10 04:07:11 1998 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Amusements +Name[es]=Divertimientos Name[fr]=Amusements Name[de]=Unterhaltsames Name[ko]=재미 @@ -7,6 +8,7 @@ Name[pl]=Zabawki Name[pt]=Curiosidades Comment=Amusements +Comment[es]=Applets de divertimientos de GNOME Comment[de]=Unterhaltsame GNOME Applets Comment[fr]=Amusements Comment[ko]=재미 diff -uNr gnome-core-0.25/applets/applet-dirs/Monitors.directory gnome-core-0.27/applets/applet-dirs/Monitors.directory --- gnome-core-0.25/applets/applet-dirs/Monitors.directory Thu Jul 9 15:39:29 1998 +++ gnome-core-0.27/applets/applet-dirs/Monitors.directory Mon Aug 10 04:07:11 1998 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Monitors +Name[es]=Monitores Name[no]=Monitorer Name[fr]=Moniteurs Name[de]=Statusanzeigen @@ -7,6 +8,7 @@ Name[pl]=Monitory Name[pt]=Monitores Comment=System Monitors, etc ... +Comment[es]=Monitores del sistema, etc ... Comment[no]=Systemmonitorer, osv ... Comment[de]=GNOME Statusanzeigen Comment[ko]=시스템 상태 모니터, 등등 ... diff -uNr gnome-core-0.25/applets/applet-dirs/Multimedia.directory gnome-core-0.27/applets/applet-dirs/Multimedia.directory --- gnome-core-0.25/applets/applet-dirs/Multimedia.directory Thu Jul 9 15:39:30 1998 +++ gnome-core-0.27/applets/applet-dirs/Multimedia.directory Mon Aug 10 04:07:11 1998 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Multimedia +Name[es]=Multimedia Name[de]=Multimedia Name[no]=Multimedia Name[ko]=멀티미디어 @@ -7,6 +8,7 @@ Name[fr]=Multimedia Name[pt]=Multim�dia Comment=Multimedia applets +Comment[es]=Applets multimedia Comment[de]=Multimedia Applets Comment[no]=Multimedia applets Comment[ko]=멀티미디어 애플릿 diff -uNr gnome-core-0.25/applets/applet-dirs/Network.directory gnome-core-0.27/applets/applet-dirs/Network.directory --- gnome-core-0.25/applets/applet-dirs/Network.directory Thu Jul 9 15:39:30 1998 +++ gnome-core-0.27/applets/applet-dirs/Network.directory Mon Aug 10 04:07:11 1998 @@ -8,7 +8,7 @@ Name[pl]=Sie� Name[pt]=Rede Comment=Network menu -Comment[es]=Men� de Red +Comment[es]=Applets relacionados a las redes Comment[ko]=네트워크 메뉴 Comment[fr]=Menu R�seau Comment[no]=Nettverksmeny diff -uNr gnome-core-0.25/applets/applet-dirs/Utility.directory gnome-core-0.27/applets/applet-dirs/Utility.directory --- gnome-core-0.25/applets/applet-dirs/Utility.directory Thu Jul 9 15:39:30 1998 +++ gnome-core-0.27/applets/applet-dirs/Utility.directory Mon Aug 10 04:07:11 1998 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Utility +Name[es]=Utiler�as Name[no]=Verkt�y Name[de]=Werkzeuge Name[ko]=도구 @@ -7,6 +8,7 @@ Name[fr]=Utilitaires Name[pt]=Utilit�rios Comment=Utility applets +Comment[es]=Applets de utiler�as de GNOME Comment[no]=Verkt�ysprogrammer Comment[de]=GNOME Werkzeuge Comment[ko]=도구 애플릿 diff -uNr gnome-core-0.25/applets/batmon/batmon_applet.desktop gnome-core-0.27/applets/batmon/batmon_applet.desktop --- gnome-core-0.25/applets/batmon/batmon_applet.desktop Thu Jul 9 15:40:39 1998 +++ gnome-core-0.27/applets/batmon/batmon_applet.desktop Mon Aug 10 04:07:11 1998 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Battery Monitor +Name[es]=Monitor de bater�a Name[fr]=Moniteur de Baterie Name[ko]=건전지 감시 Name[no]=Batterimonitor @@ -7,6 +8,7 @@ Name[pl]=Stan baterii Name[pt]=Monitor de Bateria Comment=Battery Monitor +Comment[es]=Muestra al estado de la bater�a Comment[fr]=Moniteur de Baterie GNOME Comment[ko]=건전지 감시 Comment[no]=Gnome Batterimonitor diff -uNr gnome-core-0.25/applets/cdplayer/cdplayer_applet.desktop gnome-core-0.27/applets/cdplayer/cdplayer_applet.desktop --- gnome-core-0.25/applets/cdplayer/cdplayer_applet.desktop Thu Jul 9 15:40:40 1998 +++ gnome-core-0.27/applets/cdplayer/cdplayer_applet.desktop Mon Aug 10 04:07:11 1998 @@ -1,5 +1,6 @@ [Desktop Entry] Name=CD Player +Name[es]=Lector de CD Name[fr]=Lecteur CD Name[ko]=CD 재생 Name[no]=CD-spiller @@ -7,6 +8,7 @@ Name[pl]=Odtwarzacz CD Name[pt]=Leitor de CD Comment=CD Player +Comment[es]=Lector de CD Comment[fr]=Lecteur CD GNOME Comment[ko]=CD 재생 Comment[no]=Gnome CD-spiller diff -uNr gnome-core-0.25/applets/clockmail/clockmail_applet.desktop gnome-core-0.27/applets/clockmail/clockmail_applet.desktop --- gnome-core-0.25/applets/clockmail/clockmail_applet.desktop Thu Jul 9 15:40:44 1998 +++ gnome-core-0.27/applets/clockmail/clockmail_applet.desktop Mon Aug 10 04:07:11 1998 @@ -1,10 +1,12 @@ [Desktop Entry] Name=Clock and Mailcheck +Name[es]=Reloj y buz�n Name[ko]=시계와 편지확인 Name[no]=Klokke og postsjekk Name[pl]=Zegar z monitorem poczty Name[pt]=Rel�gio e Caixa de Correio Comment=Displays new mail and time +Comment[es]=Muestra la hora y si se recibi� correo electr�nico Comment[ko]=새로운 편지와 시각을 알려줌 Comment[no]=Viser ny post og klokken Comment[pl]=Zegar z monitorem poczty diff -uNr gnome-core-0.25/applets/cpuload/cpuload.c gnome-core-0.27/applets/cpuload/cpuload.c --- gnome-core-0.25/applets/cpuload/cpuload.c Thu Jul 9 15:40:48 1998 +++ gnome-core-0.27/applets/cpuload/cpuload.c Thu Aug 13 00:19:22 1998 @@ -24,7 +24,7 @@ void start_timer( void ); GtkWidget *cpuload; -GdkPixmap *pixmap; +GdkPixmap *pixmap = NULL; GtkWidget *disp; GdkGC *gc; GdkColor ucolor, scolor; @@ -94,6 +94,8 @@ static gint cpuload_configure(GtkWidget *widget, GdkEventConfigure *event) { + if(pixmap) + gdk_pixmap_unref(pixmap); pixmap = gdk_pixmap_new( widget->window, widget->allocation.width, widget->allocation.height, diff -uNr gnome-core-0.25/applets/cpuload/cpuload_applet.desktop gnome-core-0.27/applets/cpuload/cpuload_applet.desktop --- gnome-core-0.25/applets/cpuload/cpuload_applet.desktop Thu Jul 9 15:40:48 1998 +++ gnome-core-0.27/applets/cpuload/cpuload_applet.desktop Mon Aug 10 04:07:11 1998 @@ -1,5 +1,6 @@ [Desktop Entry] Name=CPULoad +Name[es]=Carga del CPU Name[fr]=Charge CPU Name[ko]=중앙처리장치 로드 Name[no]=ProsessorLast @@ -7,6 +8,7 @@ Name[pl]=Procesor Name[pt]=Carga CPU Comment=CPU Load Meter +Comment[es]=Muestra la carga del procesador Comment[fr]=Charge du processeur Comment[ko]=중앙처리장치 로드 측정 Comment[no]=M�ler for prosessorlast diff -uNr gnome-core-0.25/applets/cpumemusage/cpumemusage.c gnome-core-0.27/applets/cpumemusage/cpumemusage.c --- gnome-core-0.25/applets/cpumemusage/cpumemusage.c Thu Jul 9 15:40:56 1998 +++ gnome-core-0.27/applets/cpumemusage/cpumemusage.c Tue Aug 11 01:30:40 1998 @@ -3,6 +3,7 @@ * (C) 1997 The Free Software Foundation * * Author: Radek Doulik + * Orientation switching: Owen Taylor * */ @@ -43,6 +44,7 @@ static ProcInfo summary_info; static ProcBar *cpu, *mem, *swap = NULL; static GtkWidget *cpumemusage; +static GtkWidget *applet; static gint update_values () @@ -62,14 +64,39 @@ } static GtkWidget * -cpumemusage_widget () +pack_procbars(gboolean vertical) { - GtkWidget *vbox; + GtkWidget *box; + + if (vertical) { + box = gtk_hbox_new (TRUE, GNOME_PAD_SMALL >> 1); + gtk_widget_set_usize (box, 40, 80); + } else { + box = gtk_vbox_new (TRUE, GNOME_PAD_SMALL >> 1); + gtk_widget_set_usize (box, 80, 40); + } + + procbar_set_orient (cpu, vertical); + gtk_box_pack_start_defaults (GTK_BOX (box), cpu->hbox); + procbar_set_orient (mem, vertical); + gtk_box_pack_start_defaults (GTK_BOX (box), mem->hbox); + + if (swap) { + procbar_set_orient (swap, vertical); + gtk_box_pack_start_defaults (GTK_BOX (box), swap->hbox); + } - proc_read_mem (&summary_info); + gtk_widget_show (box); - vbox = gtk_vbox_new (TRUE, GNOME_PAD_SMALL >> 1); - gtk_widget_set_usize (vbox, 80, 40); + return box; +} + +static GtkWidget * +cpumemusage_widget () +{ + GtkWidget *box; + + proc_read_mem (&summary_info); cpu = procbar_new (NULL, PROC_CPU_SIZE-1, bar_cpu_colors, update_values); @@ -80,29 +107,63 @@ swap = procbar_new (NULL, PROC_SWAP_SIZE-1, bar_swap_colors, NULL); - gtk_box_pack_start_defaults (GTK_BOX (vbox), cpu->hbox); - gtk_box_pack_start_defaults (GTK_BOX (vbox), mem->hbox); + box = pack_procbars (FALSE); + procbar_start (cpu, 200); - if (swap) - gtk_box_pack_start_defaults (GTK_BOX (vbox), swap->hbox); + return box; +} - gtk_widget_show (vbox); - procbar_start (cpu, 200); - return vbox; +static void applet_change_orient(GtkWidget *w, PanelOrientType o, gpointer data) +{ + GtkWidget *box; + gboolean vertical; + + switch (o) { + case ORIENT_UP: + case ORIENT_DOWN: + vertical = FALSE; + break; + case ORIENT_LEFT: + case ORIENT_RIGHT: + vertical = TRUE; + break; + } + + if (swap) { + gtk_widget_ref (swap->hbox); + gtk_container_remove (GTK_CONTAINER(cpumemusage), swap->hbox); + } + gtk_widget_ref (cpu->hbox); + gtk_container_remove (GTK_CONTAINER(cpumemusage), cpu->hbox); + gtk_widget_ref (mem->hbox); + gtk_container_remove (GTK_CONTAINER(cpumemusage), mem->hbox); + + box = pack_procbars (vertical); + + if (swap) + gtk_widget_unref (swap->hbox); + gtk_widget_unref (cpu->hbox); + gtk_widget_unref (mem->hbox); + + gtk_container_remove (GTK_CONTAINER (applet), cpumemusage); + gtk_container_add (GTK_CONTAINER (applet), box); + cpumemusage = box; } int main(int argc, char **argv) { - GtkWidget *applet; - applet_widget_init_defaults("cpumemusage_applet", NULL, argc, argv, 0, NULL, argv[0]); applet = applet_widget_new(); if (!applet) g_error("Can't create applet!\n"); + + gtk_signal_connect(GTK_OBJECT(applet),"change_orient", + GTK_SIGNAL_FUNC(applet_change_orient), + NULL); cpumemusage = cpumemusage_widget(); applet_widget_add( APPLET_WIDGET(applet), cpumemusage ); diff -uNr gnome-core-0.25/applets/cpumemusage/cpumemusage_applet.desktop gnome-core-0.27/applets/cpumemusage/cpumemusage_applet.desktop --- gnome-core-0.25/applets/cpumemusage/cpumemusage_applet.desktop Thu Jul 9 15:40:56 1998 +++ gnome-core-0.27/applets/cpumemusage/cpumemusage_applet.desktop Mon Aug 10 04:07:11 1998 @@ -1,5 +1,6 @@ [Desktop Entry] Name=CPU/MEM usage +Name[es]=Utilizaci�n Memoria/CPU Name[fr]=Utilisation M�moire/CPU Name[ko]=중앙처리장치/기억장치 사용량 Name[no]=Prosessor/Minne-bruk @@ -7,6 +8,7 @@ Name[pl]=Procesor i pami唯 Name[pt]=Uso de Mem/CPU Comment=CPU/MEM usage meter +Comment[es]=Muestra la utilizaci�n de la memoria y del tiempo procesador Comment[fr]=Utilisation M�moire/CPU Comment[ko]=중앙처리장치/기억장치 사용량 측정 Comment[no]=M�ler for bruk av prosessor og minne diff -uNr gnome-core-0.25/applets/cpumemusage/proc.c gnome-core-0.27/applets/cpumemusage/proc.c --- gnome-core-0.25/applets/cpumemusage/proc.c Thu Jul 9 15:40:56 1998 +++ gnome-core-0.27/applets/cpumemusage/proc.c Tue Aug 11 01:30:40 1998 @@ -50,7 +50,8 @@ ps->mem [PROC_MEM_USER] = ps->mem [PROC_MEM_TOTAL] - ps->mem [PROC_MEM_FREE] - - ps->mem [PROC_MEM_SHARED]; + - ps->mem [PROC_MEM_SHARED] + - ps->mem [PROC_MEM_BUF]; /* printf ("Mem: %u %u %u %u %u %u\n", ps->mem [PROC_MEM_TOTAL], diff -uNr gnome-core-0.25/applets/cpumemusage/procbar.c gnome-core-0.27/applets/cpumemusage/procbar.c --- gnome-core-0.25/applets/cpumemusage/procbar.c Thu Jul 9 15:40:56 1998 +++ gnome-core-0.27/applets/cpumemusage/procbar.c Thu Aug 13 00:19:22 1998 @@ -39,6 +39,9 @@ procbar_configure (GtkWidget *w, GdkEventConfigure *e, ProcBar *pb) { gint i; + + if(w->allocation.width == 0 || w->allocation.height == 0) + return TRUE; /* printf ("procbar allocate %d %d\n", w->allocation.width, w->allocation.height); */ @@ -84,6 +87,7 @@ pb->first_request = 1; pb->colors = colors; pb->colors_allocated = 0; + pb->vertical = FALSE; pb->last = g_new (unsigned, n+1); pb->last [0] = 0; @@ -121,6 +125,12 @@ return pb; } +void +procbar_set_orient (ProcBar *pb, gboolean vertical) +{ + pb->vertical = vertical; +} + #define W (pb->bar) #define A ((pb->bar)->allocation) @@ -130,11 +140,12 @@ unsigned tot = val [0]; gint i; gint change = 0; - gint x; - gint wr, w; + gint offset; + gint lengthr, length; GdkGC *gc; - if (!GTK_WIDGET_REALIZED (pb->bar)) + if (!GTK_WIDGET_REALIZED (pb->bar) || + A.width == 0 || A.height == 0) return; /* check if values changed */ @@ -150,8 +161,8 @@ if (!change || !tot) return; - w = A.width; - x = 0; + length = pb->vertical ? A.height : A.width; + offset = 0; gc = gdk_gc_new (pb->bar->window); @@ -159,24 +170,31 @@ for (i=0; in; i++) { if (in-1) - wr = (unsigned) w * ((float)val [i+1]/tot); + lengthr = (unsigned) length * ((float)val [i+1]/tot); else - wr = A.width - x; + lengthr = (pb->vertical ? A.height : A.width) - offset; - /* printf ("%d %d %d %d\n", x, 0, wr, A.height); + /* printf ("%d %d %d %d\n", offset, 0, lengthr, A.height); printf ("%u ", val[i+1]); - printf ("%d ", wr); */ + printf ("%d ", lengthr); */ gdk_gc_set_foreground (gc, &pb->colors [i]); - gdk_draw_rectangle (pb->bs, - gc, - TRUE, - x, 0, - wr, A.height); + if (pb->vertical) + gdk_draw_rectangle (pb->bs, + gc, + TRUE, + 0, A.height - offset - lengthr, + A.width, lengthr); + else + gdk_draw_rectangle (pb->bs, + gc, + TRUE, + offset, 0, + lengthr, A.height); - x += wr; + offset += lengthr; } /* printf ("\n"); */ @@ -211,3 +229,4 @@ pb->tag = -1; } + diff -uNr gnome-core-0.25/applets/cpumemusage/procbar.h gnome-core-0.27/applets/cpumemusage/procbar.h --- gnome-core-0.25/applets/cpumemusage/procbar.h Thu Jul 9 15:40:56 1998 +++ gnome-core-0.27/applets/cpumemusage/procbar.h Tue Aug 11 01:30:40 1998 @@ -11,6 +11,8 @@ GtkWidget *frame; GtkWidget *bar; + gboolean vertical : 1; + GdkPixmap *bs; GdkColor *colors; @@ -28,6 +30,7 @@ gint n, GdkColor *colors, gint (*cb)()); void procbar_set_values (ProcBar *pb, unsigned val []); +void procbar_set_orient (ProcBar *pb, gboolean vertical); void procbar_start (ProcBar *pb, gint time); void procbar_stop (ProcBar *pb); diff -uNr gnome-core-0.25/applets/dialer/dialer_applet.desktop gnome-core-0.27/applets/dialer/dialer_applet.desktop --- gnome-core-0.25/applets/dialer/dialer_applet.desktop Thu Jul 9 15:40:56 1998 +++ gnome-core-0.27/applets/dialer/dialer_applet.desktop Mon Aug 10 04:07:12 1998 @@ -1,11 +1,13 @@ [Desktop Entry] Name=PPP Dialer +Name[es]=Discador PPP Name[ko]=PPP 걸기 Name[no]=PPP-oppringing Name[pl]=Po낢czenie PPP Name[fr]=Num�roteur PPP Name[pt]=Liga豫o PPP Comment=PPP Dialer +Comment[es]=Inicia/termina una conexi�n PPP Comment[ko]=PPP 걸기 Comment[no]=Program for PPP-oppringing Comment[pl]=Obs퀅ga po쿪czenia PPP diff -uNr gnome-core-0.25/applets/diskusage/diskusage_applet.desktop gnome-core-0.27/applets/diskusage/diskusage_applet.desktop --- gnome-core-0.25/applets/diskusage/diskusage_applet.desktop Thu Jul 9 15:40:57 1998 +++ gnome-core-0.27/applets/diskusage/diskusage_applet.desktop Mon Aug 10 04:07:12 1998 @@ -1,13 +1,15 @@ [Desktop Entry] Name=DISK usage -Name[fr]=Utilisation Disk +Name[es]=Utilizaci�n Disco +Name[fr]=Utilisation Disque Name[ko]=디스크 사용량 Name[no]=Diskbruk Name[de]=Disk Usage Name[pl]=Przestrze� dyskowa Name[pt]=Utiliza豫o dos discos Comment=Disk usage meter -Comment[fr]=Disk usage meter +Comment[es]=Muestra el porcentage de espacio disco utilizado +Comment[fr]=Montre les pourcentages d'utilisation du disque Comment[ko]=디스크 사용량 측정 Comment[no]=Oversikt over diskbruk Comment[de]=Disk usage meter diff -uNr gnome-core-0.25/applets/diskusage/diskusage_read.c gnome-core-0.27/applets/diskusage/diskusage_read.c --- gnome-core-0.25/applets/diskusage/diskusage_read.c Thu Jul 9 15:40:57 1998 +++ gnome-core-0.27/applets/diskusage/diskusage_read.c Thu Aug 13 00:19:24 1998 @@ -48,14 +48,14 @@ if ((ps->filesystems + i)->dev_name) free ((ps->filesystems + i)->dev_name); (ps->filesystems + i)->dev_name = - g_new(gchar, strlen (me->me_devname)); + g_new(gchar, strlen (me->me_devname)+1); strcpy ((ps->filesystems + i)->dev_name, me->me_devname); if ((ps->filesystems + i)->mount_dir) free ((ps->filesystems + i)->mount_dir); (ps->filesystems + i)->mount_dir = - g_new(gchar, strlen (me->me_mountdir)); + g_new(gchar, strlen (me->me_mountdir)+1); strcpy ((ps->filesystems + i)->mount_dir, me->me_mountdir); diff -uNr gnome-core-0.25/applets/diskusage/mountlist.c gnome-core-0.27/applets/diskusage/mountlist.c --- gnome-core-0.25/applets/diskusage/mountlist.c Thu Jul 9 15:40:58 1998 +++ gnome-core-0.27/applets/diskusage/mountlist.c Thu Aug 13 00:19:25 1998 @@ -355,7 +355,7 @@ #ifdef __NetBSD__ me->me_type = xstrdup (fsp->f_fstypename); #else - me->me_type = fstype_to_string (fsp->f_type); + me->me_type = xstrdup (fstype_to_string (fsp->f_type)); #endif me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ me->me_next = NULL; @@ -380,7 +380,7 @@ me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry)); me->me_devname = xstrdup (fsd.fd_req.devname); me->me_mountdir = xstrdup (fsd.fd_req.path); - me->me_type = gt_names[fsd.fd_req.fstype]; + me->me_type = xstrdup (gt_names[fsd.fd_req.fstype]); me->me_dev = fsd.fd_req.dev; me->me_next = NULL; @@ -417,7 +417,7 @@ me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry)); me->me_devname = xstrdup (stats[counter].f_mntfromname); me->me_mountdir = xstrdup (stats[counter].f_mntonname); - me->me_type = mnt_names[stats[counter].f_type]; + me->me_type = xstrdup (mnt_names[stats[counter].f_type]); me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ me->me_next = NULL; @@ -452,7 +452,7 @@ #endif me->me_mountdir = xstrdup (mnt.mt_filsys); me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ - me->me_type = ""; + me->me_type = xstrdup (""); #ifdef GETFSTYP /* SVR3. */ if (need_fs_type) { diff -uNr gnome-core-0.25/applets/drivemount/drivemount_applet.desktop gnome-core-0.27/applets/drivemount/drivemount_applet.desktop --- gnome-core-0.25/applets/drivemount/drivemount_applet.desktop Thu Jul 9 15:40:59 1998 +++ gnome-core-0.27/applets/drivemount/drivemount_applet.desktop Mon Aug 10 04:07:12 1998 @@ -1,10 +1,12 @@ [Desktop Entry] Name=Drive Mount +Name[es]=Montador de discos Name[no]=Diskkobling Name[pl]=Obs퀅ga nap�d�w Name[fr]=Montage de disques Name[pt]=Drive Mount Comment=Mounts and unmount drives +Comment[es]=Permite montar/desmontar discos/disquettes/CD/... Comment[no]=Kobler til og ifra disker Comment[pl]=Montuje i odmontowuje nap�dy Comment[fr]=Montage de disques diff -uNr gnome-core-0.25/applets/fish/fish_applet.desktop gnome-core-0.27/applets/fish/fish_applet.desktop --- gnome-core-0.25/applets/fish/fish_applet.desktop Thu Jul 9 15:45:36 1998 +++ gnome-core-0.27/applets/fish/fish_applet.desktop Mon Aug 10 04:07:12 1998 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Fish +Name[es]=Pez Name[fr]=Poisson Name[cs]=Ryba Name[de]=Fisch @@ -8,6 +9,7 @@ Name[pl]=Rybka Name[pt]=Peixe Comment=Fish +Comment[es]=El pececillo de GNOME Comment[fr]=Poisson GNOME Comment[cs]=Ryba Comment[de]=GNOME Fisch Applet diff -uNr gnome-core-0.25/applets/gen_util/clock_applet.desktop gnome-core-0.27/applets/gen_util/clock_applet.desktop --- gnome-core-0.25/applets/gen_util/clock_applet.desktop Thu Jul 9 15:45:37 1998 +++ gnome-core-0.27/applets/gen_util/clock_applet.desktop Mon Aug 10 04:07:12 1998 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Clock Name[cs]=Hodiny +Name[es]=Reloj Name[fr]=Horloge Name[ko]=시계 Name[no]=Klokke @@ -9,6 +10,7 @@ Name[pt]=Rel�gio Comment=Clock Comment[cs]=Hodiny +Comment[es]=Reloj de Gnome Comment[fr]=Horloge Gnome Comment[ko]=시계 Comment[no]=Gnome klokke diff -uNr gnome-core-0.25/applets/gen_util/mailcheck_applet.desktop gnome-core-0.27/applets/gen_util/mailcheck_applet.desktop --- gnome-core-0.25/applets/gen_util/mailcheck_applet.desktop Thu Jul 9 15:45:45 1998 +++ gnome-core-0.27/applets/gen_util/mailcheck_applet.desktop Mon Aug 10 04:07:12 1998 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Mailcheck +Name[es]=Buz�n Name[fr]=Mailcheck Name[ko]=편지 확인 Name[no]=Postsjekk @@ -7,6 +8,7 @@ Name[pl]=Monitor poczty Name[pt]=Caixa Correio Comment=Mailcheck +Comment[es]=Muestra si se recibi� correo electr�nico Comment[fr]=Mailcheck Comment[ko]=편지 확인 Comment[no]=Sjekk for post diff -uNr gnome-core-0.25/applets/gen_util/printer.desktop gnome-core-0.27/applets/gen_util/printer.desktop --- gnome-core-0.25/applets/gen_util/printer.desktop Thu Jul 9 15:46:19 1998 +++ gnome-core-0.27/applets/gen_util/printer.desktop Mon Aug 10 04:07:12 1998 @@ -1,12 +1,14 @@ [Desktop Entry] Name=Printer Applet Name[fr]=Impression +Name[es]=Impresora Name[de]=Drucker Name[ko]=인쇄기 Name[no]=Skriver Name[pl]=Obs퀅ga wydruku Name[pt]=Impressora Comment=Printer Applet +Comment[es]=Monitor de impresi�n Comment[fr]=Moniteur d'Impression Comment[de]=Drucker Applet Comment[ko]=인쇄기 애플릿 diff -uNr gnome-core-0.25/applets/icewm-pager/wmpager_applet.desktop gnome-core-0.27/applets/icewm-pager/wmpager_applet.desktop --- gnome-core-0.25/applets/icewm-pager/wmpager_applet.desktop Wed Aug 5 12:42:24 1998 +++ gnome-core-0.27/applets/icewm-pager/wmpager_applet.desktop Mon Aug 10 04:07:12 1998 @@ -1,11 +1,13 @@ [Desktop Entry] Name=Pager +Name[es]=Pager Name[ko]=페이저 Name[no]=Persons�ker Name[pl]=Pager Name[fr]=Pagination Name[pt]=Pager Comment=Desktop Pager +Comment[es]=Permite navegar entre los diferentes escritorios virtuales Comment[ko]=데스크탑 페이저 Comment[no]=Persons�ker for skrivebordet Comment[pl]=Pager desktopu diff -uNr gnome-core-0.25/applets/mixer/mixer_applet.desktop gnome-core-0.27/applets/mixer/mixer_applet.desktop --- gnome-core-0.25/applets/mixer/mixer_applet.desktop Thu Jul 9 15:52:25 1998 +++ gnome-core-0.27/applets/mixer/mixer_applet.desktop Mon Aug 10 04:07:12 1998 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Mixer +Name[es]=Mezclador de sonidos Name[fr]=Mixer Name[ko]=볼륨 조정 Name[no]=Mikser @@ -7,6 +8,7 @@ Name[pl]=Mikser Name[pt]=Mesa de Mistura Comment=Audio Mixer +Comment[es]=Mezclador de sonidos Comment[fr]=Mixer Audio GNOME Comment[ko]=소리 볼륨 조정 Comment[no]=Gnome lydmikser diff -uNr gnome-core-0.25/applets/modemlights/modemlights_applet.desktop gnome-core-0.27/applets/modemlights/modemlights_applet.desktop --- gnome-core-0.25/applets/modemlights/modemlights_applet.desktop Thu Jul 9 15:52:28 1998 +++ gnome-core-0.27/applets/modemlights/modemlights_applet.desktop Mon Aug 10 04:07:12 1998 @@ -1,11 +1,13 @@ [Desktop Entry] Name=Modem Lights +Name[es]=Monitor Modem Name[ko]=모뎀 깜박이 Name[no]=Modemlys Name[pl]=Monitor modemu Name[fr]=Lumi�res du modem Name[pt]=Luzes do modem Comment=Show modem status +Comment[es]=Muestra el estado del modem Comment[ko]=모뎀 상태를 보여줌 Comment[no]=Vis modemstatus Comment[pl]=Pokazuje stan modemu diff -uNr gnome-core-0.25/applets/netload/netload_applet.desktop gnome-core-0.27/applets/netload/netload_applet.desktop --- gnome-core-0.25/applets/netload/netload_applet.desktop Thu Jul 9 15:52:33 1998 +++ gnome-core-0.27/applets/netload/netload_applet.desktop Mon Aug 10 04:07:12 1998 @@ -1,5 +1,6 @@ [Desktop Entry] Name=NetLoad +Name[es]=Carga de la red Name[fr]=Charge R�seau Name[de]=Netzlast Name[ko]=네트워크 로드 @@ -7,6 +8,7 @@ Name[pl]=Transfer sieciowy Name[pt]=Utiliza豫o Rede Comment=Network Activity Meter +Comment[es]=Muestra el nivel de utilizaci�n de la red Comment[fr]=Moniteur de la charge r�seau Comment[de]=Anzeige der Netzauslastung Comment[ko]=네트워크 로드 측정 diff -uNr gnome-core-0.25/applets/webcontrol/webcontrol_applet.desktop gnome-core-0.27/applets/webcontrol/webcontrol_applet.desktop --- gnome-core-0.25/applets/webcontrol/webcontrol_applet.desktop Thu Jul 9 15:53:16 1998 +++ gnome-core-0.27/applets/webcontrol/webcontrol_applet.desktop Mon Aug 10 04:07:14 1998 @@ -1,10 +1,12 @@ [Desktop Entry] Name=WebControl +Name[es]=Control WEB Name[ko]=웹 조종판 Name[pl]=Pasek adresu URL Name[fr]=WebControle Name[pt]=Controlo WEB Comment=WebControl +Comment[es]=Control WEB Comment[ko]=웹 조종판 Comment[pl]=Pasek adresu URL Comment[fr]=WebControle diff -uNr gnome-core-0.25/configure gnome-core-0.27/configure --- gnome-core-0.25/configure Wed Aug 5 19:40:06 1998 +++ gnome-core-0.27/configure Thu Aug 13 07:53:15 1998 @@ -721,7 +721,7 @@ PACKAGE=gnome-core -VERSION=0.25 +VERSION=0.27 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -6472,6 +6472,7 @@ help-browser/gnome-man2html/Makefile help-browser/gnome-info2html/Makefile gmenu/Makefile +control-center/Makefile pixmaps/Makefile gsm/Makefile smproxy/Makefile @@ -6665,6 +6666,7 @@ help-browser/gnome-man2html/Makefile help-browser/gnome-info2html/Makefile gmenu/Makefile +control-center/Makefile pixmaps/Makefile gsm/Makefile smproxy/Makefile diff -uNr gnome-core-0.25/configure.in gnome-core-0.27/configure.in --- gnome-core-0.25/configure.in Wed Aug 5 16:12:06 1998 +++ gnome-core-0.27/configure.in Thu Aug 13 07:52:45 1998 @@ -1,7 +1,7 @@ AC_INIT(desktop-properties) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gnome-core, 0.25) +AM_INIT_AUTOMAKE(gnome-core, 0.27) AM_MAINTAINER_MODE @@ -245,6 +245,7 @@ help-browser/gnome-man2html/Makefile help-browser/gnome-info2html/Makefile gmenu/Makefile +control-center/Makefile pixmaps/Makefile gsm/Makefile smproxy/Makefile diff -uNr gnome-core-0.25/core-docs/Makefile.am gnome-core-0.27/core-docs/Makefile.am --- gnome-core-0.25/core-docs/Makefile.am Mon Aug 3 13:34:06 1998 +++ gnome-core-0.27/core-docs/Makefile.am Tue Aug 11 01:31:30 1998 @@ -104,7 +104,7 @@ # will have in the gnome-intro directory. eventually I'll handle this # by calling it gnome-intro-prebuilt or something gnome-intro/gnome-intro.html: gnome-intro.sgml - db2html gnome-intro.sgml + -db2html gnome-intro.sgml -mkdir gnome-intro/pix cp pix/*.gif gnome-intro/pix if test -d gnome-intro.junk/CVS; then \ diff -uNr gnome-core-0.25/core-docs/Makefile.in gnome-core-0.27/core-docs/Makefile.in --- gnome-core-0.25/core-docs/Makefile.in Wed Aug 5 20:26:22 1998 +++ gnome-core-0.27/core-docs/Makefile.in Thu Aug 13 08:16:07 1998 @@ -313,7 +313,7 @@ # will have in the gnome-intro directory. eventually I'll handle this # by calling it gnome-intro-prebuilt or something gnome-intro/gnome-intro.html: gnome-intro.sgml - db2html gnome-intro.sgml + -db2html gnome-intro.sgml -mkdir gnome-intro/pix cp pix/*.gif gnome-intro/pix if test -d gnome-intro.junk/CVS; then \ diff -uNr gnome-core-0.25/desktop-links/Administration.directory gnome-core-0.27/desktop-links/Administration.directory --- gnome-core-0.25/desktop-links/Administration.directory Thu Jul 30 18:38:37 1998 +++ gnome-core-0.27/desktop-links/Administration.directory Mon Aug 10 04:07:14 1998 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Administration +Name[es]=Administraci�n Name[pt]=Administra豫o Comment=Administration menu +Comment[es]=Men� de Administraci�n Comment[pt]=Menu de Administra豫o Icon=gnome-folder.png Type=Directory diff -uNr gnome-core-0.25/desktop-links/Audio.directory gnome-core-0.27/desktop-links/Audio.directory --- gnome-core-0.25/desktop-links/Audio.directory Thu Jul 9 15:53:19 1998 +++ gnome-core-0.27/desktop-links/Audio.directory Mon Aug 10 04:07:14 1998 @@ -8,7 +8,7 @@ Name[de]=Audio Name[pt]=Audio Comment=Audio menu -Comment[es]=Men� de Audio +Comment[es]=Men� de programas audio Comment[ko]=오디오 메뉴 Comment[fr]=Menu Audio Comment[it]=Menu Audio diff -uNr gnome-core-0.25/desktop-links/Balsa.desktop gnome-core-0.27/desktop-links/Balsa.desktop --- gnome-core-0.25/desktop-links/Balsa.desktop Thu Jul 9 15:53:19 1998 +++ gnome-core-0.27/desktop-links/Balsa.desktop Mon Aug 10 04:07:14 1998 @@ -8,7 +8,7 @@ Name[no]=Balsa Name[pt]=Balsa Comment=E-Mail utility -Comment[es]=E-Mail utility +Comment[es]=Programa de correo electr�nico Comment[de]=E-Mail Programm Comment[ko]=전자우편 프로그램 Comment[fr]=Gestionnaire d'Email diff -uNr gnome-core-0.25/desktop-links/Eterm.desktop gnome-core-0.27/desktop-links/Eterm.desktop --- gnome-core-0.25/desktop-links/Eterm.desktop Thu Jul 9 15:53:19 1998 +++ gnome-core-0.27/desktop-links/Eterm.desktop Mon Aug 10 04:07:14 1998 @@ -8,7 +8,7 @@ Name[no]=Eterm Name[pt]=Eterm Comment=Eterm -Comment[es]=Eterm +Comment[es]=Terminal Eterm Comment[de]=Eterm Comment[ko]=Eterm 터미널 Comment[fr]=Terminal Eterm diff -uNr gnome-core-0.25/desktop-links/GIMP.desktop gnome-core-0.27/desktop-links/GIMP.desktop --- gnome-core-0.25/desktop-links/GIMP.desktop Thu Jul 9 15:53:19 1998 +++ gnome-core-0.27/desktop-links/GIMP.desktop Mon Aug 10 04:07:14 1998 @@ -8,7 +8,7 @@ Name[no]=GIMP Name[pt]=O GIMP Comment=GNU Image Manipulation Program -Comment[es]=GNU Image Manipulation Program +Comment[es]=Programa de manipulaci�n de im�genes GNU Comment[de]=GNU Image Manipulation Program Comment[ko]=GNU 그림 편집 프로그램 Comment[fr]=Le Programme de Manipulation d'Images GNU diff -uNr gnome-core-0.25/desktop-links/Gmc.desktop gnome-core-0.27/desktop-links/Gmc.desktop --- gnome-core-0.25/desktop-links/Gmc.desktop Thu Jul 9 15:53:19 1998 +++ gnome-core-0.27/desktop-links/Gmc.desktop Mon Aug 10 04:07:14 1998 @@ -1,6 +1,6 @@ [Desktop Entry] Name=File Manager -Name[es]=File Manager +Name[es]=Gestor de ficheros Name[de]=Dateimanager Name[ko]=파일 관리자 Name[fr]=Gestionnaire de fichiers @@ -8,7 +8,7 @@ Name[no]=Filbehandler Name[pt]=Gestor de Ficheiros Comment=Graphical File Manager -Comment[es]=Graphical File Manager +Comment[es]=Gestor de ficheros gr�fico Comment[de]=Grafischer Dateimanager Comment[ko]=그림 인터페이스의 파일 관리자 Comment[fr]=Gestionnaire de fichiers diff -uNr gnome-core-0.25/desktop-links/Graphics.directory gnome-core-0.27/desktop-links/Graphics.directory --- gnome-core-0.25/desktop-links/Graphics.directory Thu Jul 9 15:53:20 1998 +++ gnome-core-0.27/desktop-links/Graphics.directory Mon Aug 10 04:07:14 1998 @@ -8,7 +8,7 @@ Name[de]=Grafik Name[pt]=Gr�ficos Comment=Graphics menu -Comment[es]=Men� de Gr�ficos +Comment[es]=Men� de programas relacionados con gr�ficos Comment[ko]=그래픽 메뉴 Comment[fr]=Menu Graphiques Comment[it]=Menu Grafica diff -uNr gnome-core-0.25/desktop-links/Imlib_config.desktop gnome-core-0.27/desktop-links/Imlib_config.desktop --- gnome-core-0.25/desktop-links/Imlib_config.desktop Thu Jul 9 15:53:20 1998 +++ gnome-core-0.27/desktop-links/Imlib_config.desktop Mon Aug 10 04:07:14 1998 @@ -1,6 +1,6 @@ [Desktop Entry] Name=Imlib Configuration Options -Name[es]=Imlib Configuration Options +Name[es]=Configuraci�n de Imlib Name[de]=Imlib Einstellungen Name[ko]=Imlib 설정 옵션 Name[fr]=Configuration Imlib @@ -8,7 +8,7 @@ Name[no]=Imlib-konfigurering Name[pt]=Configura豫o da Imlib Comment=Image loading and display settings -Comment[es]=Image loading and display settings +Comment[es]=Configuraci�n de la apertura y visualizaci�n de im�genes Comment[de]=Einstellungen bzgl. des Ladens und Darstellens von Grafiken Comment[ko]=그림 읽기와 보여주기 관련 설정 Comment[fr]=Configuration de l'affichage et du chargement des images diff -uNr gnome-core-0.25/desktop-links/Kterm.desktop gnome-core-0.27/desktop-links/Kterm.desktop --- gnome-core-0.25/desktop-links/Kterm.desktop Wed Dec 31 19:00:00 1969 +++ gnome-core-0.27/desktop-links/Kterm.desktop Mon Aug 10 04:07:14 1998 @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Kanji terminal +Name[ja]=폽居체騫 +Comment=Japanese terminal emulation program +Comment[ja]=늑샙ㅗ쏟ㅁㅻ체騫 +Exec=kterm +Icon=kterm.xpm +Terminal=0 +Type=Application diff -uNr gnome-core-0.25/desktop-links/Makefile.am gnome-core-0.27/desktop-links/Makefile.am --- gnome-core-0.25/desktop-links/Makefile.am Thu Jul 30 18:38:37 1998 +++ gnome-core-0.27/desktop-links/Makefile.am Mon Aug 10 04:07:14 1998 @@ -35,7 +35,8 @@ Utilities_DATA = \ UNIX.desktop \ UNIX-regular.desktop \ - Eterm.desktop + Eterm.desktop \ + Kterm.desktop System_DATA = \ Imlib_config.desktop diff -uNr gnome-core-0.25/desktop-links/Makefile.in gnome-core-0.27/desktop-links/Makefile.in --- gnome-core-0.25/desktop-links/Makefile.in Wed Aug 5 20:26:13 1998 +++ gnome-core-0.27/desktop-links/Makefile.in Thu Aug 13 08:15:57 1998 @@ -155,7 +155,8 @@ Utilities_DATA = \ UNIX.desktop \ UNIX-regular.desktop \ - Eterm.desktop + Eterm.desktop \ + Kterm.desktop System_DATA = \ Imlib_config.desktop diff -uNr gnome-core-0.25/desktop-links/Network.directory gnome-core-0.27/desktop-links/Network.directory --- gnome-core-0.25/desktop-links/Network.directory Thu Jul 9 15:53:20 1998 +++ gnome-core-0.27/desktop-links/Network.directory Mon Aug 10 04:07:14 1998 @@ -8,7 +8,7 @@ Name[de]=Netzwerk Name[pt]=Rede Comment=Network menu -Comment[es]=Men� de Red +Comment[es]=Men� de programas relacionados con las redes Comment[ko]=네트워크 메뉴 Comment[fr]=Menu R�seau Comment[it]=Menu di Rete diff -uNr gnome-core-0.25/desktop-links/Productivity.directory gnome-core-0.27/desktop-links/Productivity.directory --- gnome-core-0.25/desktop-links/Productivity.directory Thu Jul 30 18:38:37 1998 +++ gnome-core-0.27/desktop-links/Productivity.directory Mon Aug 10 04:07:14 1998 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Productivity +Name[es]=Productividad Name[pt]=Produtividade Comment=Productivity menu +Comment[es]=Men� de Productividad Comment[pt]=Menu de Produtividade Icon=gnome-folder.png Type=Directory diff -uNr gnome-core-0.25/desktop-links/Tkrat.desktop gnome-core-0.27/desktop-links/Tkrat.desktop --- gnome-core-0.25/desktop-links/Tkrat.desktop Thu Jul 9 15:53:20 1998 +++ gnome-core-0.27/desktop-links/Tkrat.desktop Mon Aug 10 04:07:14 1998 @@ -8,7 +8,7 @@ Name[no]=Tkrat Name[pt]=Tkrat Comment=E-Mail utility -Comment[es]=E-Mail utility +Comment[es]=Programa de correo electr�nico Comment[de]=E-Mail Programm Comment[ko]=전자 우편 프로그램 Comment[fr]=Gestionnaire d'Email diff -uNr gnome-core-0.25/desktop-properties/ChangeLog gnome-core-0.27/desktop-properties/ChangeLog --- gnome-core-0.25/desktop-properties/ChangeLog Thu Jul 30 18:38:37 1998 +++ gnome-core-0.27/desktop-properties/ChangeLog Mon Aug 10 04:07:15 1998 @@ -1,3 +1,8 @@ +1998-08-06 Jaka Mocnik + + * property-ui.c (ui_setup, mdi_mode_cb, mdi_tab_pos_cb): added + MDI preferences page. + Fri Jul 24 22:58:26 1998 Havoc Pennington * property-ui.c (make_option_menu): New function to make the diff -uNr gnome-core-0.25/desktop-properties/bell.desktop gnome-core-0.27/desktop-properties/bell.desktop --- gnome-core-0.25/desktop-properties/bell.desktop Thu Jul 9 15:53:23 1998 +++ gnome-core-0.27/desktop-properties/bell.desktop Mon Aug 10 04:07:15 1998 @@ -1,6 +1,6 @@ [Desktop Entry] Name=Bell Properties -Name[es]=Bell Properties +Name[es]=Propriedades del "bip" Name[de]=Bell Properties Name[ko]=삑소리 설정 Name[fr]=Propri�t�s du "Bip" @@ -8,7 +8,7 @@ Name[no]=Egenskaper for ringeklokke Name[pt]=Propriedades do Beep Comment=Bell Properties -Comment[es]=Bell Properties +Comment[es]=Modifica las propiedades de los s�nidos relacionados con eventos del sistema Comment[de]=Bell Properties Comment[ko]=삑소리 설정 Comment[fr]=Propri�t�s du "Bip" diff -uNr gnome-core-0.25/desktop-properties/keyboard.desktop gnome-core-0.27/desktop-properties/keyboard.desktop --- gnome-core-0.25/desktop-properties/keyboard.desktop Thu Jul 9 15:53:23 1998 +++ gnome-core-0.27/desktop-properties/keyboard.desktop Mon Aug 10 04:07:15 1998 @@ -7,7 +7,7 @@ Name[no]=Egenskaper for tastatur Name[pt]=Propriedades do Teclado Comment=Keyboard Properties -Comment[es]=Propiedades del teclado +Comment[es]=Modifica las propiedades del teclado Comment[de]=Einstellungen f�r die Tastatur Comment[ko]=키보드 설정 Comment[fr]=Propri�t�s du clavier diff -uNr gnome-core-0.25/desktop-properties/mouse.desktop gnome-core-0.27/desktop-properties/mouse.desktop --- gnome-core-0.25/desktop-properties/mouse.desktop Thu Jul 9 15:53:23 1998 +++ gnome-core-0.27/desktop-properties/mouse.desktop Mon Aug 10 04:07:15 1998 @@ -7,7 +7,7 @@ Name[no]=Egenskaper for mus Name[pt]=Propriedades do Rato Comment=Mouse Properties -Comment[es]=Propiedades del rat�n +Comment[es]=Modifica las propiedades del rat�n Comment[de]=Einstellungen f�r die Maus Comment[ko]=마우스 설정 Comment[fr]=Propri�t�s de la souris diff -uNr gnome-core-0.25/desktop-properties/property-ui.c gnome-core-0.27/desktop-properties/property-ui.c --- gnome-core-0.25/desktop-properties/property-ui.c Thu Jul 30 18:38:37 1998 +++ gnome-core-0.27/desktop-properties/property-ui.c Mon Aug 10 04:07:15 1998 @@ -74,6 +74,24 @@ N_("Dialogs are treated specially by window manager") }; +#define NUM_MDI_MODES 3 + +/* looking for better descriptions here... */ +static const gchar * const mdi_mode_names[] = { + N_("Notebook"), + N_("Toplevel"), + N_("Modal") +}; + +#define NUM_TAB_POSITIONS 4 + +static const gchar * const tab_position_names[] = { + N_("Left"), + N_("Right"), + N_("Top"), + N_("Bottom") +}; + static void buttonbox_style_cb(GtkWidget * menuitem, gint style) { gnome_preferences_set_button_layout (style); @@ -92,6 +110,18 @@ property_changed(); } +static void mdi_mode_cb(GtkWidget * menuitem, gint mode) +{ + gnome_preferences_set_mdi_mode ((GnomeMDIMode)mode); + property_changed(); +} + +static void mdi_tab_pos_cb(GtkWidget * menuitem, gint pos) +{ + gnome_preferences_set_mdi_tab_pos ((GtkPositionType)pos); + property_changed(); +} + static void checkbutton_cb ( GtkWidget * button, void ( * set_func ) (gboolean) ) { @@ -234,6 +264,23 @@ gnome_property_box_append_page (GNOME_PROPERTY_BOX (config->property_box), vbox, gtk_label_new (_("Application"))); gtk_widget_show_all(vbox); + + vbox = gtk_vbox_new(FALSE, GNOME_PAD); + + make_option_menu(vbox,_("Default MDI mode"), + gnome_preferences_get_mdi_mode, + mdi_mode_names, NUM_MDI_MODES, + mdi_mode_cb); + + make_option_menu(vbox,_("MDI notebook tab position"), + gnome_preferences_get_mdi_tab_pos, + tab_position_names, NUM_TAB_POSITIONS, + mdi_tab_pos_cb); + + gnome_property_box_append_page (GNOME_PROPERTY_BOX (config->property_box), + vbox, gtk_label_new (_("MDI"))); + gtk_widget_show_all(vbox); + } static gint @@ -274,6 +321,7 @@ gnome_property_configurator_register (config, ui_action); /* Without this there's no handler for page two; ui_action can't be reused because it does the setup twice. Blah. */ + gnome_property_configurator_register (config, noop_action); gnome_property_configurator_register (config, noop_action); } diff -uNr gnome-core-0.25/desktop-properties/ui.desktop gnome-core-0.27/desktop-properties/ui.desktop --- gnome-core-0.25/desktop-properties/ui.desktop Thu Jul 9 15:53:23 1998 +++ gnome-core-0.27/desktop-properties/ui.desktop Mon Aug 10 04:07:15 1998 @@ -1,10 +1,12 @@ [Desktop Entry] Name=Look and Feel Properties +Name[es]=Propriedades de la Interface Name[fr]=Propri�t�s "Look&Feel" Name[ko]=겉모습 설정 Name[no]=Egenskaper for utseende Name[pt]=Propriedades da Interface Comment=Look and Feel Properties +Comment[es]=Modifica las propiedades de la interface con el usuario Comment[ko]=겉모습 설정 Comment[fr]=Propri�t�s "Look&Feel" Comment[no]=Egenskaper for utseende diff -uNr gnome-core-0.25/gmenu/ChangeLog gnome-core-0.27/gmenu/ChangeLog --- gnome-core-0.25/gmenu/ChangeLog Wed Aug 5 12:42:25 1998 +++ gnome-core-0.27/gmenu/ChangeLog Wed Aug 12 01:07:56 1998 @@ -4,6 +4,9 @@ <<<<<<< ChangeLog <<<<<<< ChangeLog <<<<<<< ChangeLog +<<<<<<< ChangeLog +<<<<<<< ChangeLog +<<<<<<< ChangeLog 1998-06-29 Miguel de Icaza * iconsel.c (icon_selection_dialog): Use the proper visual/colormap. @@ -13,6 +16,47 @@ ======= ======= ======= +======= +======= +======= +Wed Aug 12 06:10:04 1998 John Ellis + + * gmenu.[ch], tree.c (menu_item_selected): Reworked the tree selection + code, with tips from Lars Hamann. Now right clicking on an item will + copy it's contents to the edit area, double clicking was removed. + * gmenu.[ch], dialogs.c, edit.c, order.c, tree.c: Version now 0.3.0 + +>>>>>>> 1.29 +Tue Aug 11 07:43:52 1998 John Ellis + + * gmenu.c: Added gnome style toolbar in favor of the old row of + buttons below the tree of menus. Main window is not displayed until + after the menus are read, which was distracting attention from the + standy dialog, resulting in a cleaner looking startup. + +>>>>>>> 1.28 +Mon Aug 10 08:41:14 1998 John Ellis + + * tree.c: Quick hack to test a standby dialog while gmenu reads the + menus. If interested in seeing 'walking gnome feet', please try this + out and tell me if it's just code bloat. On really fast machines, + this dialog may be too quick to really see anything. + * wait-feet.h: The pixmaps for the walking feet. Was larger, but + managed to use less colors to decrease size. + +Sun Aug 9 14:12:18 1998 John Ellis + + * tree.c: cleanups, fixes, and optimizations. + (get_ctree_count): new function to calculate # of nodes in a ctree, + maybe a similar routine should be in gtkctree.[ch] ? + +Sun Aug 9 11:55:11 1998 John Ellis + + * gmenu.c (sort node), (sort_single_pressed), (sort_recurse_cb), + (sort_recursive_pressed): new functions, added sorting of folders + (non) recursively. + +>>>>>>> 1.27 1998-08-04 Nuno Ferreira * gmenu.c (main): Marked string for translation. diff -uNr gnome-core-0.25/gmenu/Makefile.am gnome-core-0.27/gmenu/Makefile.am --- gnome-core-0.25/gmenu/Makefile.am Mon Jul 20 13:05:14 1998 +++ gnome-core-0.27/gmenu/Makefile.am Thu Aug 13 08:14:59 1998 @@ -7,6 +7,7 @@ gmenu_SOURCES = \ gmenu.c \ gmenu.h \ + wait-feet.h \ tree.c \ edit.c \ order.c \ diff -uNr gnome-core-0.25/gmenu/Makefile.in gnome-core-0.27/gmenu/Makefile.in --- gnome-core-0.25/gmenu/Makefile.in Wed Aug 5 20:26:24 1998 +++ gnome-core-0.27/gmenu/Makefile.in Thu Aug 13 08:16:11 1998 @@ -127,6 +127,7 @@ gmenu_SOURCES = \ gmenu.c \ gmenu.h \ + wait-feet.h \ tree.c \ edit.c \ order.c \ @@ -301,12 +302,11 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done -dialogs.o: dialogs.c gmenu.h iconsel.h -edit.o: edit.c gmenu.h iconsel.h unknown.xpm -gmenu.o: gmenu.c gmenu.h iconsel.h unknown.xpm up.xpm down.xpm -iconsel.o: iconsel.c gmenu.h iconsel.h -order.o: order.c gmenu.h iconsel.h folder.xpm unknown.xpm -tree.o: tree.c gmenu.h iconsel.h top.xpm +dialogs.o: dialogs.c ../config.h gmenu.h +edit.o: edit.c ../config.h gmenu.h +gmenu.o: gmenu.c ../config.h gmenu.h up.xpm down.xpm +order.o: order.c gmenu.h folder.xpm unknown.xpm +tree.o: tree.c ../config.h gmenu.h wait-feet.h top.xpm info: dvi: diff -uNr gnome-core-0.25/gmenu/README gnome-core-0.27/gmenu/README --- gnome-core-0.25/gmenu/README Mon Jun 22 03:35:00 1998 +++ gnome-core-0.27/gmenu/README Wed Aug 12 01:07:56 1998 @@ -1,19 +1,12 @@ ######################################################### -#### GNOME menu editor 0.2.2 ### +#### GNOME menu editor 0.3.0 ### ######################################################### In the tree window: -any button selects thr row. -button double click or button 3 single click copied the -rows data to the edit area (if it's not a folder). +button 1 selects the row. +right clicking copies the row's data to the edit area. -root detection is now forced true until someone adds user -menus to the panel. -Folders must be emptied to delete them. +Folders must be empty to delete them. -You must be root to edit the system menu. -root users do not have access to their personal icons, so -that the system menus always have system icons. - -.order entries are now supported! +You must have system menu write permissions to edit the system menu. diff -uNr gnome-core-0.25/gmenu/dialogs.c gnome-core-0.27/gmenu/dialogs.c --- gnome-core-0.25/gmenu/dialogs.c Mon Aug 3 13:34:08 1998 +++ gnome-core-0.27/gmenu/dialogs.c Wed Aug 12 01:07:56 1998 @@ -1,5 +1,5 @@ /*###################################################################*/ -/*## gmenu (GNOME menu editor) 0.2.5 ##*/ +/*## gmenu (GNOME menu editor) 0.3.0 ##*/ /*###################################################################*/ #include diff -uNr gnome-core-0.25/gmenu/edit.c gnome-core-0.27/gmenu/edit.c --- gnome-core-0.25/gmenu/edit.c Thu Jul 30 18:38:38 1998 +++ gnome-core-0.27/gmenu/edit.c Wed Aug 12 01:08:02 1998 @@ -1,5 +1,5 @@ /*###################################################################*/ -/*## gmenu (GNOME menu editor) 0.2.5 ##*/ +/*## gmenu (GNOME menu editor) 0.3.0 ##*/ /*###################################################################*/ #include diff -uNr gnome-core-0.25/gmenu/gmenu.c gnome-core-0.27/gmenu/gmenu.c --- gnome-core-0.25/gmenu/gmenu.c Wed Aug 5 12:42:25 1998 +++ gnome-core-0.27/gmenu/gmenu.c Wed Aug 12 01:08:02 1998 @@ -1,5 +1,5 @@ /*###################################################################*/ -/*## gmenu (GNOME menu editor) 0.2.5 ##*/ +/*## gmenu (GNOME menu editor) 0.3.0 ##*/ /*###################################################################*/ #include @@ -28,6 +28,10 @@ Desktop_Data *edit_area_orig_data = NULL; +static void sort_node( GtkCTreeNode *node); +static void sort_single_pressed(); +static void sort_recurse_cb(GtkCTree *ctree, GtkCTreeNode *node, gpointer data); +static void sort_recursive_pressed(); int isfile(char *s); int isdir(char *s); char *filename_from_path(char *t); @@ -38,6 +42,7 @@ static void destroy_cb(); int main (int argc, char *argv[]); +/* menu bar */ GnomeUIInfo file_menu[] = { { GNOME_APP_UI_ITEM, N_("New Folder..."), NULL, create_folder_pressed, NULL, NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_NEW, 'F', @@ -50,6 +55,15 @@ GDK_CONTROL_MASK, NULL }, { GNOME_APP_UI_ENDOFINFO } }; +GnomeUIInfo sort_menu[] = { + { GNOME_APP_UI_ITEM, N_("Folder"), NULL, sort_single_pressed, NULL, NULL, + GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SPELLCHECK, 'S', + GDK_CONTROL_MASK, NULL }, + { GNOME_APP_UI_ITEM, N_("Folder Recursive"), NULL, sort_recursive_pressed, NULL, NULL, + GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SPELLCHECK, 'R', + GDK_CONTROL_MASK, NULL }, + { GNOME_APP_UI_ENDOFINFO } +}; GnomeUIInfo help_menu[] = { { GNOME_APP_UI_HELP, NULL, NULL, NULL, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL }, @@ -61,11 +75,74 @@ GnomeUIInfo main_menu[] = { { GNOME_APP_UI_SUBTREE, N_("File"), NULL, file_menu, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL }, + { GNOME_APP_UI_SUBTREE, N_("Sort"), NULL, sort_menu, NULL, NULL, + GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL }, { GNOME_APP_UI_SUBTREE, N_("Help"), NULL, help_menu, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL }, { GNOME_APP_UI_ENDOFINFO } }; +/* toolbar */ +GnomeUIInfo toolbar[] = { + { GNOME_APP_UI_ITEM, N_("New Folder"), N_("Create a new folder"), create_folder_pressed, NULL, NULL, + GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_NEW, 0, 0, NULL }, + { GNOME_APP_UI_ITEM, N_("Delete"), N_("Delete selected menu item"), delete_pressed_cb, NULL, NULL, + GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_CUT, 0, 0, NULL }, + GNOMEUIINFO_SEPARATOR, + { GNOME_APP_UI_ITEM, N_("Move up"), N_("Move selected menu up"), move_up_cb, NULL, NULL, + GNOME_APP_PIXMAP_DATA, up_xpm, 0, 0, NULL }, + { GNOME_APP_UI_ITEM, N_("Move down"), N_("Move selected menu down"), move_down_cb, NULL, NULL, + GNOME_APP_PIXMAP_DATA, down_xpm, 0, 0, NULL }, + GNOMEUIINFO_SEPARATOR, + { GNOME_APP_UI_ITEM, N_("Properties"), N_("Edit selected menu item properties"), edit_pressed_cb, NULL, NULL, + GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_PROPERTIES, 0, 0, NULL }, + GNOMEUIINFO_SEPARATOR, + { GNOME_APP_UI_ITEM, N_("Sort Folder"), N_("Sort selected folder"), sort_single_pressed, NULL, NULL, + GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_SPELLCHECK, 0, 0, NULL }, + GNOMEUIINFO_END +}; + +static void sort_node( GtkCTreeNode *node) +{ + Desktop_Data *d; + + if (!node || node == topnode) return; + + d = gtk_ctree_get_row_data(GTK_CTREE(menu_tree_ctree),node); + if (!d->isfolder) node = GTK_CTREE_ROW(node)->parent; + + gtk_ctree_sort(GTK_CTREE(menu_tree_ctree), node); + save_order_of_dir(node); +} + +static void sort_single_pressed() +{ + sort_node(current_node); +} + + +static void sort_recurse_cb(GtkCTree *ctree, GtkCTreeNode *node, gpointer data) +{ + Desktop_Data *d; + + if (!node) return; + + d = gtk_ctree_get_row_data(GTK_CTREE(menu_tree_ctree),node); + if (d->isfolder) sort_node (node); +} + +static void sort_recursive_pressed() +{ + Desktop_Data *d; + GtkCTreeNode *node = current_node; + + if (!node || node == topnode) return; + + d = gtk_ctree_get_row_data(GTK_CTREE(menu_tree_ctree),node); + if (!d->isfolder) node = GTK_CTREE_ROW(node)->parent; + + gtk_ctree_post_recursive(GTK_CTREE(menu_tree_ctree), node, sort_recurse_cb, NULL); +} static void dnd_data_request(GtkWidget *widget, GdkEvent *event) { @@ -255,10 +332,8 @@ { GtkWidget *mainbox; GtkWidget *hbox; - GtkWidget *hbox1; GtkWidget *vbox; GtkWidget *frame; - GtkWidget *pixmap; GtkWidget *button; GtkTooltips *tooltips; @@ -275,17 +350,19 @@ return 1; } - /* FIXME: is the user's menu ~/.gnome/apps or ~/.gnome/share/apps ? */ USER_APPS = check_for_dir(gnome_util_home_file("apps")); USER_PIXMAPS = check_for_dir(gnome_util_home_file("pixmaps")); app = gnome_app_new ("gmenu",_("GNOME menu editor")); - gtk_widget_set_usize (app, 600,420); + gtk_widget_set_usize (app, 600,460); gtk_signal_connect(GTK_OBJECT(app), "delete_event", GTK_SIGNAL_FUNC(destroy_cb), NULL); gnome_app_create_menus_with_data (GNOME_APP(app), main_menu, app); - gtk_menu_item_right_justify(GTK_MENU_ITEM(main_menu[1].widget)); + gtk_menu_item_right_justify(GTK_MENU_ITEM(main_menu[2].widget)); + gnome_app_create_toolbar (GNOME_APP(app), toolbar); +/* gtk_toolbar_set_style (GTK_TOOLBAR (GNOME_APP(app)->toolbar), GTK_TOOLBAR_ICONS); +*/ tooltips = gtk_tooltips_new(); mainbox = gtk_hbox_new (FALSE, 0); @@ -305,67 +382,11 @@ gtk_clist_set_row_height(GTK_CLIST(menu_tree_ctree),22); gtk_clist_set_column_width(GTK_CLIST(menu_tree_ctree),0,300); - gtk_clist_set_selection_mode(GTK_CLIST(menu_tree_ctree),GTK_SELECTION_BROWSE); - gtk_signal_connect(GTK_OBJECT(menu_tree_ctree),"select_row", GTK_SIGNAL_FUNC(tree_item_selected),NULL); + gtk_clist_set_selection_mode(GTK_CLIST(menu_tree_ctree),GTK_SELECTION_SINGLE); + gtk_signal_connect_after(GTK_OBJECT(menu_tree_ctree),"button_release_event", GTK_SIGNAL_FUNC(tree_item_selected),NULL); gtk_box_pack_start(GTK_BOX(vbox),menu_tree_ctree,TRUE,TRUE,0); gtk_widget_show(menu_tree_ctree); - /* tree buttons */ - hbox1 = gtk_hbox_new(FALSE, 5); - gtk_box_pack_start(GTK_BOX(vbox),hbox1,FALSE,FALSE,10); - gtk_widget_show(hbox1); - - button = gtk_button_new(); - gtk_signal_connect(GTK_OBJECT(button),"clicked",GTK_SIGNAL_FUNC(create_folder_pressed), NULL); - gtk_box_pack_start(GTK_BOX(hbox1),button,FALSE,FALSE,0); - gtk_widget_show(button); - - pixmap = gnome_stock_pixmap_widget_new(app, GNOME_STOCK_PIXMAP_NEW ); - gtk_container_add(GTK_CONTAINER(button),pixmap); - gtk_widget_show(pixmap); - - gtk_tooltips_set_tip (tooltips, button, _("New Folder"), NULL); - - button = gtk_button_new(); - gtk_signal_connect(GTK_OBJECT(button),"clicked",GTK_SIGNAL_FUNC(delete_pressed_cb), NULL); - gtk_box_pack_start(GTK_BOX(hbox1),button,FALSE,FALSE,0); - gtk_widget_show(button); - - pixmap = gnome_stock_pixmap_widget_new(app, GNOME_STOCK_PIXMAP_CUT ); - gtk_container_add(GTK_CONTAINER(button),pixmap); - gtk_widget_show(pixmap); - - gtk_tooltips_set_tip (tooltips, button, _("Delete"), NULL); - - button = gtk_button_new(); - gtk_signal_connect(GTK_OBJECT(button),"clicked",GTK_SIGNAL_FUNC(move_up_cb), NULL); - gtk_box_pack_start(GTK_BOX(hbox1),button,FALSE,FALSE,0); - gtk_widget_show(button); - - pixmap = gnome_pixmap_new_from_xpm_d( up_xpm ); - gtk_container_add(GTK_CONTAINER(button),pixmap); - gtk_widget_show(pixmap); - - button = gtk_button_new(); - gtk_signal_connect(GTK_OBJECT(button),"clicked",GTK_SIGNAL_FUNC(move_down_cb), NULL); - gtk_box_pack_start(GTK_BOX(hbox1),button,FALSE,FALSE,0); - gtk_widget_show(button); - - pixmap = gnome_pixmap_new_from_xpm_d( down_xpm ); - gtk_container_add(GTK_CONTAINER(button),pixmap); - gtk_widget_show(pixmap); - - button = gtk_button_new(); - gtk_signal_connect(GTK_OBJECT(button),"clicked",GTK_SIGNAL_FUNC(edit_pressed_cb), NULL); - gtk_box_pack_start(GTK_BOX(hbox1),button,FALSE,FALSE,0); - gtk_widget_show(button); - - pixmap = gnome_stock_pixmap_widget_new(app, GNOME_STOCK_PIXMAP_PROPERTIES ); - gtk_container_add(GTK_CONTAINER(button),pixmap); - gtk_widget_show(pixmap); - - gtk_tooltips_set_tip (tooltips, button, _("Edit Properties"), NULL); - /* tree info area */ hbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,0); @@ -403,9 +424,9 @@ gtk_box_pack_start(GTK_BOX(mainbox),vbox,TRUE,TRUE,0); gtk_widget_show(vbox); - gtk_widget_show(app); - add_main_tree_node(); + + gtk_widget_show(app); new_edit_area(); diff -uNr gnome-core-0.25/gmenu/gmenu.desktop gnome-core-0.27/gmenu/gmenu.desktop --- gnome-core-0.25/gmenu/gmenu.desktop Thu Jul 9 15:55:46 1998 +++ gnome-core-0.27/gmenu/gmenu.desktop Mon Aug 10 04:07:24 1998 @@ -1,8 +1,10 @@ [Desktop Entry] Name=Menu editor +Name[es]=Editor de menues Name[fr]=Editeur de menus Name[pt]=Editor de Menus Comment=the GNOME menu editor +Comment[es]=Editar los menues del panel de GNOME Comment[fr]=Editeur de menus GNOME Comment[pt]=O editor de menus GNOME Exec=gmenu diff -uNr gnome-core-0.25/gmenu/gmenu.h gnome-core-0.27/gmenu/gmenu.h --- gnome-core-0.25/gmenu/gmenu.h Mon Aug 3 13:34:11 1998 +++ gnome-core-0.27/gmenu/gmenu.h Wed Aug 12 01:08:02 1998 @@ -1,5 +1,5 @@ /*###################################################################*/ -/*## gmenu (GNOME menu editor) 0.2.5 ##*/ +/*## gmenu (GNOME menu editor) 0.3.0 ##*/ /*###################################################################*/ #include @@ -14,8 +14,8 @@ /* definitions */ #define GMENU_VERSION_MAJOR 0 -#define GMENU_VERSION_MINOR 2 -#define GMENU_VERSION_REV 5 +#define GMENU_VERSION_MINOR 3 +#define GMENU_VERSION_REV 0 typedef struct _Desktop_Data Desktop_Data; struct _Desktop_Data @@ -74,7 +74,7 @@ void move_up_cb(GtkWidget *w, gpointer data); int is_node_editable(GtkCTreeNode *node); void edit_pressed_cb(); -void tree_item_selected (GtkWidget *widget, gint row, gint column, GdkEventButton *bevent); +void tree_item_selected (GtkCTree *ctree, GdkEventButton *event, gpointer data); GtkCTreeNode *add_leaf_node(GtkCTree *ctree, GtkCTreeNode *parent, GtkCTreeNode *node, char *file); void add_tree_node(GtkCTree *ctree, GtkCTreeNode *parent); void add_main_tree_node(); diff -uNr gnome-core-0.25/gmenu/order.c gnome-core-0.27/gmenu/order.c --- gnome-core-0.25/gmenu/order.c Mon Aug 3 13:34:11 1998 +++ gnome-core-0.27/gmenu/order.c Wed Aug 12 01:08:02 1998 @@ -1,5 +1,5 @@ /*###################################################################*/ -/*## gmenu (GNOME menu editor) 0.2.5 ##*/ +/*## gmenu (GNOME menu editor) 0.3.0 ##*/ /*###################################################################*/ #include "gmenu.h" diff -uNr gnome-core-0.25/gmenu/tree.c gnome-core-0.27/gmenu/tree.c --- gnome-core-0.25/gmenu/tree.c Mon Aug 3 13:34:11 1998 +++ gnome-core-0.27/gmenu/tree.c Wed Aug 12 01:08:05 1998 @@ -1,65 +1,70 @@ /*###################################################################*/ -/*## gmenu (GNOME menu editor) 0.2.5 ##*/ +/*## gmenu (GNOME menu editor) 0.3.0 ##*/ /*###################################################################*/ #include #include "gmenu.h" +#include "wait-feet.h" #include "top.xpm" +static gint find_file_cb(gconstpointer a, gconstpointer b); static void move_item_down(GtkCTreeNode *node); static void move_item_up(GtkCTreeNode *node); static void add_tree_recurse_cb(GtkCTree *ctree, GtkCTreeNode *node, gpointer data); +static void get_ctree_count_cb(GtkCTree *ctree, GtkCTreeNode *node, gpointer data); +static gint get_ctree_count(GtkCTree *ctree); -/* if ctree = null, reset ret. if node = null, return ret. */ -static GtkCTreeNode *check_file_match(GtkCTree *ctree, GtkCTreeNode *node, gpointer data) +/* new = TRUE, increment feet = FALSE */ +static GtkWidget *wait_pixmap(gint mode) { - static GtkCTreeNode *ret = NULL; - char *path = data; - Desktop_Data *d; - - if (!ctree) - { - ret = NULL; - return ret; - } + static GtkWidget *p; - if (!node) - { - return ret; - } + static gint c; - d = gtk_ctree_get_row_data(GTK_CTREE(ctree), node); - if (d->path && !strcmp(d->path, path)) + if (mode) { - ret = node; - return ret; + c = 0; + p = gnome_pixmap_new_from_xpm_d(wait_1_xpm); + return p; } else + { + c++; + if (c > 7) c = 0; + + if (c == 0) gnome_pixmap_load_xpm_d(GNOME_PIXMAP(p),wait_1_xpm); + if (c == 1) gnome_pixmap_load_xpm_d(GNOME_PIXMAP(p),wait_2_xpm); + if (c == 2) gnome_pixmap_load_xpm_d(GNOME_PIXMAP(p),wait_3_xpm); + if (c == 3) gnome_pixmap_load_xpm_d(GNOME_PIXMAP(p),wait_4_xpm); + if (c == 4) gnome_pixmap_load_xpm_d(GNOME_PIXMAP(p),wait_5_xpm); + if (c == 5) gnome_pixmap_load_xpm_d(GNOME_PIXMAP(p),wait_6_xpm); + if (c == 6) gnome_pixmap_load_xpm_d(GNOME_PIXMAP(p),wait_7_xpm); + if (c == 7) gnome_pixmap_load_xpm_d(GNOME_PIXMAP(p),wait_8_xpm); + + gtk_widget_draw(p, NULL); + return NULL; + } } -GtkCTreeNode *find_file_in_tree(GtkCTree * ctree, char *path) +static gint find_file_cb(gconstpointer a, gconstpointer b) { - GtkCTreeNode *node = NULL; - - /* reset the static pointer */ - check_file_match(NULL, NULL, NULL); - - /* do the check */ - gtk_ctree_pre_recursive(GTK_CTREE(ctree), NULL, (GtkCTreeFunc) check_file_match, path); + if (!((Desktop_Data *)(a))->path) return 1; - /* get the static pointer */ - node = check_file_match(ctree, NULL, NULL); + return strcmp(((Desktop_Data *)(a))->path, (gchar *)b); +} - return node; +GtkCTreeNode *find_file_in_tree(GtkCTree * ctree, char *path) +{ + return gtk_ctree_find_by_row_data_custom (GTK_CTREE(ctree), NULL, path, find_file_cb); } void update_tree_highlight(GtkWidget *w, GtkCTreeNode *old, GtkCTreeNode *new, gint select) { Desktop_Data *d; - if (old) gtk_ctree_unselect(GTK_CTREE(w),old); + if (old) gtk_ctree_unselect(GTK_CTREE(w),old); if (new && select) gtk_ctree_select(GTK_CTREE(w),new); d = gtk_ctree_get_row_data(GTK_CTREE(w), new); @@ -81,9 +86,6 @@ } gtk_label_set(GTK_LABEL(pathlabel),current_path); -/* if (move) - gtk_ctree_moveto (GTK_CTREE(w), new, 0, 0.5, 0.0); -*/ } static void move_item_down(GtkCTreeNode *node) @@ -153,13 +155,10 @@ gtk_ctree_get_node_info(GTK_CTREE(menu_tree_ctree),node, NULL,NULL,NULL,NULL,NULL,NULL,&leaf,NULL); if (leaf) - { parent = GTK_CTREE_ROW(node)->parent; - } else - { parent = node; - } + d = gtk_ctree_get_row_data(GTK_CTREE(menu_tree_ctree), parent); return d->editable; } @@ -174,30 +173,39 @@ update_edit_area(d); } -void tree_item_selected (GtkWidget *widget, gint row, gint column, GdkEventButton *bevent) +void tree_item_selected (GtkCTree *ctree, GdkEventButton *event, gpointer data) { + gint row, col; Desktop_Data *d; - GtkCTree *ctree = GTK_CTREE(widget); GtkCTreeNode *node; + if (event->window != GTK_CLIST(ctree)->clist_window) return; + if (gtk_ctree_is_hot_spot(ctree, event->x, event->y)) return; + if (event->button != 1 && event->button != 3) return; + + gtk_clist_get_selection_info (GTK_CLIST (ctree), event->x, event->y, &row, &col); + node = GTK_CTREE_NODE(g_list_nth (GTK_CLIST (ctree)->row_list, row)); if (!node) return; - if (node == topnode) return; + if (node == topnode) + { + update_tree_highlight(menu_tree_ctree, node, current_node, TRUE); + return; + } + + if (event->button == 3 && (node == systemnode || node == usernode)) return; d = gtk_ctree_get_row_data(GTK_CTREE(ctree),node); - update_tree_highlight(menu_tree_ctree, current_node, node, FALSE); + update_tree_highlight(menu_tree_ctree, current_node, node, TRUE); current_node = node; if (node == systemnode || node == usernode) return; - if ( bevent->type == GDK_2BUTTON_PRESS || bevent->button == 2 ) - { - update_edit_area(d); - } + if (event->button == 3) update_edit_area(d); if (d->isfolder) { @@ -208,6 +216,7 @@ } } + return; } /* if node is null it is appended, if it is a sibling, it is inserted */ @@ -332,17 +341,56 @@ static void add_tree_recurse_cb(GtkCTree *ctree, GtkCTreeNode *node, gpointer data) { Desktop_Data *d = gtk_ctree_get_row_data(GTK_CTREE(ctree), node); - if (d->isfolder && !d->expanded ) add_tree_node(ctree, node); + if (d->isfolder && !d->expanded ) + { + wait_pixmap(FALSE); + add_tree_node(ctree, node); + } +} + +static void get_ctree_count_cb(GtkCTree *ctree, GtkCTreeNode *node, gpointer data) +{ + gint *p = data; + *p = *p + 1; } +static gint get_ctree_count(GtkCTree *ctree) +{ + gint count = 0; + gtk_ctree_post_recursive (ctree, NULL, get_ctree_count_cb, &count); + return count; +} void add_main_tree_node() { gchar *text[2]; Desktop_Data *d; GtkWidget *pixmap; + GtkWidget *wait_icon; + GtkWidget *dialog; + GtkWidget *label; + GtkWidget *hbox; gint c; + + dialog = gnome_dialog_new(_("GNOME menu editor"),NULL); + + hbox = gtk_hbox_new(FALSE, 5); + gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox), hbox, TRUE, TRUE, 5); + gtk_widget_show(hbox); + + wait_icon = wait_pixmap(TRUE); + gtk_box_pack_start(GTK_BOX(hbox), wait_icon, TRUE, TRUE, 5); + gtk_widget_show(wait_icon); + + label = gtk_label_new(_("One moment, reading menus...")); + gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 5); + gtk_widget_show(label); + + gtk_widget_show(dialog); + + while(gtk_events_pending()) gtk_main_iteration(); + /* g_print("adding top node...\n");*/ gtk_clist_freeze(GTK_CLIST(menu_tree_ctree)); @@ -381,15 +429,11 @@ d->comment = strdup(_("Top of system menus")); d->expanded = FALSE; - /* FIXME: are we root? then we can edit the system menu */ -/* - if (!strcmp("/root",getenv("HOME")) || - ((getenv("USER"))&&(!strcmp("root",getenv("USER")))) || - ((getenv("USERNAME"))&&(!strcmp("root",getenv("USERNAME")))) ) -*/ + /* check if the user has permission to edit the system menu */ + if (!access (SYSTEM_APPS, W_OK)) { - g_print(_("Running with root privileges.\n")); + g_print(_("Running with System Menu privileges.\n")); d->editable = TRUE; } else @@ -416,13 +460,16 @@ /* now load the entire menu tree */ c = 0; - while (g_list_length((GList *)topnode) > c) + while (get_ctree_count(GTK_CTREE(menu_tree_ctree)) > c) { - c = g_list_length((GList *)topnode); - gtk_ctree_pre_recursive(GTK_CTREE(menu_tree_ctree), topnode, add_tree_recurse_cb, NULL); + c = get_ctree_count(GTK_CTREE(menu_tree_ctree)); + + gtk_ctree_post_recursive(GTK_CTREE(menu_tree_ctree), topnode, add_tree_recurse_cb, NULL); } current_node = usernode; + + gnome_dialog_close(GNOME_DIALOG(dialog)); gtk_clist_thaw(GTK_CLIST(menu_tree_ctree)); diff -uNr gnome-core-0.25/gmenu/wait-feet.h gnome-core-0.27/gmenu/wait-feet.h --- gnome-core-0.25/gmenu/wait-feet.h Wed Dec 31 19:00:00 1969 +++ gnome-core-0.27/gmenu/wait-feet.h Mon Aug 10 04:07:25 1998 @@ -0,0 +1,672 @@ +/* XPM */ +static char * wait_1_xpm[] = { +"48 48 33 1", +" c None", +". c #501D1A", +"+ c #9C8A69", +"@ c #62523C", +"# c #DBC391", +"$ c #BAA77A", +"% c #787051", +"& c #6C392D", +"* c #C18D77", +"= c #AF705A", +"- c #F5E0AB", +"; c #D3A87F", +"> c #C99A79", +", c #852223", +"' c #913931", +") c #D9B687", +"! c #A87E61", +"~ c #A35444", +"{ c #8B7D5C", +"] c #EBD4A7", +"^ c #776349", +"/ c #572C22", +"( c #97453A", +"_ c #C6BA84", +": c #FDEFB3", +"< c #AD624D", +"[ c #A99875", +"} c #896F58", +"| c #671C1C", +"1 c #6E4434", +"2 c #8A2B28", +"3 c #BC7E63", +"4 c #864E4C", +" ", +" #[$ ", +" -$+%+ ", +" #++ ::::_% ", +" :-_% :::::{ ", +" :::+$:::::[ ", +" :::$$::::-# ", +" ::-] :--- ", +" -$$ -- ", +" -_{{ #[+}%} ", +" ]]#} )$;))[%^ ", +" -]#) )))))))$^} ", +" ## ))))));;;!^ ", +" ;++ );;;;;;;;!} ", +" ;}@ ;;;;;>>>>>!! ", +" );} ;>>>>>***** ", +" ]>> >>******3* ", +" *****33= ", +" *33333=1 ", +" >3=====& ", +" **==<<<& ", +" *[<<<~~1//&&// ", +" *~~~~~~(&&&&/. ", +" [~~((((((''''.. ", +" ;*(('''''''''|. ", +" *;!'''''22222|. ", +" *;!'22,,,,,,|| ", +" >*4,,,,,,,| ", +" *>}2,,,,,, ", +" **!}}42 ", +" ", +" ", +" ", +" ", +" $[# ", +" +%+$- ", +" %_:::: ++# ", +" {::::: %_-: ", +" [:::::$+::: ", +" #-::::$$::: ", +" ---: ]-:: ", +" -- $$- ", +" }%}+[# {{_- ", +" ^%[));$) }#]] ", +" }^$))))))) )#]- ", +" ^!;;;)))))) ## ", +" }!;;;;;;;;) ++; ", +" !!>>>>>;;;;; @}; "}; +/* XPM */ +static char * wait_2_xpm[] = { +"48 48 33 1", +" c None", +". c #501D1A", +"+ c #9C8A6A", +"@ c #62523C", +"# c #D9C390", +"$ c #B8A87A", +"% c #787252", +"& c #6C392D", +"* c #C18D77", +"= c #AF705A", +"- c #F5E1AA", +"; c #D3A881", +"> c #C9997B", +", c #852223", +"' c #913931", +") c #D9B688", +"! c #A87E64", +"~ c #A35444", +"{ c #8C7E5C", +"] c #EAD4AA", +"^ c #776349", +"/ c #572C22", +"( c #97453A", +"_ c #C6BA84", +": c #FEEFB2", +"< c #AD624D", +"[ c #A99775", +"} c #8B6F5A", +"| c #671C1C", +"1 c #6E4434", +"2 c #8A2B28", +"3 c #BC7E63", +"4 c #864E4C", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" #[$ ", +" -$+%+ ", +" #++ ::::_% ", +" :-_% :::::{ ", +" :::+$:::::[ ", +" :::$$::::-# ", +" ::-] :--- ", +" -$$ -- ", +" -_{{ #[+}%} ", +" ]]#} )$;))[^^ ", +" -]#) )))))))>^} ", +" ## ))))));;;!^ ", +" ;++ );;;;;;;;!} ", +" ;}@ ;;;;;>>>>>!! ", +" );} ;>>>>>***** ", +" ]>> >>******3* ", +" *****33= ", +" *33333=1 ", +" >3=====& ", +" **==<<<& ", +" *[<<<~~1//&&// ", +" [~~~~~~(&&&&/. ", +" [~~((((((''''.. ", +" ;+(('''''''''|. ", +" *;!'''''22222|. ", +" *;!'22,,,,,,|| ", +" >*4,,,,,,,| ", +" *>}2,,,,,, ", +" **!}}42 ", +" ", +" ", +" $[# ", +" +%+$- ", +" %_:::: ++# ", +" {::::: %_-: ", +" [:::::$+::: ", +" #-::::$$::: "}; +/* XPM */ +static char * wait_3_xpm[] = { +"48 48 33 1", +" c None", +". c #501D1A", +"+ c #9F8A6D", +"@ c #62523C", +"# c #DBC391", +"$ c #BAA77A", +"% c #787051", +"& c #6C392D", +"* c #C18D77", +"= c #AF705A", +"- c #F5E0AB", +"; c #D3A881", +"> c #C9997B", +", c #852223", +"' c #913931", +") c #D9B688", +"! c #A87E64", +"~ c #A35444", +"{ c #8B7D5C", +"] c #EAD4AA", +"^ c #776349", +"/ c #572C22", +"( c #97453A", +"_ c #C6BA84", +": c #FDEFB3", +"< c #AD624D", +"[ c #AA9778", +"} c #8B6F5A", +"| c #671C1C", +"1 c #6E4434", +"2 c #8A2B28", +"3 c #BC7E63", +"4 c #864E4C", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" #[$ ", +" -$+%+ ", +" #++ ::::_% ", +" :-_% :::::{ ", +" :::+$:::::[ ", +" :::$$::::-# ", +" ::-] :--- ", +" -$$ -- ", +" -_{{ #[+}%} ", +" ]]#} )$;))[%^ ", +" -]#) )))))))$^} ", +" ## ))))));;;!^ ", +" ;++ );;;;;;;;!} ", +" ;}@ ;;;;;>>>>>!! ", +" );} ;>>>>>***** ", +" ]>> >>******3* ", +" *****33= ", +" *33333=1 ", +" >3=====& ", +" **==<<<& ", +" *[<<<~~1//&&// ", +" [~~~~~~(&&&&/. ", +" [~~((((((''''.. ", +" ;+(('''''''''|. ", +" *;!'''''22222|. ", +" *;+'22,,,,,,|| ", +" >*4,,,,,,,| ", +" *>}2,,,,,, ", +" **!}}42 "}; +/* XPM */ +static char * wait_4_xpm[] = { +"48 48 33 1", +" c None", +". c #582D24", +"+ c #AA9778", +"@ c #DBC791", +"# c #7D674C", +"$ c #8B7D5C", +"% c #C6AE80", +"& c #AC604C", +"* c #C99472", +"= c #F5E1A9", +"- c #BA7E62", +"; c #D9B383", +"> c #FDEFB3", +", c #787252", +"' c #DABB8E", +") c #D2A67B", +"! c #C18A6C", +"~ c #62523C", +"{ c #A65A48", +"] c #B6A67B", +"^ c #B57258", +"/ c #998A64", +"( c #EBD5AF", +"_ c #623E2F", +": c #CABC86", +"< c #A28060", +"[ c #7A4634", +"} c #887254", +"| c #BA9580", +"1 c #62362C", +"2 c #AB6852", +"3 c #CE9C77", +"4 c #E6C098", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" :+] ", +" =]/,/ ", +" @// >>>>:, ", +" >=:, >>>>>$ ", +" >>>/%>>>>>+ ", +" >>>]]>>>>=@ ", +" >>=( >=== ", +" =]% == ", +" =:$$ '+/},} ", +" (('} ;]%';|## ", +" =(@' ;;''';;3## ", +" 44 ';;;;;;;)<# ", +" % c #C8997A", +", c #852223", +"' c #913931", +") c #D9B687", +"! c #A67F63", +"~ c #A35444", +"{ c #8B7D5C", +"] c #EBD4A7", +"^ c #776349", +"/ c #572C22", +"( c #97453A", +"_ c #C6BA84", +": c #FDEFB3", +"< c #AD624D", +"[ c #A99875", +"} c #896F58", +"| c #671C1C", +"1 c #6E4434", +"2 c #8A2B28", +"3 c #BC7E63", +"4 c #864E4C", +" ", +" ", +" $[# ", +" +%+$- ", +" %_:::: ++# ", +" {::::: %_-: ", +" [:::::$+::: ", +" #-::::$$::: ", +" ---: ]-:: ", +" -- $$- ", +" }%}+[# {{_- ", +" ^%[));$) }#]] ", +" }^$))))))) )#]- ", +" ^!;;;)))))) ## ", +" }!;;;;;;;;) ++; ", +" !!>>>>>;;;;; @}; ", +" *****>>>>>; };) ", +" *3******>> >>] ", +" =33***** ", +" 1=33333* ", +" &=====3> ", +" &<<<==** ", +" //&&//1~~<<<[* ", +" ./&&&&(~~~~~~* ", +" ..''''((((((~~[ ", +" .|'''''''''((*; ", +" .|22222'''''!;* ", +" ||,,,,,,22'!;* ", +" |,,,,,,,4*> ", +" ,,,,,,2}>* ", +" 24}}!** ", +" ", +" ", +" ", +" ", +" #[$ ", +" -$+%+ ", +" #++ ::::_% ", +" :-_% :::::{ ", +" :::+$:::::[ ", +" :::$$::::-# ", +" ::-] :--- ", +" -$$ -- ", +" -_{{ #[+}%} ", +" ]]#} )$;))[%^ ", +" -]#) )))))))$^} ", +" ## ))))));;;!^ ", +" ;++ );;;;;;;;!} "}; +/* XPM */ +static char * wait_6_xpm[] = { +"48 48 33 1", +" c None", +". c #501D1A", +"+ c #9C8A6A", +"@ c #62523C", +"# c #D9C390", +"$ c #B9A87A", +"% c #787252", +"& c #6C392D", +"* c #C18D77", +"= c #AF705A", +"- c #F5E1AA", +"; c #D3A881", +"> c #C9997B", +", c #852223", +"' c #913931", +") c #D9B688", +"! c #A87E64", +"~ c #A35444", +"{ c #8C7E5C", +"] c #EAD4AA", +"^ c #776349", +"/ c #572C22", +"( c #97453A", +"_ c #C6BA84", +": c #FDEFB0", +"< c #AD624D", +"[ c #A99775", +"} c #8B6F5A", +"| c #671C1C", +"1 c #6E4434", +"2 c #8A2B28", +"3 c #BC7E63", +"4 c #864E4C", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" $[# ", +" +%+$- ", +" %_:::: ++# ", +" {::::: %_-: ", +" [:::::$+::: ", +" #-::::$$::: ", +" ---: ]-:: ", +" -- $$- ", +" }%}+[# {{_- ", +" ^^[));$) }#]] ", +" }^$))))))) )#]- ", +" ^!;;;)))))) ## ", +" }!;;;;;;;;) ++; ", +" !!>>>>>;;;;; @}; ", +" *****>>>>>; };) ", +" *3******>> >>] ", +" =33***** ", +" 1=33333* ", +" &=====3> ", +" &<<<==** ", +" //&&//1~~<<<[* ", +" ./&&&&(~~~~~~[ ", +" ..''''((((((~~[ ", +" .|'''''''''((+; ", +" .|22222'''''!;* ", +" ||,,,,,,22'!;* ", +" |,,,,,,,4*> ", +" ,,,,,,2}>* ", +" 24}}!** ", +" ", +" ", +" ", +" ", +" #[$ ", +" -$+%+ ", +" #++ ::::_% ", +" :-_% :::::{ ", +" :::+$:::::[ "}; +/* XPM */ +static char * wait_7_xpm[] = { +"48 48 33 1", +" c None", +". c #501D1A", +"+ c #9F8A6D", +"@ c #62523C", +"# c #DBC391", +"$ c #BAA77A", +"% c #787051", +"& c #6C392D", +"* c #C18D77", +"= c #AF705A", +"- c #F5E0AB", +"; c #D3A881", +"> c #C9997B", +", c #852223", +"' c #913931", +") c #D9B688", +"! c #A87E64", +"~ c #A35444", +"{ c #8B7D5C", +"] c #EAD4AA", +"^ c #776349", +"/ c #572C22", +"( c #97453A", +"_ c #C6BA84", +": c #FDEFB3", +"< c #AD624D", +"[ c #AA9778", +"} c #8B6F5A", +"| c #671C1C", +"1 c #6E4434", +"2 c #8A2B28", +"3 c #BC7E63", +"4 c #864E4C", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" $[# ", +" +%+$- ", +" %_:::: ++# ", +" {::::: %_-: ", +" [:::::$+::: ", +" #-::::$$::: ", +" ---: ]-:: ", +" -- $$- ", +" }%}+[# {{_- ", +" ^%[));$) }#]] ", +" }^$))))))) )#]- ", +" ^!;;;)))))) ## ", +" }!;;;;;;;;) ++; ", +" !!>>>>>;;;;; @}; ", +" *****>>>>>; };) ", +" *3******>> >>] ", +" =33***** ", +" 1=33333* ", +" &=====3> ", +" &<<<==** ", +" //&&//1~~<<<[* ", +" ./&&&&(~~~~~~[ ", +" ..''''((((((~~[ ", +" .|'''''''''((+; ", +" .|22222'''''!;* ", +" ||,,,,,,22'+;* ", +" |,,,,,,,4*> ", +" ,,,,,,2}>* ", +" 24}}!** ", +" "}; +/* XPM */ +static char * wait_8_xpm[] = { +"48 48 33 1", +" c None", +". c #502820", +"+ c #9E936A", +"@ c #D3C58F", +"# c #7D674C", +"$ c #837756", +"% c #C1AD7F", +"& c #C89473", +"* c #F5E1A9", +"= c #AB604C", +"- c #B87C5F", +"; c #6A4231", +"> c #D7AE80", +", c #CEA27A", +"' c #FDEFB3", +") c #AB866F", +"! c #DBB98A", +"~ c #AF6D55", +"{ c #8E4234", +"] c #76392E", +"^ c #EBD5AF", +"/ c #B3A579", +"( c #968763", +"_ c #62372C", +": c #62523C", +"< c #A35343", +"[ c #807053", +"} c #B29380", +"| c #C9BA84", +"1 c #967C5C", +"2 c #C08667", +"3 c #5E2E24", +"4 c #E6C69C", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" /+@ ", +" ($+/* ", +" [|'''' ((@ ", +" (''''' [|*' ", +" +'''''%+''' ", +" @*''''//''' ", +" ***' ^*'' ", +" ** %/* ", +" [[$(}! $1|* ", +" ##}!!>/! $!^^ ", +" ##,!!!!!>! !4^* ", +" #1>>>>>>!>! !4 ", +" #),,,,>>>>> ()> ", +" --&&&,,,,,>> :[> ", +" 2&&&&&&&&,, [,! ", +" 22222&&&&& &,^ ", +" ~-22222& ", +" ;-----2} ", +" ;~~~~--& ", +" _===~~)} ", +" 33__3.;=====}} ", +" ..]]]]{<<<<<<} "}; diff -uNr gnome-core-0.25/gnome-terminal/ChangeLog gnome-core-0.27/gnome-terminal/ChangeLog --- gnome-core-0.25/gnome-terminal/ChangeLog Wed Jul 15 23:13:43 1998 +++ gnome-core-0.27/gnome-terminal/ChangeLog Thu Aug 6 13:02:54 1998 @@ -1,3 +1,8 @@ +1998-08-06 Miguel de Icaza + + * gnome-terminal.c (close_all_cmd): Removed close all terminals + option. + 1998-07-15 Miguel de Icaza * gnome-terminal.c: Add support for hidden menubars. diff -uNr gnome-core-0.25/gnome-terminal/gnome-terminal.c gnome-core-0.27/gnome-terminal/gnome-terminal.c --- gnome-core-0.25/gnome-terminal/gnome-terminal.c Wed Jul 15 23:19:41 1998 +++ gnome-core-0.27/gnome-terminal/gnome-terminal.c Mon Aug 10 04:08:02 1998 @@ -137,12 +137,14 @@ gtk_main_quit (); } +#if 0 static void close_all_cmd (void) { while (terminals) close_terminal_cmd (0, terminals->data); } +#endif /* * Keep a copy of the current font name @@ -668,7 +670,6 @@ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_PROP }, { GNOME_APP_UI_ITEM, N_("Color selector..."), NULL, color_cmd }, { GNOME_APP_UI_SEPARATOR }, - { GNOME_APP_UI_ITEM, N_("Close all terminals"), NULL, close_all_cmd }, GNOMEUIINFO_END }; @@ -1122,7 +1123,9 @@ static gint die (GnomeClient *client, gpointer client_data) { +#if 0 close_all_cmd (); +#endif return TRUE; } diff -uNr gnome-core-0.25/gnome-terminal/gnome-terminal.desktop gnome-core-0.27/gnome-terminal/gnome-terminal.desktop --- gnome-core-0.25/gnome-terminal/gnome-terminal.desktop Thu Jul 9 15:55:47 1998 +++ gnome-core-0.27/gnome-terminal/gnome-terminal.desktop Mon Aug 10 04:08:02 1998 @@ -1,11 +1,12 @@ [Desktop Entry] Name=GNOME terminal emulation program -Name[fr]=Emulateur de Terminal GNOME Name[es]=Terminal UNIX de GNOME +Name[fr]=Emulateur de Terminal GNOME Name[ko]=GNOME 터미널 프로그램 Name[no]=Gnome terminalemuleringsprogram Name[pt]=Terminal GNOME Comment=Terminal emulation program +Comment[es]=Emulador de terminal GNOME Comment[fr]=Emulateur de Terminal GNOME Comment[ko]=GNOME 터미널 프로그램 Comment[no]=Terinalemuleringsprogram for Gnome diff -uNr gnome-core-0.25/gsm/Makefile.in gnome-core-0.27/gsm/Makefile.in --- gnome-core-0.25/gsm/Makefile.in Wed Aug 5 20:26:10 1998 +++ gnome-core-0.27/gsm/Makefile.in Thu Aug 13 08:15:55 1998 @@ -341,8 +341,8 @@ manager.o: manager.c manager.h prop.o: prop.c manager.h save-session.o: save-session.c ../config.h -save.o: save.c ../config.h manager.h -session-properties.o: session-properties.c ../config.h +save.o: save.c ../config.h manager.h session.h +session-properties.o: session-properties.c ../config.h session.h info: dvi: diff -uNr gnome-core-0.25/gsm/session.desktop gnome-core-0.27/gsm/session.desktop --- gnome-core-0.25/gsm/session.desktop Thu Jul 30 18:38:39 1998 +++ gnome-core-0.27/gsm/session.desktop Mon Aug 10 04:08:02 1998 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Session Manager Properties +Name[es]=Propiedades del Gestor de Sesiones Name[pt]=Propriedades do Gestor de Sess�es Comment=Session Manager Properties +Comment[es]=Permite configurar las propiedades del gestor de sesiones de Gnome Comment[pt]=Propriedades do Gestor de Sess�es Exec=session-properties Icon= diff -uNr gnome-core-0.25/macros/ChangeLog gnome-core-0.27/macros/ChangeLog --- gnome-core-0.25/macros/ChangeLog Wed Aug 5 12:42:28 1998 +++ gnome-core-0.27/macros/ChangeLog Mon Aug 10 04:08:03 1998 @@ -1,3 +1,7 @@ +1998-08-06 Martin Baulig + + * gnome-libgtop-sysdeps.m4: Added `freebsd' directory. + 1998-08-04 Raja R Harinath * gnome-x-checks.m4: Define USE_DEVGTK unconditionally to `true'. diff -uNr gnome-core-0.25/macros/gnome-libgtop-sysdeps.m4 gnome-core-0.27/macros/gnome-libgtop-sysdeps.m4 --- gnome-core-0.25/macros/gnome-libgtop-sysdeps.m4 Thu Jul 30 18:38:40 1998 +++ gnome-core-0.27/macros/gnome-libgtop-sysdeps.m4 Mon Aug 10 04:08:03 1998 @@ -83,6 +83,11 @@ libgtop_use_machine_h=yes libgtop_need_server=yes ;; + freebsd*) + libgtop_sysdeps_dir=freebsd + libgtop_use_machine_h=yes + libgtop_need_server=yes + ;; *) libgtop_sysdeps_dir=stub libgtop_use_machine_h=no diff -uNr gnome-core-0.25/panel/ChangeLog gnome-core-0.27/panel/ChangeLog --- gnome-core-0.25/panel/ChangeLog Mon Aug 3 13:35:10 1998 +++ gnome-core-0.27/panel/ChangeLog Thu Aug 13 00:21:00 1998 @@ -1,3 +1,64 @@ +Wed Aug 12 20:30:22 1998 George Lebl + + * drawer.[ch],drawer-widget.[ch],session.c,panel.c: offload some + drawer functionality from drawer.c to drawer-widget, and make the + size allocation stuff work right + +Wed Aug 12 01:00:40 1998 George Lebl + + * drawer.c,panel.c: fix autohide panel/drawer interaction + +Tue Aug 11 03:01:27 1998 George Lebl + + * drawer.c,menu.c: minor -Wall induced cleanups + +Tue Aug 11 02:45:55 1998 George Lebl + + * drawer.[ch],panel_config.[ch],applet.c: merged panel configuration + with the applet configuration in drawers + + * panel_config.c, panel.c: remove panel config dialog when the panel + is destroyed + + * *.c: minor cleanups + +Mon Aug 10 02:32:19 1998 George Lebl + + * launcher.c: removed a leak when launchers were destroyed + and made config dialog disappear when it's launcher is + destroyed + + * menu.c: made config dialog disappear when it's menu is + destroyed + + * drawer.c: made config dialog disappear when it's drawer is + destroyed + + * panel.c,applet.c: put in hacks to deal with tooltips owning + a reference count for applets + +Sun Aug 09 19:59:18 1998 George Lebl + + * menu.c: implemented properties of menu buttons + +Sat Aug 08 23:42:14 1998 George Lebl + + * panel-widget.c: fixed interaction of applet_padding and + insertion of applets + +Sat Aug 08 14:46:16 1998 George Lebl + + * *.c: minor cleanups in function params + +Sat Aug 08 01:29:31 1998 George Lebl + + * panel.c: fixed a few warnings + + * main.c: reordered some startup items + + * panel_config_global.[ch],panel-widget.[ch],session.c: support + applet padding, the minimum distance between applets + Mon Aug 03 03:04:44 1998 George Lebl * *.(c|cc): fixed memory leaks concerning remove_link diff -uNr gnome-core-0.25/panel/Makefile.in gnome-core-0.27/panel/Makefile.in --- gnome-core-0.25/panel/Makefile.in Wed Aug 5 20:25:40 1998 +++ gnome-core-0.27/panel/Makefile.in Thu Aug 13 08:15:25 1998 @@ -493,8 +493,8 @@ applet-widget.lo applet-widget.o: applet-widget.c ../config.h \ applet-widget.h applet-lib.h mico-parse.h applet.o: applet.c ../config.h panel-include.h panel-widget.h \ - snapped-widget.h drawer-widget.h corner-widget.h panel.h \ - applet.h session.h main.h panel_config.h panel_config_global.h \ + snapped-widget.h drawer-widget.h applet.h corner-widget.h \ + panel.h session.h main.h panel_config.h panel_config_global.h \ menu.h drawer.h swallow.h launcher.h logout.h extern.h mulapp.h \ exec-queue.h mico-glue.h mico-parse.h panel-util.h gdkextra.h \ cookie.h @@ -502,22 +502,22 @@ corner-widget.o: corner-widget.c ../config.h panel-widget.h \ corner-widget.h panel-util.h gdkextra.h drawer-widget.o: drawer-widget.c ../config.h panel-widget.h \ - drawer-widget.h panel-util.h gdkextra.h + drawer-widget.h applet.h panel-util.h gdkextra.h drawer.o: drawer.c ../config.h panel-include.h panel-widget.h \ - snapped-widget.h drawer-widget.h corner-widget.h panel.h \ - applet.h session.h main.h panel_config.h panel_config_global.h \ + snapped-widget.h drawer-widget.h applet.h corner-widget.h \ + panel.h session.h main.h panel_config.h panel_config_global.h \ menu.h drawer.h swallow.h launcher.h logout.h extern.h mulapp.h \ exec-queue.h mico-glue.h mico-parse.h panel-util.h gdkextra.h \ cookie.h exec-queue.o: exec-queue.c ../config.h panel-include.h panel-widget.h \ - snapped-widget.h drawer-widget.h corner-widget.h panel.h \ - applet.h session.h main.h panel_config.h panel_config_global.h \ + snapped-widget.h drawer-widget.h applet.h corner-widget.h \ + panel.h session.h main.h panel_config.h panel_config_global.h \ menu.h drawer.h swallow.h launcher.h logout.h extern.h mulapp.h \ exec-queue.h mico-glue.h mico-parse.h panel-util.h gdkextra.h \ cookie.h extern.o: extern.c ../config.h panel-include.h panel-widget.h \ - snapped-widget.h drawer-widget.h corner-widget.h panel.h \ - applet.h session.h main.h panel_config.h panel_config_global.h \ + snapped-widget.h drawer-widget.h applet.h corner-widget.h \ + panel.h session.h main.h panel_config.h panel_config_global.h \ menu.h drawer.h swallow.h launcher.h logout.h extern.h mulapp.h \ exec-queue.h mico-glue.h mico-parse.h panel-util.h gdkextra.h \ cookie.h @@ -530,26 +530,26 @@ gnome-panel.h gnome-panel.lo gnome-panel.o: gnome-panel.cc gnome-panel.h launcher.o: launcher.c ../config.h panel-include.h panel-widget.h \ - snapped-widget.h drawer-widget.h corner-widget.h panel.h \ - applet.h session.h main.h panel_config.h panel_config_global.h \ + snapped-widget.h drawer-widget.h applet.h corner-widget.h \ + panel.h session.h main.h panel_config.h panel_config_global.h \ menu.h drawer.h swallow.h launcher.h logout.h extern.h mulapp.h \ exec-queue.h mico-glue.h mico-parse.h panel-util.h gdkextra.h \ cookie.h logout.o: logout.c ../config.h panel-include.h panel-widget.h \ - snapped-widget.h drawer-widget.h corner-widget.h panel.h \ - applet.h session.h main.h panel_config.h panel_config_global.h \ + snapped-widget.h drawer-widget.h applet.h corner-widget.h \ + panel.h session.h main.h panel_config.h panel_config_global.h \ menu.h drawer.h swallow.h launcher.h logout.h extern.h mulapp.h \ exec-queue.h mico-glue.h mico-parse.h panel-util.h gdkextra.h \ cookie.h main.o: main.c ../config.h panel-include.h panel-widget.h \ - snapped-widget.h drawer-widget.h corner-widget.h panel.h \ - applet.h session.h main.h panel_config.h panel_config_global.h \ + snapped-widget.h drawer-widget.h applet.h corner-widget.h \ + panel.h session.h main.h panel_config.h panel_config_global.h \ menu.h drawer.h swallow.h launcher.h logout.h extern.h mulapp.h \ exec-queue.h mico-glue.h mico-parse.h panel-util.h gdkextra.h \ cookie.h menu.o: menu.c ../config.h panel-include.h panel-widget.h \ - snapped-widget.h drawer-widget.h corner-widget.h panel.h \ - applet.h session.h main.h panel_config.h panel_config_global.h \ + snapped-widget.h drawer-widget.h applet.h corner-widget.h \ + panel.h session.h main.h panel_config.h panel_config_global.h \ menu.h drawer.h swallow.h launcher.h logout.h extern.h mulapp.h \ exec-queue.h mico-glue.h mico-parse.h panel-util.h gdkextra.h \ cookie.h @@ -558,16 +558,16 @@ mico-parse.lo mico-parse.o: mico-parse.cc ../config.h mico-glue.h \ panel-widget.h gnome-panel.h panel.h mico-parse.h mulapp.o: mulapp.c ../config.h panel-include.h panel-widget.h \ - snapped-widget.h drawer-widget.h corner-widget.h panel.h \ - applet.h session.h main.h panel_config.h panel_config_global.h \ + snapped-widget.h drawer-widget.h applet.h corner-widget.h \ + panel.h session.h main.h panel_config.h panel_config_global.h \ menu.h drawer.h swallow.h launcher.h logout.h extern.h mulapp.h \ exec-queue.h mico-glue.h mico-parse.h panel-util.h gdkextra.h \ cookie.h orbit-applet-lib.lo orbit-applet-lib.o: orbit-applet-lib.c applet-lib.h \ applet-widget.h cookie.h gnome-panel.h orbit-glue.o: orbit-glue.c ../config.h panel-include.h panel-widget.h \ - snapped-widget.h drawer-widget.h corner-widget.h panel.h \ - applet.h session.h main.h panel_config.h panel_config_global.h \ + snapped-widget.h drawer-widget.h applet.h corner-widget.h \ + panel.h session.h main.h panel_config.h panel_config_global.h \ menu.h drawer.h swallow.h launcher.h logout.h extern.h mulapp.h \ exec-queue.h mico-glue.h mico-parse.h panel-util.h gdkextra.h \ cookie.h gnome-panel.h @@ -575,34 +575,34 @@ panel-widget.o: panel-widget.c ../config.h panel-widget.h panel-util.h \ gdkextra.h panel.o: panel.c ../config.h panel-include.h panel-widget.h \ - snapped-widget.h drawer-widget.h corner-widget.h panel.h \ - applet.h session.h main.h panel_config.h panel_config_global.h \ + snapped-widget.h drawer-widget.h applet.h corner-widget.h \ + panel.h session.h main.h panel_config.h panel_config_global.h \ menu.h drawer.h swallow.h launcher.h logout.h extern.h mulapp.h \ exec-queue.h mico-glue.h mico-parse.h panel-util.h gdkextra.h \ cookie.h panel_config.o: panel_config.c ../config.h panel-include.h \ - panel-widget.h snapped-widget.h drawer-widget.h corner-widget.h \ - panel.h applet.h session.h main.h panel_config.h \ + panel-widget.h snapped-widget.h drawer-widget.h applet.h \ + corner-widget.h panel.h session.h main.h panel_config.h \ panel_config_global.h menu.h drawer.h swallow.h launcher.h \ logout.h extern.h mulapp.h exec-queue.h mico-glue.h \ mico-parse.h panel-util.h gdkextra.h cookie.h panel_config_global.o: panel_config_global.c ../config.h panel-include.h \ - panel-widget.h snapped-widget.h drawer-widget.h corner-widget.h \ - panel.h applet.h session.h main.h panel_config.h \ + panel-widget.h snapped-widget.h drawer-widget.h applet.h \ + corner-widget.h panel.h session.h main.h panel_config.h \ panel_config_global.h menu.h drawer.h swallow.h launcher.h \ logout.h extern.h mulapp.h exec-queue.h mico-glue.h \ mico-parse.h panel-util.h gdkextra.h cookie.h session.o: session.c ../config.h panel-include.h panel-widget.h \ - snapped-widget.h drawer-widget.h corner-widget.h panel.h \ - applet.h session.h main.h panel_config.h panel_config_global.h \ + snapped-widget.h drawer-widget.h applet.h corner-widget.h \ + panel.h session.h main.h panel_config.h panel_config_global.h \ menu.h drawer.h swallow.h launcher.h logout.h extern.h mulapp.h \ exec-queue.h mico-glue.h mico-parse.h panel-util.h gdkextra.h \ cookie.h snapped-widget.o: snapped-widget.c ../config.h panel-widget.h \ snapped-widget.h panel-util.h gdkextra.h swallow.o: swallow.c ../config.h panel-include.h panel-widget.h \ - snapped-widget.h drawer-widget.h corner-widget.h panel.h \ - applet.h session.h main.h panel_config.h panel_config_global.h \ + snapped-widget.h drawer-widget.h applet.h corner-widget.h \ + panel.h session.h main.h panel_config.h panel_config_global.h \ menu.h drawer.h swallow.h launcher.h logout.h extern.h mulapp.h \ exec-queue.h mico-glue.h mico-parse.h panel-util.h gdkextra.h \ cookie.h diff -uNr gnome-core-0.25/panel/applet.c gnome-core-0.27/panel/applet.c --- gnome-core-0.25/panel/applet.c Mon Aug 3 13:35:10 1998 +++ gnome-core-0.27/panel/applet.c Tue Aug 11 01:32:35 1998 @@ -29,6 +29,8 @@ extern int globals_to_sync; extern int need_complete_save; +extern GtkTooltips *panel_tooltips; + static void move_applet_callback(GtkWidget *widget, gpointer data) { @@ -69,8 +71,11 @@ panel = gtk_object_get_data(GTK_OBJECT(w), PANEL_APPLET_PARENT_KEY); - if(panel) + if(panel) { + gtk_widget_ref(w); gtk_container_remove(GTK_CONTAINER(panel),w); + gtk_widget_destroy(w); + } } info->applet_widget = NULL; if(type == APPLET_DRAWER) { @@ -132,9 +137,16 @@ if(strcmp(menu->name,"properties")==0) launcher_properties(info->data); break; - case APPLET_DRAWER: + case APPLET_DRAWER: + if(strcmp(menu->name,"properties")==0) { + Drawer *drawer = info->data; + g_assert(drawer); + panel_config(drawer->drawer); + } + break; + case APPLET_MENU: if(strcmp(menu->name,"properties")==0) - drawer_properties(info->data); + menu_properties(info->data); break; default: break; } @@ -494,8 +506,8 @@ int register_toy(GtkWidget *applet, gpointer data, - int pos, PanelWidget *panel, + int pos, AppletType type) { GtkWidget *eventbox; diff -uNr gnome-core-0.25/panel/applet.h gnome-core-0.27/panel/applet.h --- gnome-core-0.25/panel/applet.h Thu Jul 30 18:38:43 1998 +++ gnome-core-0.27/panel/applet.h Mon Aug 10 04:22:24 1998 @@ -57,8 +57,8 @@ int register_toy(GtkWidget *applet, gpointer data, - int pos, PanelWidget *panel, + int pos, AppletType type); void panel_clean_applet(int applet_id); diff -uNr gnome-core-0.25/panel/corner-widget.c gnome-core-0.27/panel/corner-widget.c --- gnome-core-0.25/panel/corner-widget.c Fri Jul 31 13:49:36 1998 +++ gnome-core-0.27/panel/corner-widget.c Thu Aug 13 00:21:01 1998 @@ -574,12 +574,6 @@ return w; } -static int -corner_widget_destroy(GtkWidget *w, gpointer data) -{ - return FALSE; -} - static void corner_widget_init (CornerWidget *corner) { @@ -635,10 +629,6 @@ gtk_signal_connect(GTK_OBJECT(corner), "enter_notify_event", GTK_SIGNAL_FUNC(corner_enter_notify), NULL); - gtk_signal_connect(GTK_OBJECT(corner), - "destroy", - GTK_SIGNAL_FUNC(corner_widget_destroy), - NULL); corner->pos = CORNER_NE; corner->state = CORNER_SHOWN; } @@ -702,7 +692,6 @@ int fit_pixmap_bg, GdkColor *back_color) { - PanelOrientation oldorient; CornerPos oldpos; CornerState oldstate; @@ -714,10 +703,8 @@ oldstate = corner->state; corner->state = state; - oldorient = PANEL_WIDGET(corner->panel)->orient; - /*avoid flicker during size_request*/ - if(oldorient != orient) + if(PANEL_WIDGET(corner->panel)->orient != orient) corner_widget_request_cube = TRUE; panel_widget_change_params(PANEL_WIDGET(corner->panel), diff -uNr gnome-core-0.25/panel/drawer-widget.c gnome-core-0.27/panel/drawer-widget.c --- gnome-core-0.25/panel/drawer-widget.c Mon Aug 3 13:35:11 1998 +++ gnome-core-0.27/panel/drawer-widget.c Thu Aug 13 00:21:01 1998 @@ -18,6 +18,10 @@ static void drawer_widget_class_init (DrawerWidgetClass *klass); static void drawer_widget_init (DrawerWidget *drawer); +static void drawer_widget_size_request (GtkWidget *widget, + GtkRequisition *requisition); +static void drawer_widget_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); extern GdkCursor *fleur_cursor; @@ -85,9 +89,8 @@ static void drawer_widget_class_init (DrawerWidgetClass *class) { - GtkObjectClass *object_class; - - object_class = (GtkObjectClass*) class; + GtkObjectClass *object_class = (GtkObjectClass*) class; + GtkWidgetClass *widget_class = (GtkWidgetClass*) class; drawer_widget_signals[STATE_CHANGE_SIGNAL] = gtk_signal_new("state_change", @@ -104,38 +107,147 @@ LAST_SIGNAL); class->state_change = NULL; + + widget_class->size_request = drawer_widget_size_request; + widget_class->size_allocate = drawer_widget_size_allocate; } +/*if this is set, the size request and size alloc calls are ignored*/ +static int ignore_allocate = FALSE; + +/*if this is true the size request will request a 48x48 cube, this is used + during orientation changes to make no flicker*/ +static int drawer_widget_request_cube = FALSE; static void -drawer_widget_set_drop_zone(DrawerWidget *drawer) +drawer_widget_size_request(GtkWidget *widget, + GtkRequisition *requisition) { - if(PANEL_WIDGET(drawer->panel)->orient == PANEL_HORIZONTAL) { - if(drawer->drop_zone_pos == DROP_ZONE_LEFT) { - gtk_widget_hide(drawer->handle_n); - gtk_widget_show(drawer->handle_e); - gtk_widget_hide(drawer->handle_w); - gtk_widget_hide(drawer->handle_s); - } else { - gtk_widget_hide(drawer->handle_n); - gtk_widget_hide(drawer->handle_e); - gtk_widget_show(drawer->handle_w); - gtk_widget_hide(drawer->handle_s); - } - } else { - if(drawer->drop_zone_pos == DROP_ZONE_LEFT) { - gtk_widget_show(drawer->handle_n); - gtk_widget_hide(drawer->handle_e); - gtk_widget_hide(drawer->handle_w); - gtk_widget_hide(drawer->handle_s); - } else { - gtk_widget_hide(drawer->handle_n); - gtk_widget_hide(drawer->handle_e); - gtk_widget_hide(drawer->handle_w); - gtk_widget_show(drawer->handle_s); + DrawerWidget *drawer = DRAWER_WIDGET(widget); + if(ignore_allocate) + return; + if(drawer_widget_request_cube) { + requisition->width = 48; + requisition->height = 48; + drawer_widget_request_cube = FALSE; + return; + } + + gtk_widget_size_request (drawer->table, &drawer->table->requisition); + + requisition->width = drawer->table->requisition.width; + requisition->height = drawer->table->requisition.height; +} + +static void +drawer_widget_get_pos(DrawerWidget *drawer, gint16 *x, gint16 *y, + int width, int height) +{ + PanelWidget *panel = PANEL_WIDGET(drawer->panel); + + if (panel->master_widget && + GTK_WIDGET_REALIZED (panel->master_widget)) { + int bx, by, bw, bh; + int px, py, pw, ph; + GtkWidget *ppanel; /*parent panel*/ + + /*get's the panel data from the the applet*/ + ppanel = gtk_object_get_data(GTK_OBJECT(panel->master_widget), + PANEL_APPLET_PARENT_KEY); + if (GTK_WIDGET_REALIZED (ppanel)) { + gdk_window_get_origin (panel->master_widget->window, &bx, &by); + gdk_window_get_size (panel->master_widget->window, &bw, &bh); + gdk_window_get_origin (ppanel->window, &px, &py); + gdk_window_get_size (ppanel->window, &pw, &ph); + + switch(drawer->orient) { + case ORIENT_UP: + *x = bx+(bw-width)/2; + *y = py - height; + break; + case ORIENT_DOWN: + *x = bx+(bw-width)/2; + *y = py + ph; + break; + case ORIENT_LEFT: + *x = px - width; + *y = by+(bh-height)/2; + break; + case ORIENT_RIGHT: + *x = px + pw; + *y = by+(bh-height)/2; + break; + } } } } +static void +drawer_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation) +{ + DrawerWidget *drawer = DRAWER_WIDGET(widget); + GtkAllocation challoc; + + if(ignore_allocate) + return; + + /*we actually want to ignore the size_reqeusts since they are sometimes + a cube for the flicker prevention*/ + gtk_widget_size_request (drawer->table, &drawer->table->requisition); + + allocation->width = drawer->table->requisition.width; + allocation->height = drawer->table->requisition.height; + + drawer_widget_get_pos(drawer, + &allocation->x, + &allocation->y, + allocation->width, + allocation->height); + + widget->allocation = *allocation; + if (GTK_WIDGET_REALIZED (widget)) + gdk_window_move_resize (widget->window, + allocation->x, + allocation->y, + allocation->width, + allocation->height); + + challoc.x = challoc.y = 0; + challoc.width = allocation->width; + challoc.height = allocation->height; + gtk_widget_size_allocate(drawer->table,&challoc); +} + +static void +drawer_widget_set_drop_zone(DrawerWidget *drawer) +{ + switch(drawer->orient) { + case ORIENT_UP: + gtk_widget_show(drawer->handle_n); + gtk_widget_hide(drawer->handle_e); + gtk_widget_hide(drawer->handle_w); + gtk_widget_hide(drawer->handle_s); + break; + case ORIENT_DOWN: + gtk_widget_hide(drawer->handle_n); + gtk_widget_hide(drawer->handle_e); + gtk_widget_hide(drawer->handle_w); + gtk_widget_show(drawer->handle_s); + break; + case ORIENT_LEFT: + gtk_widget_hide(drawer->handle_n); + gtk_widget_show(drawer->handle_e); + gtk_widget_hide(drawer->handle_w); + gtk_widget_hide(drawer->handle_s); + break; + case ORIENT_RIGHT: + gtk_widget_hide(drawer->handle_n); + gtk_widget_hide(drawer->handle_e); + gtk_widget_show(drawer->handle_w); + gtk_widget_hide(drawer->handle_s); + break; + } +} + static int move_step(int src, int dest, int pos, int step) { @@ -145,20 +257,18 @@ if(percentage>50) percentage = 100-percentage; - + return ((step>>1)*log((percentage/10.0)+1))+1; } static void -move_horiz_d(DrawerWidget *drawer, int src_x, int dest_x, int step, int hide) +move_horiz_d(DrawerWidget *drawer, int x, int y, int w, int h, + int src_x, int dest_x, int step, int hide) { - int orig_x, x, y; - int orig_w, w, h; + int orig_x; + int orig_w; GtkWidget *wid = GTK_WIDGET(drawer); - x = drawer->x; - y = drawer->y; - gdk_window_get_size(wid->window,&w,&h); if(!hide) w = 0; @@ -200,19 +310,17 @@ else w = orig_w + abs(src_x-dest_x); - move_resize_window(wid, dest_x, drawer->y,w,h); + move_resize_window(wid, dest_x, y,w,h); } static void -move_vert_d(DrawerWidget *drawer, int src_y, int dest_y, int step, int hide) +move_vert_d(DrawerWidget *drawer, int x, int y, int w, int h, + int src_y, int dest_y, int step, int hide) { - int orig_y, x, y; - int orig_h, w, h; + int orig_y; + int orig_h; GtkWidget *wid = GTK_WIDGET(drawer); - x = drawer->x; - y = drawer->y; - gdk_window_get_size(wid->window,&w,&h); if(!hide) h = 0; @@ -254,13 +362,13 @@ else h = orig_h + abs(src_y-dest_y); - move_resize_window(wid, drawer->x, dest_y, w,h); + move_resize_window(wid, x, dest_y, w,h); } void drawer_widget_open_drawer(DrawerWidget *drawer) { - int x,y; + gint16 x=0,y=0; int width, height; if((drawer->state == DRAWER_SHOWN) || @@ -268,46 +376,41 @@ return; if(!GTK_WIDGET(drawer)->window) { - gtk_widget_set_uposition(GTK_WIDGET(drawer),drawer->x,drawer->y); + gtk_widget_queue_resize(GTK_WIDGET(drawer)); drawer->state = DRAWER_SHOWN; return; } - drawer->state = DRAWER_MOVING; - width = GTK_WIDGET(drawer)->allocation.width; height = GTK_WIDGET(drawer)->allocation.height; - x = drawer->x; - y = drawer->y; + drawer_widget_get_pos(drawer,&x,&y,width,height); + + drawer->state = DRAWER_MOVING; gdk_window_move(GTK_WIDGET(drawer)->window, -3000,-3000); - gtk_widget_show(GTK_WIDGET(drawer)); - if(PANEL_WIDGET(drawer->panel)->orient == PANEL_HORIZONTAL) { - if(drawer->drop_zone_pos==DROP_ZONE_LEFT) { - move_resize_window(GTK_WIDGET(drawer),x+width,y, - 0,height); - move_horiz_d(drawer, x+width, x, + ignore_allocate = TRUE; + gtk_widget_show_now(GTK_WIDGET(drawer)); + ignore_allocate = FALSE; + if(!pw_disable_animations) { + switch(drawer->orient) { + case ORIENT_UP: + move_vert_d(drawer,x,y,width,height, y+height, y, + pw_drawer_step,FALSE); + break; + case ORIENT_DOWN: + move_vert_d(drawer,x,y,width,height, y-height, y, + pw_drawer_step,FALSE); + break; + case ORIENT_LEFT: + move_horiz_d(drawer,x,y,width,height, x+width, x, pw_drawer_step,FALSE); - } else { - move_resize_window(GTK_WIDGET(drawer),x-width,y, - 0,height); - move_horiz_d(drawer, x-width, x, + break; + case ORIENT_RIGHT: + move_horiz_d(drawer,x,y,width,height, x-width, x, pw_drawer_step,FALSE); - } - } else { - if(drawer->drop_zone_pos==DROP_ZONE_LEFT) { - move_resize_window(GTK_WIDGET(drawer),x,y+height, - width,0); - move_vert_d(drawer, y+height, y, - pw_drawer_step,FALSE); - } else { - move_resize_window(GTK_WIDGET(drawer),x,y-height, - width,0); - move_vert_d(drawer, y-height, y, - pw_drawer_step,FALSE); + break; } } - /*move_resize_window(GTK_WIDGET(drawer),x,y,width,height);*/ drawer->state = DRAWER_SHOWN; @@ -315,12 +418,13 @@ drawer_widget_signals[STATE_CHANGE_SIGNAL], DRAWER_SHOWN); + gtk_widget_queue_resize(GTK_WIDGET(drawer)); } void drawer_widget_close_drawer(DrawerWidget *drawer) { - int x,y; + gint16 x=0,y=0; int width, height; if((drawer->state != DRAWER_SHOWN) || @@ -337,37 +441,36 @@ drawer_widget_signals[STATE_CHANGE_SIGNAL], DRAWER_HIDDEN); - drawer->state = DRAWER_MOVING; - width = GTK_WIDGET(drawer)->allocation.width; height = GTK_WIDGET(drawer)->allocation.height; - gdk_window_get_position(GTK_WIDGET(drawer)->window,&x,&y); + drawer_widget_get_pos(drawer,&x,&y,width,height); + + drawer->state = DRAWER_MOVING; if(!pw_disable_animations) { - if(PANEL_WIDGET(drawer->panel)->orient == PANEL_HORIZONTAL) { - if(drawer->drop_zone_pos==DROP_ZONE_LEFT) - move_horiz_d(drawer, x, x+width, - pw_drawer_step, TRUE); - else - move_horiz_d(drawer, x, x-width, - pw_drawer_step, TRUE); - } else { - if(drawer->drop_zone_pos==DROP_ZONE_LEFT) - move_vert_d(drawer, y, y+height, - pw_drawer_step, TRUE); - else - move_vert_d(drawer, y, y-height, - pw_drawer_step, TRUE); + switch(drawer->orient) { + case ORIENT_UP: + move_vert_d(drawer,x,y,width,height, y, y+height, + pw_drawer_step, TRUE); + break; + case ORIENT_DOWN: + move_vert_d(drawer,x,y,width,height, y, y-height, + pw_drawer_step, TRUE); + break; + case ORIENT_LEFT: + move_horiz_d(drawer,x,y,width,height, x, x+width, + pw_drawer_step, TRUE); + break; + case ORIENT_RIGHT: + move_horiz_d(drawer,x,y,width,height, x, x-width, + pw_drawer_step, TRUE); + break; } } gtk_widget_hide(GTK_WIDGET(drawer)); - move_window(GTK_WIDGET(drawer),x,y); - drawer->state = DRAWER_HIDDEN; - - move_resize_window(GTK_WIDGET(drawer),x,y,width,height); } @@ -404,12 +507,6 @@ return w; } -static int -drawer_widget_destroy(GtkWidget *w, gpointer data) -{ - return FALSE; -} - static void drawer_widget_init (DrawerWidget *drawer) { @@ -448,21 +545,14 @@ gtk_signal_connect(GTK_OBJECT(drawer), "enter_notify_event", GTK_SIGNAL_FUNC(drawer_enter_notify), NULL); - gtk_signal_connect(GTK_OBJECT(drawer), - "destroy", - GTK_SIGNAL_FUNC(drawer_widget_destroy), - NULL); - drawer->state = DRAWER_SHOWN; - drawer->drop_zone_pos = DROP_ZONE_LEFT; } GtkWidget* -drawer_widget_new (PanelOrientation orient, +drawer_widget_new (PanelOrientType orient, DrawerState state, - DrawerDropZonePos drop_zone_pos, PanelBackType back_type, char *back_pixmap, int fit_pixmap_bg, @@ -470,11 +560,19 @@ { DrawerWidget *drawer; GtkWidget *frame; - + PanelOrientation porient; + drawer = gtk_type_new(drawer_widget_get_type()); + switch(orient) { + case ORIENT_UP: porient = PANEL_VERTICAL; break; + case ORIENT_DOWN: porient = PANEL_VERTICAL; break; + case ORIENT_LEFT: porient = PANEL_HORIZONTAL; break; + case ORIENT_RIGHT: porient = PANEL_HORIZONTAL; break; + } + drawer->panel = panel_widget_new(TRUE, - orient, + porient, back_type, back_pixmap, fit_pixmap_bg, @@ -497,9 +595,7 @@ drawer->state = state; - drawer->x = 0; - drawer->y = 0; - drawer_widget_set_pos(drawer,-100,-100); + gtk_widget_set_uposition(GTK_WIDGET(drawer),-100,-100); drawer_widget_set_drop_zone(drawer); return GTK_WIDGET(drawer); @@ -507,32 +603,43 @@ void drawer_widget_change_params(DrawerWidget *drawer, - PanelOrientation orient, + PanelOrientType orient, DrawerState state, - DrawerDropZonePos drop_zone_pos, PanelBackType back_type, char *pixmap, int fit_pixmap_bg, GdkColor *back_color) { DrawerState oldstate; + PanelOrientation porient; g_return_if_fail(drawer); g_return_if_fail(GTK_WIDGET_REALIZED(GTK_WIDGET(drawer))); + switch(orient) { + case ORIENT_UP: porient = PANEL_VERTICAL; break; + case ORIENT_DOWN: porient = PANEL_VERTICAL; break; + case ORIENT_LEFT: porient = PANEL_HORIZONTAL; break; + case ORIENT_RIGHT: porient = PANEL_HORIZONTAL; break; + } + oldstate = drawer->state; drawer->state = state; + drawer->orient = orient; + + /*avoid flicker during size_request*/ + if(PANEL_WIDGET(drawer->panel)->orient != porient) + drawer_widget_request_cube = TRUE; + panel_widget_change_params(PANEL_WIDGET(drawer->panel), - orient, + porient, back_type, pixmap, fit_pixmap_bg, back_color); - - drawer->drop_zone_pos = drop_zone_pos; drawer_widget_set_drop_zone(drawer); if(oldstate != drawer->state) @@ -543,13 +650,12 @@ void drawer_widget_change_orient(DrawerWidget *drawer, - PanelOrientation orient) + PanelOrientType orient) { PanelWidget *panel = PANEL_WIDGET(drawer->panel); drawer_widget_change_params(drawer, orient, drawer->state, - drawer->drop_zone_pos, panel->back_type, panel->back_pixmap, panel->fit_pixmap_bg, @@ -557,42 +663,9 @@ } void -drawer_widget_change_drop_zone_pos(DrawerWidget *drawer, - DrawerDropZonePos drop_zone_pos) -{ - PanelWidget *panel = PANEL_WIDGET(drawer->panel); - drawer_widget_change_params(drawer, - panel->orient, - drawer->state, - drop_zone_pos, - panel->back_type, - panel->back_pixmap, - panel->fit_pixmap_bg, - &panel->back_color); -} - -void -drawer_widget_set_pos(DrawerWidget *drawer, int x, int y) -{ - GtkAllocation alloc; - if(drawer->x!=x || drawer->y!=y) { - drawer->x = x; - drawer->y = y; - if(GTK_WIDGET(drawer)->window) - move_window(GTK_WIDGET(drawer),x,y); - gtk_widget_set_uposition(GTK_WIDGET(drawer),x,y); - - alloc = GTK_WIDGET(drawer)->allocation; - alloc.x = x; - alloc.y = y; - gtk_widget_size_allocate(GTK_WIDGET(drawer),&alloc); - } -} - -void drawer_widget_restore_state(DrawerWidget *drawer) { - gtk_widget_set_uposition(GTK_WIDGET(drawer),drawer->x,drawer->y); + gtk_widget_queue_resize(GTK_WIDGET(drawer)); gtk_widget_show(GTK_WIDGET(drawer)); } diff -uNr gnome-core-0.25/panel/drawer-widget.h gnome-core-0.27/panel/drawer-widget.h --- gnome-core-0.25/panel/drawer-widget.h Thu Jul 9 15:55:51 1998 +++ gnome-core-0.27/panel/drawer-widget.h Thu Aug 13 00:21:01 1998 @@ -8,6 +8,7 @@ #include +#include "applet.h" #include "panel-widget.h" BEGIN_GNOME_DECLS @@ -24,10 +25,6 @@ DRAWER_MOVING, DRAWER_HIDDEN } DrawerState; -typedef enum { - DROP_ZONE_LEFT, - DROP_ZONE_RIGHT -} DrawerDropZonePos; struct _DrawerWidget { @@ -41,10 +38,7 @@ GtkWidget *handle_s; DrawerState state; - - DrawerDropZonePos drop_zone_pos; - int x; - int y; + PanelOrientType orient; }; struct _DrawerWidgetClass @@ -56,10 +50,8 @@ }; guint drawer_widget_get_type (void); -GtkWidget* drawer_widget_new (PanelOrientation orient, +GtkWidget* drawer_widget_new (PanelOrientType orient, DrawerState state, - DrawerDropZonePos - drop_zone_pos, PanelBackType back_type, char *back_pixmap, int fit_pixmap_bg, @@ -71,10 +63,8 @@ /* changing parameters */ void drawer_widget_change_params (DrawerWidget *drawer, - PanelOrientation orient, + PanelOrientType orient, DrawerState state, - DrawerDropZonePos - drop_zone_pos, PanelBackType back_type, char *pixmap_name, int fit_pixmap_bg, @@ -82,17 +72,9 @@ /* changing parameters (orient only) */ void drawer_widget_change_orient (DrawerWidget *drawer, - PanelOrientation orient); -/*changing parameters (dropzonepos only)*/ -void drawer_widget_change_drop_zone_pos(DrawerWidget *drawer, - DrawerDropZonePos - drop_zone_pos); + PanelOrientType orient); void drawer_widget_restore_state (DrawerWidget *drawer); - -void drawer_widget_set_pos (DrawerWidget *panel, - int x, - int y); END_GNOME_DECLS diff -uNr gnome-core-0.25/panel/drawer.c gnome-core-0.27/panel/drawer.c --- gnome-core-0.25/panel/drawer.c Mon Aug 3 13:35:12 1998 +++ gnome-core-0.27/panel/drawer.c Thu Aug 13 00:21:12 1998 @@ -77,20 +77,18 @@ gtk_signal_disconnect_by_data(GTK_OBJECT(tipentry),widget); return FALSE; } -static GtkWidget * -create_properties_dialog(Drawer *drawer) + +void +add_drawer_properties_page(GtkWidget *dialog, Drawer *drawer) { - GtkWidget *dialog; - GtkWidget *table; - GtkWidget *w; - - dialog = gnome_property_box_new(); - gtk_window_set_title(GTK_WINDOW(dialog), _("Drawer properties")); - /*gtk_window_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);*/ - gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, TRUE); + GtkWidget *table; + GtkWidget *f; + GtkWidget *box; + GtkWidget *nbook; + GtkWidget *w; table = gtk_table_new(2, 2, FALSE); - gtk_container_border_width(GTK_CONTAINER(table), 4); + gtk_container_border_width(GTK_CONTAINER(table), 5); gtk_table_set_col_spacings(GTK_TABLE(table), 6); gtk_table_set_row_spacings(GTK_TABLE(table), 2); @@ -102,8 +100,16 @@ dialog); gtk_object_set_data(GTK_OBJECT(dialog),"pixmap",w); - gnome_property_box_append_page (GNOME_PROPERTY_BOX (dialog), - table, gtk_label_new (_("Drawer"))); + f = gtk_frame_new(_("Applet appearance")); + gtk_container_add(GTK_CONTAINER(f),table); + + box = gtk_vbox_new(FALSE,5); + gtk_container_border_width(GTK_CONTAINER(box), 5); + gtk_box_pack_start(GTK_BOX(box),f,FALSE,FALSE,0); + + nbook = GNOME_PROPERTY_BOX (dialog)->notebook; + gtk_notebook_append_page (GTK_NOTEBOOK(nbook), + box, gtk_label_new (_("Drawer"))); gtk_signal_connect(GTK_OBJECT(dialog), "destroy", (GtkSignalFunc) properties_close_callback, @@ -113,71 +119,8 @@ GTK_SIGNAL_FUNC(properties_apply_callback), drawer); - return dialog; -} - -void -drawer_properties(Drawer *drawer) -{ - GtkWidget *dialog; - - dialog = gtk_object_get_data(GTK_OBJECT(drawer->button), - DRAWER_PROPERTIES); - if(dialog) { - gdk_window_raise(dialog->window); - return; - } - - dialog = create_properties_dialog(drawer); gtk_object_set_data(GTK_OBJECT(drawer->button), DRAWER_PROPERTIES,dialog); - gtk_widget_show_all (dialog); -} - - -void -reposition_drawer(Drawer *drawer) -{ - int x=0,y=0; - int bx, by, bw, bh; - int dw, dh; - int px, py, pw, ph; - PanelWidget *panel; /*parent panel*/ - - /*get's the panel data from the event box that is the applet's - parent*/ - panel = gtk_object_get_data(GTK_OBJECT(drawer->button), - PANEL_APPLET_PARENT_KEY); - - gdk_window_get_origin (drawer->button->window, &bx, &by); - gdk_window_get_size (drawer->button->window, &bw, &bh); - if(drawer->drawer->window) - gdk_window_get_size (drawer->drawer->window, &dw, &dh); - else - dw = dh = 48; - gdk_window_get_origin (GTK_WIDGET(panel)->window, &px, &py); - gdk_window_get_size (GTK_WIDGET(panel)->window, &pw, &ph); - - switch(drawer->orient) { - case ORIENT_UP: - x = bx+(bw-dw)/2; - y = py - dh; - break; - case ORIENT_DOWN: - x = bx+(bw-dw)/2; - y = py + ph; - break; - case ORIENT_LEFT: - x = px - dw; - y = by+(bh-dh)/2; - break; - case ORIENT_RIGHT: - x = px + pw; - y = by+(bh-dh)/2; - break; - } - - drawer_widget_set_pos(DRAWER_WIDGET(drawer->drawer),x,y); } static void @@ -190,16 +133,16 @@ GtkWidget *panelw = gtk_object_get_data(GTK_OBJECT(parent), PANEL_PARENT); - reposition_drawer(drawer); + gtk_widget_queue_resize(drawer->drawer); if(drawerw->state == DRAWER_SHOWN) { drawer_widget_close_drawer(DRAWER_WIDGET(drawer->drawer)); if(IS_SNAPPED_WIDGET(panelw)) - SNAPPED_WIDGET(panelw)->drawers_open++; + SNAPPED_WIDGET(panelw)->drawers_open--; } else { drawer_widget_open_drawer(DRAWER_WIDGET(drawer->drawer)); if(IS_SNAPPED_WIDGET(panelw)) - SNAPPED_WIDGET(panelw)->drawers_open--; + SNAPPED_WIDGET(panelw)->drawers_open++; } } @@ -239,6 +182,10 @@ destroy_drawer(GtkWidget *widget, gpointer data) { Drawer *drawer = data; + GtkWidget *prop_dialog = gtk_object_get_data(GTK_OBJECT(drawer->button), + DRAWER_PROPERTIES); + if(prop_dialog) + gtk_widget_destroy(prop_dialog); g_free(drawer); return FALSE; } @@ -253,8 +200,7 @@ } static Drawer * -create_drawer_applet(GtkWidget * drawer_panel, char *tooltip, char *pixmap, - PanelOrientType orient) +create_drawer_applet(GtkWidget * drawer_panel, char *tooltip, char *pixmap) { Drawer *drawer; @@ -287,8 +233,6 @@ pixmap_name = gnome_unconditional_pixmap_file ("gnome-menu-left.png"); break; }*/ - - drawer->orient = orient; /*make the pixmap*/ drawer->button = gnome_pixmap_new_from_file (drawer->pixmap); @@ -311,6 +255,7 @@ gtk_object_set_user_data(GTK_OBJECT(drawer->button),drawer); gtk_object_set_data(GTK_OBJECT(drawer_panel),DRAWER_PANEL_KEY,drawer); + gtk_widget_queue_resize(GTK_WIDGET(drawer_panel)); return drawer; } @@ -319,74 +264,24 @@ create_empty_drawer_applet(char *tooltip, char *pixmap, PanelOrientType orient) { - PanelOrientation porient; - DrawerDropZonePos drop_pos; - switch(orient) { - case ORIENT_UP: - porient = PANEL_VERTICAL; - drop_pos = DROP_ZONE_LEFT; - break; - case ORIENT_DOWN: - porient = PANEL_VERTICAL; - drop_pos = DROP_ZONE_RIGHT; - break; - case ORIENT_LEFT: - porient = PANEL_HORIZONTAL; - drop_pos = DROP_ZONE_LEFT; - break; - case ORIENT_RIGHT: - porient = PANEL_HORIZONTAL; - drop_pos = DROP_ZONE_RIGHT; - break; - default: - return NULL; - } - return create_drawer_applet(drawer_widget_new(PANEL_HORIZONTAL, + return create_drawer_applet(drawer_widget_new(orient, DRAWER_SHOWN, - DROP_ZONE_RIGHT, PANEL_BACK_NONE, NULL, TRUE, NULL), - tooltip,pixmap, - orient); + tooltip,pixmap); } void set_drawer_applet_orient(Drawer *drawer, PanelOrientType orient) { - PanelOrientation porient; - DrawerDropZonePos drop_pos; - g_return_if_fail(drawer!=NULL); /*ignore orient events until we are realized, this will only be the initial one and we have already set the orientation*/ if(!GTK_WIDGET_REALIZED(drawer->drawer)) return; - - drawer->orient = orient; - - switch(drawer->orient) { - case ORIENT_UP: - porient = PANEL_VERTICAL; - drop_pos = DROP_ZONE_LEFT; - break; - case ORIENT_DOWN: - porient = PANEL_VERTICAL; - drop_pos = DROP_ZONE_RIGHT; - break; - case ORIENT_LEFT: - porient = PANEL_HORIZONTAL; - drop_pos = DROP_ZONE_LEFT; - break; - case ORIENT_RIGHT: - porient = PANEL_HORIZONTAL; - drop_pos = DROP_ZONE_RIGHT; - break; - } - drawer_widget_change_orient(DRAWER_WIDGET(drawer->drawer), - porient); - drawer_widget_change_drop_zone_pos(DRAWER_WIDGET(drawer->drawer), - drop_pos); + + drawer_widget_change_orient(DRAWER_WIDGET(drawer->drawer), orient); /*this was when we were chaning the pixmap on the fly*/ @@ -406,7 +301,7 @@ static void drawer_realize_cb(GtkWidget *button, Drawer *drawer) { - reposition_drawer(drawer); + gtk_widget_queue_resize(drawer->drawer); if(DRAWER_WIDGET(drawer->drawer)->state == DRAWER_SHOWN) gtk_widget_show(drawer->drawer); else { @@ -426,7 +321,7 @@ if(info->type == APPLET_DRAWER) { Drawer *drawer = info->data; DrawerWidget *dw = DRAWER_WIDGET(drawer->drawer); - reposition_drawer(drawer); + gtk_widget_queue_resize(drawer->drawer); gtk_container_foreach(GTK_CONTAINER(dw->panel), drawer_move_foreach, NULL); @@ -443,7 +338,7 @@ void load_drawer_applet(char *params, char *pixmap, char *tooltip, - int pos, PanelWidget *panel) + PanelWidget *panel, int pos) { Drawer *drawer; @@ -458,8 +353,9 @@ sscanf(params,"%d",&i); dr_pd = g_list_nth(panel_list,i)->data; - drawer=create_drawer_applet(dr_pd->panel, - tooltip,pixmap, + drawer=create_drawer_applet(dr_pd->panel, tooltip,pixmap); + + drawer_widget_change_orient(DRAWER_WIDGET(dr_pd->panel), get_applet_orient(panel)); } @@ -468,7 +364,7 @@ g_return_if_fail(drawer != NULL); - register_toy(drawer->button,drawer, pos, panel, APPLET_DRAWER); + register_toy(drawer->button,drawer, panel, pos, APPLET_DRAWER); gtk_signal_connect_after(GTK_OBJECT(drawer->button), "size_allocate", @@ -480,11 +376,6 @@ /*pop up, if popped down*/ wpanel = gtk_object_get_data(GTK_OBJECT(panel), PANEL_PARENT); - if(IS_SNAPPED_WIDGET(wpanel)) { - /*drawer is open so we track it*/ - SNAPPED_WIDGET(wpanel)->drawers_open++; - snapped_widget_pop_up(SNAPPED_WIDGET(wpanel)); - } } panel_widget_add_forbidden(PANEL_WIDGET(DRAWER_WIDGET(drawer->drawer)->panel)); @@ -492,7 +383,7 @@ gtk_tooltips_set_tip (panel_tooltips,drawer->button, drawer->tooltip,NULL); if(GTK_WIDGET_REALIZED(drawer->button)) { - reposition_drawer(drawer); + gtk_widget_queue_resize(drawer->drawer); if(DRAWER_WIDGET(drawer->drawer)->state == DRAWER_SHOWN) gtk_widget_show(drawer->drawer); else { diff -uNr gnome-core-0.25/panel/drawer.h gnome-core-0.27/panel/drawer.h --- gnome-core-0.25/panel/drawer.h Thu Jul 30 18:38:43 1998 +++ gnome-core-0.27/panel/drawer.h Thu Aug 13 00:21:12 1998 @@ -12,16 +12,14 @@ char *tooltip; GtkWidget *button; GtkWidget *drawer; - PanelOrientType orient; } Drawer; void load_drawer_applet(char *params, char *pixmap, char *tooltip, - int pos, PanelWidget *panel); + PanelWidget *panel, int pos); void set_drawer_applet_orient(Drawer *drawer, PanelOrientType orient); -void reposition_drawer(Drawer *drawer); -void drawer_properties(Drawer *drawer); +void add_drawer_properties_page(GtkWidget *dialog, Drawer *drawer); END_GNOME_DECLS diff -uNr gnome-core-0.25/panel/extern.c gnome-core-0.27/panel/extern.c --- gnome-core-0.25/panel/extern.c Mon Aug 3 13:35:14 1998 +++ gnome-core-0.27/panel/extern.c Mon Aug 10 04:22:28 1998 @@ -316,7 +316,7 @@ /*we save the ior in the id field of the appletinfo and the path in the path field*/ - if(!register_toy(socket,ext,pos,panel,type)) { + if(!register_toy(socket,ext,panel,pos,type)) { g_warning("Couldn't add applet"); return 0; } @@ -334,8 +334,8 @@ } void -load_extern_applet(char *path, char *params, int pos, PanelWidget *panel, - char *cfgpath) +load_extern_applet(char *path, char *params, char *cfgpath, + PanelWidget *panel, int pos) { char *fullpath; char *param; diff -uNr gnome-core-0.25/panel/extern.h gnome-core-0.27/panel/extern.h --- gnome-core-0.25/panel/extern.h Thu Jul 30 18:38:44 1998 +++ gnome-core-0.27/panel/extern.h Mon Aug 10 04:22:28 1998 @@ -16,8 +16,8 @@ }; void extern_clean(Extern *ext); -void load_extern_applet(char *path, char *params, int pos, PanelWidget *panel, - char *cfgpath); +void load_extern_applet(char *path, char *params, char *cfgpath, + PanelWidget *panel, int pos); /*stuff for corba*/ int applet_request_id (const char *path, const char *param, diff -uNr gnome-core-0.25/panel/gnome-panel-skels.c gnome-core-0.27/panel/gnome-panel-skels.c --- gnome-core-0.25/panel/gnome-panel-skels.c Wed Aug 5 19:37:42 1998 +++ gnome-core-0.27/panel/gnome-panel-skels.c Thu Aug 13 07:59:57 1998 @@ -12,7 +12,7 @@ skel_GNOME_Panel_applet_request_id(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - CORBA_short(*applet_request_id) (PortableServer_Servant servant, + CORBA_short(*_impl_applet_request_id) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_char * path, CORBA_char * param, @@ -40,7 +40,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -50,7 +50,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - path = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + path = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -60,7 +60,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - param = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + param = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -76,7 +76,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -87,7 +87,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - path = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + path = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -98,7 +98,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - param = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + param = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -108,26 +108,28 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_short); } - _ORBIT_retval = applet_request_id(_ORBIT_servant, cookie, - path, - param, - dorestart, - &cfgpath, - &globcfgpath, - &wid, - ev); + _ORBIT_retval = _impl_applet_request_id(_ORBIT_servant, cookie, + path, + param, + dorestart, + &(cfgpath), + &(globcfgpath), + &(wid), + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, GIOP_NO_EXCEPTION); /* marshal return value */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &_ORBIT_retval, sizeof(_ORBIT_retval)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &_ORBIT_retval, sizeof(_ORBIT_retval)); /* marshal parameter cfgpath */ { GIOP_unsigned_long len = cfgpath ? (strlen(cfgpath) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cfgpath) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cfgpath, len); } @@ -135,12 +137,14 @@ { GIOP_unsigned_long len = globcfgpath ? (strlen(globcfgpath) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (globcfgpath) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), globcfgpath, len); } /* marshal parameter wid */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &wid, sizeof(wid)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &wid, sizeof(wid)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); CORBA_free(cfgpath); @@ -151,7 +155,7 @@ skel_GNOME_Panel_applet_register(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*applet_register) (PortableServer_Servant servant, + void (*_impl_applet_register) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_char * ior, CORBA_short applet_id, @@ -170,7 +174,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -180,7 +184,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - ior = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + ior = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -196,7 +200,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -207,7 +211,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - ior = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + ior = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -217,10 +221,10 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_short); } - applet_register(_ORBIT_servant, cookie, - ior, - applet_id, - ev); + _impl_applet_register(_ORBIT_servant, cookie, + ior, + applet_id, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -234,7 +238,7 @@ skel_GNOME_Panel_applet_abort_id(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*applet_abort_id) (PortableServer_Servant servant, + void (*_impl_applet_abort_id) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_Environment * ev)) @@ -251,7 +255,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -267,7 +271,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -277,9 +281,9 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_short); } - applet_abort_id(_ORBIT_servant, cookie, - applet_id, - ev); + _impl_applet_abort_id(_ORBIT_servant, cookie, + applet_id, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -293,7 +297,7 @@ skel_GNOME_Panel_applet_request_glob_cfg(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*applet_request_glob_cfg) (PortableServer_Servant servant, + void (*_impl_applet_request_glob_cfg) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_char ** globcfgpath, CORBA_Environment * ev)) @@ -310,7 +314,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } else { @@ -322,14 +326,14 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } - applet_request_glob_cfg(_ORBIT_servant, cookie, - &globcfgpath, - ev); + _impl_applet_request_glob_cfg(_ORBIT_servant, cookie, + &(globcfgpath), + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -339,7 +343,8 @@ { GIOP_unsigned_long len = globcfgpath ? (strlen(globcfgpath) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (globcfgpath) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), globcfgpath, len); } @@ -352,7 +357,7 @@ skel_GNOME_Panel_applet_remove_from_panel(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*applet_remove_from_panel) (PortableServer_Servant servant, + void (*_impl_applet_remove_from_panel) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_Environment * ev)) @@ -369,7 +374,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -385,7 +390,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -395,9 +400,9 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_short); } - applet_remove_from_panel(_ORBIT_servant, cookie, - applet_id, - ev); + _impl_applet_remove_from_panel(_ORBIT_servant, cookie, + applet_id, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -411,7 +416,7 @@ skel_GNOME_Panel_applet_get_panel(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - CORBA_short(*applet_get_panel) (PortableServer_Servant servant, + CORBA_short(*_impl_applet_get_panel) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_Environment * ev)) @@ -429,7 +434,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -445,7 +450,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -455,16 +460,17 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_short); } - _ORBIT_retval = applet_get_panel(_ORBIT_servant, cookie, - applet_id, - ev); + _ORBIT_retval = _impl_applet_get_panel(_ORBIT_servant, cookie, + applet_id, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, GIOP_NO_EXCEPTION); /* marshal return value */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &_ORBIT_retval, sizeof(_ORBIT_retval)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &_ORBIT_retval, sizeof(_ORBIT_retval)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); } @@ -473,7 +479,7 @@ skel_GNOME_Panel_applet_get_pos(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - CORBA_short(*applet_get_pos) (PortableServer_Servant servant, + CORBA_short(*_impl_applet_get_pos) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_Environment * ev)) @@ -491,7 +497,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -507,7 +513,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -517,16 +523,17 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_short); } - _ORBIT_retval = applet_get_pos(_ORBIT_servant, cookie, - applet_id, - ev); + _ORBIT_retval = _impl_applet_get_pos(_ORBIT_servant, cookie, + applet_id, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, GIOP_NO_EXCEPTION); /* marshal return value */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &_ORBIT_retval, sizeof(_ORBIT_retval)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &_ORBIT_retval, sizeof(_ORBIT_retval)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); } @@ -535,7 +542,7 @@ skel_GNOME_Panel_applet_get_panel_orient(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - CORBA_short(*applet_get_panel_orient) (PortableServer_Servant servant, +CORBA_short(*_impl_applet_get_panel_orient) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_Environment * ev)) @@ -553,7 +560,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -569,7 +576,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -579,16 +586,17 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_short); } - _ORBIT_retval = applet_get_panel_orient(_ORBIT_servant, cookie, - applet_id, - ev); + _ORBIT_retval = _impl_applet_get_panel_orient(_ORBIT_servant, cookie, + applet_id, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, GIOP_NO_EXCEPTION); /* marshal return value */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &_ORBIT_retval, sizeof(_ORBIT_retval)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &_ORBIT_retval, sizeof(_ORBIT_retval)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); } @@ -597,7 +605,7 @@ skel_GNOME_Panel_applet_show_menu(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*applet_show_menu) (PortableServer_Servant servant, + void (*_impl_applet_show_menu) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_Environment * ev)) @@ -614,7 +622,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -630,7 +638,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -640,9 +648,9 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_short); } - applet_show_menu(_ORBIT_servant, cookie, - applet_id, - ev); + _impl_applet_show_menu(_ORBIT_servant, cookie, + applet_id, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -656,7 +664,7 @@ skel_GNOME_Panel_applet_drag_start(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*applet_drag_start) (PortableServer_Servant servant, + void (*_impl_applet_drag_start) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_Environment * ev)) @@ -673,7 +681,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -689,7 +697,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -699,9 +707,9 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_short); } - applet_drag_start(_ORBIT_servant, cookie, - applet_id, - ev); + _impl_applet_drag_start(_ORBIT_servant, cookie, + applet_id, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -715,7 +723,7 @@ skel_GNOME_Panel_applet_drag_stop(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*applet_drag_stop) (PortableServer_Servant servant, + void (*_impl_applet_drag_stop) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_Environment * ev)) @@ -732,7 +740,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -748,7 +756,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -758,9 +766,9 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_short); } - applet_drag_stop(_ORBIT_servant, cookie, - applet_id, - ev); + _impl_applet_drag_stop(_ORBIT_servant, cookie, + applet_id, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -774,7 +782,7 @@ skel_GNOME_Panel_applet_add_callback(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*applet_add_callback) (PortableServer_Servant servant, + void (*_impl_applet_add_callback) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_char * callback_name, @@ -797,7 +805,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -811,7 +819,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - callback_name = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + callback_name = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -821,7 +829,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - stock_item = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + stock_item = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -831,7 +839,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - menuitem_text = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + menuitem_text = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } else { @@ -843,7 +851,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -859,7 +867,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - callback_name = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + callback_name = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -870,7 +878,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - stock_item = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + stock_item = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -881,17 +889,17 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - menuitem_text = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + menuitem_text = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } - applet_add_callback(_ORBIT_servant, cookie, - applet_id, - callback_name, - stock_item, - menuitem_text, - ev); + _impl_applet_add_callback(_ORBIT_servant, cookie, + applet_id, + callback_name, + stock_item, + menuitem_text, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -905,7 +913,7 @@ skel_GNOME_Panel_applet_remove_callback(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*applet_remove_callback) (PortableServer_Servant servant, + void (*_impl_applet_remove_callback) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_char * callback_name, @@ -924,7 +932,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -938,7 +946,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - callback_name = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + callback_name = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } else { @@ -950,7 +958,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -966,15 +974,15 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - callback_name = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + callback_name = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } - applet_remove_callback(_ORBIT_servant, cookie, - applet_id, - callback_name, - ev); + _impl_applet_remove_callback(_ORBIT_servant, cookie, + applet_id, + callback_name, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -988,7 +996,7 @@ skel_GNOME_Panel_applet_add_tooltip(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*applet_add_tooltip) (PortableServer_Servant servant, + void (*_impl_applet_add_tooltip) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_char * tooltip, @@ -1007,7 +1015,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1021,7 +1029,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - tooltip = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + tooltip = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } else { @@ -1033,7 +1041,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1049,15 +1057,15 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - tooltip = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + tooltip = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } - applet_add_tooltip(_ORBIT_servant, cookie, - applet_id, - tooltip, - ev); + _impl_applet_add_tooltip(_ORBIT_servant, cookie, + applet_id, + tooltip, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -1071,7 +1079,7 @@ skel_GNOME_Panel_applet_remove_tooltip(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*applet_remove_tooltip) (PortableServer_Servant servant, + void (*_impl_applet_remove_tooltip) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_Environment * ev)) @@ -1088,7 +1096,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1104,7 +1112,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1114,9 +1122,9 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_short); } - applet_remove_tooltip(_ORBIT_servant, cookie, - applet_id, - ev); + _impl_applet_remove_tooltip(_ORBIT_servant, cookie, + applet_id, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -1130,7 +1138,7 @@ skel_GNOME_Panel_applet_in_drag(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - CORBA_short(*applet_in_drag) (PortableServer_Servant servant, + CORBA_short(*_impl_applet_in_drag) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_Environment * ev)) { @@ -1146,7 +1154,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } else { @@ -1158,20 +1166,21 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } - _ORBIT_retval = applet_in_drag(_ORBIT_servant, cookie, - ev); + _ORBIT_retval = _impl_applet_in_drag(_ORBIT_servant, cookie, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, GIOP_NO_EXCEPTION); /* marshal return value */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &_ORBIT_retval, sizeof(_ORBIT_retval)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &_ORBIT_retval, sizeof(_ORBIT_retval)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); } @@ -1180,7 +1189,7 @@ skel_GNOME_Panel_sync_config(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*sync_config) (PortableServer_Servant servant, + void (*_impl_sync_config) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_Environment * ev)) @@ -1197,7 +1206,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1213,7 +1222,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1223,9 +1232,9 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_short); } - sync_config(_ORBIT_servant, cookie, - applet_id, - ev); + _impl_sync_config(_ORBIT_servant, cookie, + applet_id, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -1239,9 +1248,9 @@ skel_GNOME_Panel_quit(POA_GNOME_Panel * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*quit) (PortableServer_Servant servant, - CORBA_char * cookie, - CORBA_Environment * ev)) + void (*_impl_quit) (PortableServer_Servant servant, + CORBA_char * cookie, + CORBA_Environment * ev)) { CORBA_char *cookie; GIOPSendBuffer *_ORBIT_send_buffer; @@ -1254,7 +1263,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } else { @@ -1266,13 +1275,13 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } - quit(_ORBIT_servant, cookie, - ev); + _impl_quit(_ORBIT_servant, cookie, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -1351,7 +1360,7 @@ CORBA_Environment * env) { static PortableServer_ClassInfo class_info = - {(gpointer) & get_skel_GNOME_Panel, "IDL:GNOME_Panel:1.0"}; + {(gpointer) & get_skel_GNOME_Panel, "GNOME_Panel"}; PortableServer_ServantBase__init(((PortableServer_ServantBase *) servant), env); ORBIT_OBJECT_KEY(servant->_private)->class_info = &class_info; @@ -1368,7 +1377,7 @@ skel_GNOME_Applet_change_orient(POA_GNOME_Applet * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*change_orient) (PortableServer_Servant servant, + void (*_impl_change_orient) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_short orient, @@ -1387,7 +1396,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1406,7 +1415,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1420,10 +1429,10 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_short); } - change_orient(_ORBIT_servant, cookie, - applet_id, - orient, - ev); + _impl_change_orient(_ORBIT_servant, cookie, + applet_id, + orient, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -1437,7 +1446,7 @@ skel_GNOME_Applet_do_callback(POA_GNOME_Applet * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*do_callback) (PortableServer_Servant servant, + void (*_impl_do_callback) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_char * callback_name, @@ -1456,7 +1465,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1470,7 +1479,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - callback_name = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + callback_name = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } else { @@ -1482,7 +1491,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1498,15 +1507,15 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - callback_name = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + callback_name = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } - do_callback(_ORBIT_servant, cookie, - applet_id, - callback_name, - ev); + _impl_do_callback(_ORBIT_servant, cookie, + applet_id, + callback_name, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -1520,7 +1529,7 @@ skel_GNOME_Applet_session_save(POA_GNOME_Applet * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - CORBA_short(*session_save) (PortableServer_Servant servant, + CORBA_short(*_impl_session_save) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_char * cfgpath, @@ -1542,7 +1551,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1556,7 +1565,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cfgpath = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cfgpath = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1566,7 +1575,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - globcfgpath = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + globcfgpath = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } else { @@ -1578,7 +1587,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1594,7 +1603,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cfgpath = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cfgpath = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1605,23 +1614,24 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - globcfgpath = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + globcfgpath = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } - _ORBIT_retval = session_save(_ORBIT_servant, cookie, - applet_id, - cfgpath, - globcfgpath, - ev); + _ORBIT_retval = _impl_session_save(_ORBIT_servant, cookie, + applet_id, + cfgpath, + globcfgpath, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, GIOP_NO_EXCEPTION); /* marshal return value */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &_ORBIT_retval, sizeof(_ORBIT_retval)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &_ORBIT_retval, sizeof(_ORBIT_retval)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); } @@ -1630,7 +1640,7 @@ skel_GNOME_Applet_start_new_applet(POA_GNOME_Applet * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*start_new_applet) (PortableServer_Servant servant, + void (*_impl_start_new_applet) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_char * param, CORBA_Environment * ev)) @@ -1647,7 +1657,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1657,7 +1667,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - param = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + param = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } else { @@ -1669,7 +1679,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1680,14 +1690,14 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - param = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + param = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } - start_new_applet(_ORBIT_servant, cookie, - param, - ev); + _impl_start_new_applet(_ORBIT_servant, cookie, + param, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -1701,7 +1711,7 @@ skel_GNOME_Applet_back_change(POA_GNOME_Applet * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*back_change) (PortableServer_Servant servant, + void (*_impl_back_change) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short applet_id, CORBA_short back_type, @@ -1728,7 +1738,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1745,7 +1755,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - pixmap = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + pixmap = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1767,7 +1777,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1787,7 +1797,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - pixmap = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + pixmap = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1805,14 +1815,14 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_short); } - back_change(_ORBIT_servant, cookie, - applet_id, - back_type, - pixmap, - c_red, - c_green, - c_blue, - ev); + _impl_back_change(_ORBIT_servant, cookie, + applet_id, + back_type, + pixmap, + c_red, + c_green, + c_blue, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -1826,7 +1836,7 @@ skel_GNOME_Applet_tooltips_state(POA_GNOME_Applet * _ORBIT_servant, GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, - void (*tooltips_state) (PortableServer_Servant servant, + void (*_impl_tooltips_state) (PortableServer_Servant servant, CORBA_char * cookie, CORBA_short enabled, CORBA_Environment * ev)) @@ -1843,7 +1853,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); GET_ATOM(len); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1859,7 +1869,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur = ALIGN_ADDRESS(GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, 4); len = *((CORBA_unsigned_long *) GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_unsigned_long); - cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : NULL; + cookie = len ? (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur) : (GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur - sizeof(CORBA_unsigned_long)); GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } @@ -1869,9 +1879,9 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += sizeof(CORBA_short); } - tooltips_state(_ORBIT_servant, cookie, - enabled, - ev); + _impl_tooltips_state(_ORBIT_servant, cookie, + enabled, + ev); _ORBIT_send_buffer = giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->connection, NULL, _ORBIT_recv_buffer->message.u.request.request_id, @@ -1914,7 +1924,7 @@ CORBA_Environment * env) { static PortableServer_ClassInfo class_info = - {(gpointer) & get_skel_GNOME_Applet, "IDL:GNOME_Applet:1.0"}; + {(gpointer) & get_skel_GNOME_Applet, "GNOME_Applet"}; PortableServer_ServantBase__init(((PortableServer_ServantBase *) servant), env); ORBIT_OBJECT_KEY(servant->_private)->class_info = &class_info; diff -uNr gnome-core-0.25/panel/gnome-panel-stubs.c gnome-core-0.27/panel/gnome-panel-stubs.c --- gnome-core-0.25/panel/gnome-panel-stubs.c Wed Aug 5 19:37:42 1998 +++ gnome-core-0.27/panel/gnome-panel-stubs.c Thu Aug 13 07:59:57 1998 @@ -34,14 +34,15 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } @@ -50,7 +51,8 @@ { GIOP_unsigned_long len = path ? (strlen(path) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (path) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), path, len); } @@ -59,13 +61,15 @@ { GIOP_unsigned_long len = param ? (strlen(param) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (param) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), param, len); } /* marshal parameter dorestart */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &dorestart, sizeof(dorestart)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &dorestart, sizeof(dorestart)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); @@ -97,7 +101,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, len); else - *cfgpath = NULL; + (*cfgpath)[0] = '\0'; GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } /* demarshal parameter *globcfgpath */ @@ -112,7 +116,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, len); else - *globcfgpath = NULL; + (*globcfgpath)[0] = '\0'; GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } /* demarshal parameter *wid */ @@ -136,7 +140,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, len); else - *cfgpath = NULL; + (*cfgpath)[0] = '\0'; GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } /* demarshal parameter *globcfgpath */ @@ -152,7 +156,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, len); else - *globcfgpath = NULL; + (*globcfgpath)[0] = '\0'; GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } /* demarshal parameter *wid */ @@ -188,14 +192,15 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } @@ -204,13 +209,15 @@ { GIOP_unsigned_long len = ior ? (strlen(ior) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (ior) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), ior, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); @@ -251,20 +258,22 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); @@ -305,14 +314,15 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } @@ -344,7 +354,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, len); else - *globcfgpath = NULL; + (*globcfgpath)[0] = '\0'; GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } else { @@ -361,7 +371,7 @@ GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur, len); else - *globcfgpath = NULL; + (*globcfgpath)[0] = '\0'; GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur += len; } } @@ -391,20 +401,22 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); @@ -446,20 +458,22 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); @@ -513,20 +527,22 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); @@ -580,20 +596,22 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); @@ -646,20 +664,22 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); @@ -700,20 +720,22 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); @@ -754,20 +776,22 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); @@ -811,26 +835,29 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); /* marshal parameter callback_name */ { GIOP_unsigned_long len = callback_name ? (strlen(callback_name) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (callback_name) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), callback_name, len); } @@ -839,7 +866,8 @@ { GIOP_unsigned_long len = stock_item ? (strlen(stock_item) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (stock_item) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), stock_item, len); } @@ -848,7 +876,8 @@ { GIOP_unsigned_long len = menuitem_text ? (strlen(menuitem_text) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (menuitem_text) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), menuitem_text, len); } @@ -893,26 +922,29 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); /* marshal parameter callback_name */ { GIOP_unsigned_long len = callback_name ? (strlen(callback_name) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (callback_name) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), callback_name, len); } @@ -957,26 +989,29 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); /* marshal parameter tooltip */ { GIOP_unsigned_long len = tooltip ? (strlen(tooltip) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (tooltip) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), tooltip, len); } @@ -1020,20 +1055,22 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); @@ -1074,14 +1111,15 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } @@ -1137,20 +1175,22 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); @@ -1190,14 +1230,15 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } @@ -1242,20 +1283,22 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); /* marshal parameter orient */ giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &orient, sizeof(orient)); @@ -1300,26 +1343,29 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); /* marshal parameter callback_name */ { GIOP_unsigned_long len = callback_name ? (strlen(callback_name) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (callback_name) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), callback_name, len); } @@ -1366,26 +1412,29 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); /* marshal parameter cfgpath */ { GIOP_unsigned_long len = cfgpath ? (strlen(cfgpath) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cfgpath) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cfgpath, len); } @@ -1394,7 +1443,8 @@ { GIOP_unsigned_long len = globcfgpath ? (strlen(globcfgpath) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (globcfgpath) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), globcfgpath, len); } @@ -1450,14 +1500,15 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } @@ -1466,7 +1517,8 @@ { GIOP_unsigned_long len = param ? (strlen(param) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (param) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), param, len); } @@ -1515,20 +1567,22 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter applet_id */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &applet_id, sizeof(applet_id)); /* marshal parameter back_type */ giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &back_type, sizeof(back_type)); @@ -1537,13 +1591,15 @@ { GIOP_unsigned_long len = pixmap ? (strlen(pixmap) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (pixmap) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), pixmap, len); } /* marshal parameter c_red */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &c_red, sizeof(c_red)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &c_red, sizeof(c_red)); /* marshal parameter c_green */ giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &c_green, sizeof(c_green)); @@ -1590,20 +1646,22 @@ _ORBIT_request_id = giop_get_request_id(); _ORBIT_send_buffer = giop_send_request_buffer_use(_obj->connection, NULL, - _ORBIT_request_id, CORBA_TRUE, &(_obj->object_key_vec), + _ORBIT_request_id, CORBA_TRUE, &(_obj->objinfo.iopinfo->object_key_vec), &_ORBIT_operation_vec, &default_principal_iovec); /* marshal parameter cookie */ { GIOP_unsigned_long len = cookie ? (strlen(cookie) + 1) : 0; - giop_send_buffer_append_mem_indirect_a(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 4); + giop_send_buffer_append_mem_indirect(GIOP_SEND_BUFFER(_ORBIT_send_buffer), &len, sizeof(len)); if (cookie) giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), cookie, len); } /* marshal parameter enabled */ - giop_message_buffer_append_mem_a(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &enabled, sizeof(enabled)); + giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), 2); + giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer), &enabled, sizeof(enabled)); giop_send_buffer_write(_ORBIT_send_buffer); giop_send_buffer_unuse(_ORBIT_send_buffer); diff -uNr gnome-core-0.25/panel/gnome-panel.h gnome-core-0.27/panel/gnome-panel.h --- gnome-core-0.25/panel/gnome-panel.h Wed Aug 5 19:37:42 1998 +++ gnome-core-0.27/panel/gnome-panel.h Thu Aug 13 07:59:57 1998 @@ -17,6 +17,7 @@ typedef CORBA_Object GNOME_Panel; +#define GNOME_Panel__free CORBA_Object__free #endif /* !_GNOME_Panel_defined */ extern CORBA_short GNOME_Panel_applet_request_id(GNOME_Panel _obj, CORBA_char * cookie, CORBA_char * path, CORBA_char * param, CORBA_short dorestart, CORBA_char ** cfgpath, CORBA_char ** globcfgpath, CORBA_unsigned_long * wid, CORBA_Environment * ev); @@ -116,6 +117,7 @@ typedef CORBA_Object GNOME_Applet; +#define GNOME_Applet__free CORBA_Object__free #endif /* !_GNOME_Applet_defined */ extern void GNOME_Applet_change_orient(GNOME_Applet _obj, CORBA_char * cookie, CORBA_short applet_id, CORBA_short orient, CORBA_Environment * ev); diff -uNr gnome-core-0.25/panel/launcher.c gnome-core-0.27/panel/launcher.c --- gnome-core-0.25/panel/launcher.c Mon Aug 3 13:35:14 1998 +++ gnome-core-0.27/panel/launcher.c Tue Aug 11 01:32:52 1998 @@ -61,6 +61,20 @@ return FALSE; } +static int +destroy_launcher(GtkWidget *widget, gpointer data) +{ + Launcher *launcher = data; + GtkWidget *prop_dialog = gtk_object_get_data(GTK_OBJECT(launcher->button), + LAUNCHER_PROPERTIES); + if(prop_dialog) + gtk_widget_destroy(prop_dialog); + gnome_desktop_entry_free(launcher->dentry); + g_free(launcher); + return FALSE; +} + + Launcher * create_launcher (char *parameters, GnomeDesktopEntry *dentry) { @@ -129,6 +143,10 @@ "event", (GtkSignalFunc) launch, dentry); + + gtk_signal_connect (GTK_OBJECT(launcher->button), "destroy", + GTK_SIGNAL_FUNC(destroy_launcher), + launcher); gtk_object_set_user_data(GTK_OBJECT(launcher->button), launcher); @@ -258,14 +276,14 @@ static void _load_launcher_applet(char *params, GnomeDesktopEntry *dentry, - int pos, PanelWidget *panel) + PanelWidget *panel, int pos) { Launcher *launcher; launcher = create_launcher(params,dentry); if(launcher) { - register_toy(launcher->button,launcher, pos,panel, + register_toy(launcher->button,launcher, panel, pos, APPLET_LAUNCHER); gtk_tooltips_set_tip (panel_tooltips, @@ -284,7 +302,7 @@ GnomeDEntryEdit *dedit = GNOME_DENTRY_EDIT(data); if(button==0) _load_launcher_applet(NULL, gnome_dentry_get_dentry(dedit), - 0, current_panel); + current_panel, 0); gtk_widget_destroy(d); } @@ -318,7 +336,7 @@ } void -load_launcher_applet(char *params, int pos, PanelWidget *panel) +load_launcher_applet(char *params, PanelWidget *panel, int pos) { - _load_launcher_applet(params,NULL,pos,panel); + _load_launcher_applet(params,NULL,panel, pos); } diff -uNr gnome-core-0.25/panel/launcher.h gnome-core-0.27/panel/launcher.h --- gnome-core-0.25/panel/launcher.h Thu Jul 30 18:38:44 1998 +++ gnome-core-0.27/panel/launcher.h Mon Aug 10 04:22:28 1998 @@ -23,7 +23,7 @@ GnomeDesktopEntry *dentry; } Launcher; -void load_launcher_applet(char *params, int pos, PanelWidget *panel); +void load_launcher_applet(char *params, PanelWidget *panel, int pos); void launcher_properties(Launcher *launcher); void ask_about_launcher(void); diff -uNr gnome-core-0.25/panel/logout.c gnome-core-0.27/panel/logout.c --- gnome-core-0.25/panel/logout.c Thu Jul 30 18:38:44 1998 +++ gnome-core-0.27/panel/logout.c Mon Aug 10 04:22:28 1998 @@ -42,13 +42,13 @@ } void -load_logout_applet(int pos, PanelWidget *panel) +load_logout_applet(PanelWidget *panel, int pos) { GtkWidget *logout; logout = create_logout_widget(); if(logout) - register_toy(logout,NULL, pos, panel,APPLET_LOGOUT); + register_toy(logout, NULL, panel, pos, APPLET_LOGOUT); } diff -uNr gnome-core-0.25/panel/logout.h gnome-core-0.27/panel/logout.h --- gnome-core-0.25/panel/logout.h Tue Jul 21 13:55:04 1998 +++ gnome-core-0.27/panel/logout.h Mon Aug 10 04:22:28 1998 @@ -12,7 +12,7 @@ BEGIN_GNOME_DECLS -void load_logout_applet(int pos, PanelWidget *panel); +void load_logout_applet(PanelWidget *panel, int pos); END_GNOME_DECLS diff -uNr gnome-core-0.25/panel/main.c gnome-core-0.27/panel/main.c --- gnome-core-0.25/panel/main.c Mon Aug 3 13:35:15 1998 +++ gnome-core-0.27/panel/main.c Mon Aug 10 04:22:30 1998 @@ -214,14 +214,14 @@ applets = g_array_new(FALSE); applet_count = 0; - init_user_panels(); - panel_tooltips = gtk_tooltips_new(); - init_user_applets(); - /*set the globals*/ load_up_globals(); + + init_user_panels(); + + init_user_applets(); /*add forbidden lists to ALL panels*/ g_list_foreach(panels,(GFunc)panel_widget_add_forbidden,NULL); diff -uNr gnome-core-0.25/panel/menu.c gnome-core-0.27/panel/menu.c --- gnome-core-0.25/panel/menu.c Mon Aug 3 13:35:18 1998 +++ gnome-core-0.27/panel/menu.c Tue Aug 11 01:33:47 1998 @@ -22,6 +22,8 @@ #define MENU_PATH "menu_path" +#define MENU_PROPERTIES "menu_properties" + static char *gnome_folder = NULL; GList *small_icons = NULL; @@ -106,7 +108,7 @@ { GnomeDesktopEntry *ii = data; - load_launcher_applet(ii->location,0,current_panel); + load_launcher_applet(ii->location,current_panel,0); } /*reads in the order file and makes a list*/ @@ -182,7 +184,7 @@ pixmap_name = item_info?item_info->icon:NULL; load_drawer_applet(NULL,pixmap_name,subdir_name, - pos, panel); + panel,pos); info = get_applet_info(applet_count -1); g_return_if_fail(info); @@ -206,8 +208,8 @@ /*we load the applet at the right side, that is end of the drawer*/ load_launcher_applet(filename, - INT_MAX/2, - newpanel); + newpanel, + INT_MAX/2); } } g_free(filename); @@ -232,9 +234,9 @@ { MenuFinfo *mf = data; if(mf) - load_menu_applet(mf->menudir,0, 0, current_panel); + load_menu_applet(mf->menudir,0, current_panel, 0); else - load_menu_applet(NULL,0, 0, current_panel); + load_menu_applet(NULL,0, current_panel, 0); } @@ -513,14 +515,14 @@ add_drawer_to_panel (GtkWidget *widget, void *data) { load_drawer_applet(NULL,NULL,NULL, - 0, current_panel); + current_panel, 0); return TRUE; } static int add_logout_to_panel (GtkWidget *widget, void *data) { - load_logout_applet(0,current_panel); + load_logout_applet(current_panel, 0); return TRUE; } @@ -540,7 +542,7 @@ else param = NULL; - load_extern_applet(path,param,0,current_panel,NULL); + load_extern_applet(path,param,NULL,current_panel,0); if(param) g_free(param); return TRUE; @@ -1051,6 +1053,10 @@ destroy_menu (GtkWidget *widget, gpointer data) { Menu *menu = data; + GtkWidget *prop_dialog = gtk_object_get_data(GTK_OBJECT(menu->button), + MENU_PROPERTIES); + if(prop_dialog) + gtk_widget_destroy(prop_dialog); gtk_widget_unref(menu->menu); g_free(menu->path); g_free(menu); @@ -1211,7 +1217,7 @@ { char *menu_base = gnome_util_home_file ("apps"); char *menudir = g_concat_dir_and_file (menu_base, "."); - + g_free (menu_base); if (!g_file_exists (menudir)) mkdir (menudir, 0755); @@ -1423,7 +1429,7 @@ { GtkWidget *root_menu; GtkWidget *uroot_menu; - + root_menu = create_system_menu(NULL,fake_submenus); if(type == MAIN_MENU_BOTH) @@ -1684,15 +1690,273 @@ g_free(pixmap_name); } +static void +properties_apply_callback(GtkWidget *widget, int page, gpointer data) +{ + Menu *menu = data; + GtkWidget *main_menu = gtk_object_get_data(GTK_OBJECT(widget), "main_menu"); + GtkWidget *menu_both = gtk_object_get_data(GTK_OBJECT(widget), "menu_both"); + GtkWidget *menu_system = gtk_object_get_data(GTK_OBJECT(widget), "menu_system"); + GtkWidget *menu_user = gtk_object_get_data(GTK_OBJECT(widget), "menu_user"); + GtkWidget *pathentry = gtk_object_get_data(GTK_OBJECT(widget), "path"); + char *s; + + if (page != -1) + return; + + if(GTK_TOGGLE_BUTTON(main_menu)->active) { + g_free(menu->path); + menu->path = g_strdup("."); + } else { + g_free(menu->path); + s = gtk_entry_get_text(GTK_ENTRY(pathentry)); + if(!s || !*s) + menu->path = g_strdup("."); + else + menu->path = g_strdup(s); + } + if(GTK_TOGGLE_BUTTON(menu_both)->active) + menu->main_menu_type = MAIN_MENU_BOTH; + else if(GTK_TOGGLE_BUTTON(menu_system)->active) + menu->main_menu_type = MAIN_MENU_SYSTEM; + else /*it's menu user then*/ + menu->main_menu_type = MAIN_MENU_USER; + + gtk_widget_unref(menu->menu); + menu->menu = NULL; + + { + char *menu_base = gnome_unconditional_datadir_file ("apps"); + char *this_menu = get_real_menu_path(menu->path,menu_base); + GList *list = g_list_append(NULL,this_menu); + char *pixmap_name = get_pixmap(this_menu,menu->orient, + strcmp(menu->path,".")==0); + /*make the pixmap*/ + gnome_pixmap_load_file_at_size (GNOME_PIXMAP(menu->button), + pixmap_name, + BIG_ICON_SIZE, + BIG_ICON_SIZE); + g_free(pixmap_name); + + add_menu_widget(menu,list, strcmp(menu->path,".")==0, TRUE); + + g_free(menu_base); + g_free(this_menu); + + g_list_free(list); + } +} + +static int +properties_close_callback(GtkWidget *widget, gpointer data) +{ + Menu *menu = data; + GtkWidget *pathentry = gtk_object_get_data(GTK_OBJECT(widget),"path"); + gtk_object_set_data(GTK_OBJECT(menu->button), + MENU_PROPERTIES,NULL); + gtk_signal_disconnect_by_data(GTK_OBJECT(pathentry),widget); + return FALSE; +} + +static void +notify_entry_change (GtkWidget *widget, void *data) +{ + GnomePropertyBox *box = GNOME_PROPERTY_BOX (data); + + gnome_property_box_changed (box); +} +static void +toggle_prop(GtkWidget *widget, void *data) +{ + GnomePropertyBox *box = GNOME_PROPERTY_BOX (data); + + if(GTK_TOGGLE_BUTTON(widget)->active) + gnome_property_box_changed (box); +} + +static void +toggle_main_menu(GtkWidget *widget, void *data) +{ + GnomePropertyBox *box = GNOME_PROPERTY_BOX (data); + GtkWidget *main_frame = gtk_object_get_data(GTK_OBJECT(box), + "main_frame"); + GtkWidget *normal_frame = gtk_object_get_data(GTK_OBJECT(box), + "normal_frame"); + if(GTK_TOGGLE_BUTTON(widget)->active) { + gtk_widget_set_sensitive(main_frame,TRUE); + gtk_widget_set_sensitive(normal_frame,FALSE); + gnome_property_box_changed (box); + } +} +static void +toggle_normal_menu(GtkWidget *widget, void *data) +{ + GnomePropertyBox *box = GNOME_PROPERTY_BOX (data); + GtkWidget *main_frame = gtk_object_get_data(GTK_OBJECT(box), + "main_frame"); + GtkWidget *normal_frame = gtk_object_get_data(GTK_OBJECT(box), + "normal_frame"); + if(GTK_TOGGLE_BUTTON(widget)->active) { + gtk_widget_set_sensitive(main_frame,FALSE); + gtk_widget_set_sensitive(normal_frame,TRUE); + gnome_property_box_changed (box); + } +} +static GtkWidget * +create_properties_dialog(Menu *menu) +{ + GtkWidget *dialog; + GtkWidget *vbox; + GtkWidget *box; + GtkWidget *w,*w2; + GtkWidget *f; + GtkWidget *t; + + dialog = gnome_property_box_new(); + gtk_window_set_title(GTK_WINDOW(dialog), _("Menu properties")); + /*gtk_window_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);*/ + gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, TRUE); + + vbox = gtk_vbox_new(FALSE,5); + gtk_container_border_width(GTK_CONTAINER(vbox),5); + + f = gtk_frame_new(_("Menu Type")); + gtk_box_pack_start(GTK_BOX(vbox),f,FALSE,FALSE,0); + + box = gtk_hbox_new(FALSE,5); + gtk_container_border_width(GTK_CONTAINER(box),5); + gtk_container_add(GTK_CONTAINER(f),box); + + w = gtk_radio_button_new_with_label (NULL, _("Main Menu")); + gtk_object_set_data(GTK_OBJECT(dialog),"main_menu",w); + if(!menu->path || strcmp(menu->path,".")==0) + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(w), TRUE); + gtk_signal_connect (GTK_OBJECT (w), "toggled", + GTK_SIGNAL_FUNC (toggle_main_menu), + dialog); + gtk_box_pack_start(GTK_BOX(box),w,TRUE,TRUE,0); + + w2 = gtk_radio_button_new_with_label ( + gtk_radio_button_group (GTK_RADIO_BUTTON (w)), + _("Normal Menu")); + if(menu->path && strcmp(menu->path,".")!=0) + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(w2), TRUE); + gtk_signal_connect (GTK_OBJECT (w2), "toggled", + GTK_SIGNAL_FUNC (toggle_normal_menu), + dialog); + gtk_box_pack_start(GTK_BOX(box),w2,TRUE,TRUE,0); + + + f = gtk_frame_new(_("Main Menu")); + if(menu->path && strcmp(menu->path,".")!=0) + gtk_widget_set_sensitive(f,FALSE); + gtk_object_set_data(GTK_OBJECT(dialog),"main_frame",f); + gtk_box_pack_start(GTK_BOX(vbox),f,FALSE,FALSE,0); + + box = gtk_vbox_new(FALSE,5); + gtk_container_border_width(GTK_CONTAINER(box),5); + gtk_container_add(GTK_CONTAINER(f),box); + + w = gtk_radio_button_new_with_label (NULL, _("Both System and User menus on the " + "same menu")); + gtk_object_set_data(GTK_OBJECT(dialog),"menu_both",w); + if(menu->main_menu_type == MAIN_MENU_BOTH) + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(w), TRUE); + gtk_signal_connect (GTK_OBJECT (w), "toggled", + GTK_SIGNAL_FUNC (toggle_prop), + dialog); + gtk_box_pack_start(GTK_BOX(box),w,TRUE,TRUE,0); + + w2 = gtk_radio_button_new_with_label ( + gtk_radio_button_group (GTK_RADIO_BUTTON (w)), + _("System on the main menu, User menu as a submenu")); + gtk_object_set_data(GTK_OBJECT(dialog),"menu_system",w2); + if(menu->main_menu_type == MAIN_MENU_SYSTEM) + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(w2), TRUE); + gtk_signal_connect (GTK_OBJECT (w2), "toggled", + GTK_SIGNAL_FUNC (toggle_prop), + dialog); + gtk_box_pack_start(GTK_BOX(box),w2,TRUE,TRUE,0); + + w2 = gtk_radio_button_new_with_label ( + gtk_radio_button_group (GTK_RADIO_BUTTON (w)), + _("User on the main menu, System menu as a submenu")); + if(menu->main_menu_type == MAIN_MENU_USER) + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(w2), TRUE); + gtk_signal_connect (GTK_OBJECT (w2), "toggled", + GTK_SIGNAL_FUNC (toggle_prop), + dialog); + gtk_box_pack_start(GTK_BOX(box),w2,TRUE,TRUE,0); + + f = gtk_frame_new(_("Normal Menu")); + if(!menu->path || strcmp(menu->path,".")==0) + gtk_widget_set_sensitive(f,FALSE); + gtk_object_set_data(GTK_OBJECT(dialog),"normal_frame",f); + gtk_box_pack_start(GTK_BOX(vbox),f,FALSE,FALSE,0); + + box = gtk_hbox_new(FALSE,5); + gtk_container_border_width(GTK_CONTAINER(box),5); + gtk_container_add(GTK_CONTAINER(f),box); + + w = gtk_label_new(_("Menu path")); + gtk_box_pack_start(GTK_BOX(box),w,FALSE,FALSE,0); + + w = gnome_file_entry_new("menu_path",_("Browse")); + t = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (w)); + gtk_object_set_data(GTK_OBJECT(dialog),"path",t); + if (menu->path) + gtk_entry_set_text(GTK_ENTRY(t), menu->path); + gtk_box_pack_start(GTK_BOX(box),w,TRUE,TRUE,0); + gtk_signal_connect (GTK_OBJECT (t), "changed", + GTK_SIGNAL_FUNC(notify_entry_change), + dialog); + + gtk_notebook_append_page (GTK_NOTEBOOK(GNOME_PROPERTY_BOX (dialog)->notebook), + vbox, gtk_label_new (_("Menu"))); + + gtk_signal_connect(GTK_OBJECT(dialog), "destroy", + (GtkSignalFunc) properties_close_callback, + menu); + + gtk_signal_connect(GTK_OBJECT(dialog), "apply", + GTK_SIGNAL_FUNC(properties_apply_callback), + menu); + + return dialog; +} + +void +menu_properties(Menu *menu) +{ + GtkWidget *dialog; + + dialog = gtk_object_get_data(GTK_OBJECT(menu->button), + MENU_PROPERTIES); + if(dialog) { + gdk_window_raise(dialog->window); + return; + } + + dialog = create_properties_dialog(menu); + gtk_object_set_data(GTK_OBJECT(menu->button), + MENU_PROPERTIES,dialog); + gtk_widget_show_all (dialog); +} + void load_menu_applet(char *params, int main_menu_type, - int pos, PanelWidget *panel) + PanelWidget *panel, int pos) { Menu *menu; menu = create_menu_applet(params, ORIENT_UP,main_menu_type); - if(menu) + if(menu) { register_toy(menu->button,menu, - pos,panel,APPLET_MENU); + panel,pos,APPLET_MENU); + + applet_add_callback(applet_count-1,"properties", + GNOME_STOCK_MENU_PROP, + _("Properties...")); + } } diff -uNr gnome-core-0.25/panel/menu.h gnome-core-0.27/panel/menu.h --- gnome-core-0.25/panel/menu.h Thu Jul 30 18:38:44 1998 +++ gnome-core-0.27/panel/menu.h Mon Aug 10 04:22:46 1998 @@ -20,7 +20,7 @@ }; void load_menu_applet(char *params, int main_menu_type, - int pos, PanelWidget *panel); + PanelWidget *panel, int pos); void set_menu_applet_orient(Menu *menu, PanelOrientType orient); @@ -31,6 +31,9 @@ void make_panel_submenu (GtkWidget *menu, int fake_submenus); GtkWidget * create_panel_root_menu(GtkWidget *panel); + +void menu_properties(Menu *menu); + END_GNOME_DECLS diff -uNr gnome-core-0.25/panel/orbit-applet-lib.c gnome-core-0.27/panel/orbit-applet-lib.c --- gnome-core-0.25/panel/orbit-applet-lib.c Mon Aug 3 13:35:22 1998 +++ gnome-core-0.27/panel/orbit-applet-lib.c Wed Aug 12 01:09:45 1998 @@ -492,8 +492,8 @@ if(!ior) { PortableServer_POA poa; - static PortableServer_ObjectId objid = {0, sizeof("GNOME/Applet"), - "GNOME/Applet"}; + static const PortableServer_ObjectId objid = {0, sizeof("GNOME/Applet"), + "GNOME/Applet"}; POA_GNOME_Applet__init(&applet_servant, &ev); poa = orb->root_poa; /* non-portable temp hack */ @@ -649,7 +649,11 @@ void applet_corba_gtk_main (char *str) { + static const PortableServer_ObjectId objid = {0, sizeof("GNOME/Applet"), + "GNOME/Applet"}; gtk_main(); + + PortableServer_POA_deactivate_object(orb->root_poa, &objid, &ev); } void diff -uNr gnome-core-0.25/panel/orbit-glue.c gnome-core-0.27/panel/orbit-glue.c --- gnome-core-0.25/panel/orbit-glue.c Fri Jul 31 13:49:36 1998 +++ gnome-core-0.27/panel/orbit-glue.c Wed Aug 12 01:09:46 1998 @@ -381,9 +381,9 @@ { CHECK_COOKIE(); - if(g_list_find(applets_to_sync, GINT_TO_POINTER(applet_id))==NULL) + if(g_list_find(applets_to_sync, GINT_TO_POINTER(((int)applet_id)))==NULL) applets_to_sync = g_list_prepend(applets_to_sync, - GINT_TO_POINTER(applet_id)); + GINT_TO_POINTER(((int)applet_id))); panel_config_sync(); } @@ -574,7 +574,7 @@ POA_GNOME_Panel__init(&servant, &ev); - thepoa = orb->root_poa; /* non-portable temporary hack */ + thepoa = (PortableServer_POA)orb->root_poa; /* non-portable temporary hack */ PortableServer_POAManager_activate(PortableServer_POA__get_the_POAManager(thepoa, &ev), &ev); diff -uNr gnome-core-0.25/panel/panel-widget.c gnome-core-0.27/panel/panel-widget.c --- gnome-core-0.25/panel/panel-widget.c Mon Aug 3 13:35:25 1998 +++ gnome-core-0.27/panel/panel-widget.c Tue Aug 11 01:33:51 1998 @@ -48,6 +48,7 @@ int pw_minimize_delay = 300; int pw_disable_animations = FALSE; PanelMovementType pw_movement_type = PANEL_SWITCH_MOVE; +int pw_applet_padding = 3; static char *image_drop_types[] = {"url:ALL", "application/x-color"}; @@ -387,18 +388,17 @@ g_return_if_fail (container != NULL); g_return_if_fail (IS_PANEL_WIDGET (container)); g_return_if_fail (widget != NULL); - + panel = PANEL_WIDGET (container); ad = gtk_object_get_data(GTK_OBJECT(widget), PANEL_APPLET_DATA); + p = gtk_object_get_data(GTK_OBJECT(widget), + PANEL_APPLET_ASSOC_PANEL_KEY); + gtk_widget_ref(widget); if (GTK_CONTAINER_CLASS (parent_class)->remove) (* GTK_CONTAINER_CLASS (parent_class)->remove) (container, widget); - - p = gtk_object_get_data(GTK_OBJECT(widget), - PANEL_APPLET_ASSOC_PANEL_KEY); - if(ad) { PanelWidget *panel = PANEL_WIDGET (container); @@ -413,6 +413,7 @@ gtk_signal_emit(GTK_OBJECT(container), panel_widget_signals[APPLET_REMOVED_SIGNAL], widget); + gtk_widget_unref(widget); } @@ -583,8 +584,8 @@ if(finalpos >= panel->size) finalpos = panel->size-1; - else if(finalpos < 0) - finalpos = 0; + else if(finalpos < pw_applet_padding) + finalpos = pw_applet_padding; while((ad->pos+ad->cells-1)height = 0; requisition->width = 0; + if(panel->orient == PANEL_HORIZONTAL) + requisition->width = pw_applet_padding; + else + requisition->height = pw_applet_padding; + for(list = panel->applet_list; list!=NULL; list = g_list_next(list)) { AppletData *ad = list->data; gtk_widget_size_request (ad->applet, &ad->applet->requisition); @@ -659,7 +665,8 @@ } if(panel->packed) requisition->width += - ad->applet->requisition.width; + ad->applet->requisition.width + + pw_applet_padding; } else { if(requisition->width < ad->applet->requisition.width) { @@ -668,7 +675,8 @@ } if(panel->packed) requisition->height += - ad->applet->requisition.height; + ad->applet->requisition.height + + pw_applet_padding; } } if(!panel->packed) { @@ -680,7 +688,6 @@ } } -/*FIXME: do rightsticking*/ static void panel_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation) { @@ -707,7 +714,7 @@ panel_widget_right_stick(panel,old_size); if(panel->packed) { - i = 0; + i = pw_applet_padding; for(list = panel->applet_list; list!=NULL; list = g_list_next(list)) { @@ -719,11 +726,13 @@ send_move = g_list_prepend(send_move,ad); } if(panel->orient == PANEL_HORIZONTAL) { - ad->cells = ad->applet->requisition.width; + ad->cells = ad->applet->requisition.width + + pw_applet_padding; challoc.x = ad->pos; challoc.y = (allocation->height - ad->applet->requisition.height) / 2; } else { - ad->cells = ad->applet->requisition.height; + ad->cells = ad->applet->requisition.height + + pw_applet_padding; challoc.x = (allocation->width - ad->applet->requisition.width) / 2; challoc.y = ad->pos; } @@ -740,17 +749,19 @@ AppletData *ad = list->data; if(panel->orient == PANEL_HORIZONTAL) - ad->cells = ad->applet->requisition.width; + ad->cells = ad->applet->requisition.width + + pw_applet_padding; else - ad->cells = ad->applet->requisition.height; + ad->cells = ad->applet->requisition.height + + pw_applet_padding; if(ad->pos+ad->cells > i) { ad->pos = i - ad->cells; send_move = g_list_prepend(send_move,ad); } i = ad->pos; } - if(i<0) { - i = 0; + if(iapplet_list; list!=NULL; list = g_list_next(list)) { @@ -1364,8 +1375,8 @@ list = panel->applet_list; start = place-(ad->cells/2); - if(start<0) - start = 0; + if(startsize;i++) { GtkWidget *applet; list = walk_up_to(i,list); @@ -1628,6 +1639,10 @@ if(panel->currently_dragged_applet == ad) panel->currently_dragged_applet = NULL; + + panel->applet_list = g_list_remove(panel->applet_list,ad); + panel->no_window_applet_list = + g_list_remove (panel->no_window_applet_list, ad); g_free(ad); return FALSE; @@ -1683,7 +1698,7 @@ } } - for(i=pos;i>=0;i--) { + for(i=pos;i>=pw_applet_padding;i--) { list = walk_up_to(i,list); if(!is_in_applet(i,list->data)) { left = i; @@ -1718,17 +1733,21 @@ g_return_val_if_fail(panel!=NULL,-1); g_return_val_if_fail(applet!=NULL,-1); g_return_val_if_fail(pos>=0,-1); - + ad = gtk_object_get_data(GTK_OBJECT(applet),PANEL_APPLET_DATA); if(ad) pos = ad->pos; + if(pospacked) { if(get_applet_list_pos(panel,pos)) - pos++; /*this is a slight hack so that this applet is - inserted AFTER an applet with this pos number*/ + /*this is a slight hack so that this applet is + inserted AFTER an applet with this pos number*/ + pos++; } else pos = panel_widget_find_empty_pos(panel,pos); @@ -1821,10 +1840,14 @@ panel->applet_list = g_list_remove(panel->applet_list,ad); panel->no_window_applet_list = g_list_remove(panel->no_window_applet_list,ad); + + if(pospos = pos; @@ -1954,7 +1977,8 @@ int minimized_size, int minimize_delay, PanelMovementType move_type, - int disable_animations) + int disable_animations, + int applet_padding) { if(explicit_step>0) pw_explicit_step=explicit_step; @@ -1968,4 +1992,12 @@ pw_minimize_delay=minimize_delay; pw_movement_type = move_type; pw_disable_animations = disable_animations; + + /*change padding on all panels NOW*/ + if(pw_applet_padding != applet_padding) { + GList *li; + pw_applet_padding = applet_padding; + for(li=panels;li!=NULL;li=g_list_next(li)) + gtk_widget_queue_resize(li->data); + } } diff -uNr gnome-core-0.25/panel/panel-widget.h gnome-core-0.27/panel/panel-widget.h --- gnome-core-0.25/panel/panel-widget.h Mon Aug 3 13:35:25 1998 +++ gnome-core-0.27/panel/panel-widget.h Mon Aug 10 04:22:49 1998 @@ -168,7 +168,8 @@ int minimized_size, int minimize_delay, PanelMovementType move_type, - int disable_animations); + int disable_animations, + int applet_padding); /*get the number of applets*/ int panel_widget_get_applet_count (PanelWidget *panel); diff -uNr gnome-core-0.25/panel/panel.c gnome-core-0.27/panel/panel.c --- gnome-core-0.25/panel/panel.c Mon Aug 3 13:36:03 1998 +++ gnome-core-0.27/panel/panel.c Thu Aug 13 00:21:25 1998 @@ -68,7 +68,6 @@ } else if(IS_DRAWER_WIDGET(panel)) { return PANEL_WIDGET(DRAWER_WIDGET(panel)->panel); } - puts("get_def_panel"); g_warning("unknown panel type"); return NULL; } @@ -214,7 +213,7 @@ } /*we call this recursively*/ -static void orient_change_foreach(gpointer data, gpointer user_data); +static void orient_change_foreach(GtkWidget *w, gpointer data); void orientation_change(int applet_id, PanelWidget *panel) @@ -233,8 +232,8 @@ } else if(info->type == APPLET_DRAWER) { Drawer *drawer = info->data; DrawerWidget *dw = DRAWER_WIDGET(drawer->drawer); - reposition_drawer(drawer); set_drawer_applet_orient(drawer,get_applet_orient(panel)); + gtk_widget_queue_resize(drawer->drawer); gtk_container_foreach(GTK_CONTAINER(dw->panel), orient_change_foreach, (gpointer)dw->panel); @@ -249,10 +248,11 @@ } static void -orient_change_foreach(gpointer data, gpointer user_data) +orient_change_foreach(GtkWidget *w, gpointer data) { - int applet_id = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(data),"applet_id")); - PanelWidget *panel = user_data; + int applet_id = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(w), + "applet_id")); + PanelWidget *panel = data; orientation_change(applet_id,panel); } @@ -319,10 +319,11 @@ static void -back_change_foreach(gpointer data, gpointer user_data) +back_change_foreach(GtkWidget *w, gpointer data) { - int applet_id = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(data),"applet_id")); - PanelWidget *panel = user_data; + int applet_id = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(w), + "applet_id")); + PanelWidget *panel = data; back_change(applet_id,panel); } @@ -339,12 +340,13 @@ update_config_back(PANEL_WIDGET(widget)); } -static void state_hide_foreach(gpointer data, gpointer user_data); +static void state_hide_foreach(GtkWidget *w, gpointer data); static void -state_restore_foreach(gpointer data, gpointer user_data) +state_restore_foreach(GtkWidget *w, gpointer data) { - int applet_id = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(data),"applet_id")); + int applet_id = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(w), + "applet_id")); AppletInfo *info = get_applet_info(applet_id); if(info->type == APPLET_DRAWER) { @@ -365,9 +367,10 @@ } static void -state_hide_foreach(gpointer data, gpointer user_data) +state_hide_foreach(GtkWidget *w, gpointer data) { - int applet_id = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(data),"applet_id")); + int applet_id = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(w), + "applet_id")); AppletInfo *info = get_applet_info(applet_id); if(info->type == APPLET_DRAWER) { @@ -442,13 +445,8 @@ panel_size_allocate(GtkWidget *widget, GtkAllocation *alloc, gpointer data) { if(IS_DRAWER_WIDGET(widget)) { - Drawer *drawer = gtk_object_get_data(GTK_OBJECT(widget), - DRAWER_PANEL_KEY); - if(!drawer) - return FALSE; - if(DRAWER_WIDGET(widget)->state == DRAWER_SHOWN) - reposition_drawer(drawer); + gtk_widget_queue_resize(widget); panels_to_sync = TRUE; } return FALSE; @@ -472,7 +470,8 @@ static void panel_applet_added(GtkWidget *widget, GtkWidget *applet, gpointer data) { - int applet_id = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(applet),"applet_id")); + int applet_id = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(applet), + "applet_id")); AppletInfo *info = get_applet_info(applet_id); GtkWidget *panelw = gtk_object_get_data(GTK_OBJECT(widget), PANEL_PARENT); @@ -485,8 +484,10 @@ info && info->type == APPLET_DRAWER) { Drawer *drawer = info->data; DrawerWidget *dw = DRAWER_WIDGET(drawer->drawer); - if(dw->state == DRAWER_SHOWN) + if(dw->state == DRAWER_SHOWN) { SNAPPED_WIDGET(panelw)->drawers_open++; + snapped_widget_pop_up(SNAPPED_WIDGET(panelw)); + } } /*pop the panel up on addition*/ @@ -500,11 +501,12 @@ } static void -count_open_drawers(gpointer data, gpointer user_data) +count_open_drawers(GtkWidget *w, gpointer data) { - int applet_id = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(data),"applet_id")); + int applet_id = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(w), + "applet_id")); AppletInfo *info = get_applet_info(applet_id); - int *count = user_data; + int *count = data; if(info->type == APPLET_DRAWER) { Drawer *drawer = info->data; if(DRAWER_WIDGET(drawer->drawer)->state == DRAWER_SHOWN) @@ -744,6 +746,8 @@ PanelData *pd = gtk_object_get_user_data(GTK_OBJECT(widget)); GtkWidget *panel_menu = data; + kill_config_dialog(widget); + if(IS_DRAWER_WIDGET(widget)) { PanelWidget *panel = PANEL_WIDGET(DRAWER_WIDGET(widget)->panel); if(panel->master_widget) { @@ -766,7 +770,7 @@ panel_list = g_list_remove(panel_list,pd); g_free(pd); - + return FALSE; } @@ -932,7 +936,6 @@ } - static void panel_widget_setup(PanelWidget *panel) { @@ -969,7 +972,6 @@ else if(IS_CORNER_WIDGET(panelw)) pd->type = CORNER_PANEL; else { - puts("panel_setup"); g_warning("unknown panel type"); } @@ -1065,10 +1067,8 @@ /*this is a base panel*/ base_panels++; - } else { - puts("panel_setup later"); + } else g_warning("unknown panel type"); - } gtk_signal_connect(GTK_OBJECT(panelw), "event", GTK_SIGNAL_FUNC(panel_event), diff -uNr gnome-core-0.25/panel/panel_config.c gnome-core-0.27/panel/panel_config.c --- gnome-core-0.25/panel/panel_config.c Fri Jul 31 13:49:36 1998 +++ gnome-core-0.27/panel/panel_config.c Tue Aug 11 01:33:57 1998 @@ -8,6 +8,9 @@ /* Used for all the packing and padding options */ #define CONFIG_PADDING_SIZE 3 +extern GArray *applets; +extern int applet_count; + extern GlobalConfig global_config; /* used to temporarily store config values until the 'Apply' @@ -63,6 +66,14 @@ } void +kill_config_dialog(GtkWidget *panel) +{ + PerPanelConfig *ppc = get_config_struct(panel); + if(ppc && ppc->config_window) + gtk_widget_destroy(ppc->config_window); +} + +void update_config_orient(GtkWidget *panel) { PerPanelConfig *ppc = get_config_struct(panel); @@ -782,6 +793,15 @@ gtk_notebook_append_page (GTK_NOTEBOOK(prop_nbook), page, gtk_label_new (_("Corner Panel"))); + } else if(IS_DRAWER_WIDGET(panel)) { + DrawerWidget *dw = DRAWER_WIDGET(panel); + GtkWidget *applet = PANEL_WIDGET(dw->panel)->master_widget; + int applet_id = + GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(applet), + "applet_id")); + AppletInfo *info = get_applet_info(applet_id); + add_drawer_properties_page(ppc->config_window, + info->data); } diff -uNr gnome-core-0.25/panel/panel_config.h gnome-core-0.27/panel/panel_config.h --- gnome-core-0.25/panel/panel_config.h Fri Jul 31 13:49:36 1998 +++ gnome-core-0.27/panel/panel_config.h Tue Aug 11 01:33:57 1998 @@ -6,5 +6,6 @@ void panel_config(GtkWidget *panel); void update_config_orient(GtkWidget *panel); void update_config_back(PanelWidget *panel); +void kill_config_dialog(GtkWidget *panel); #endif /* PANEL_CONFIG_H */ diff -uNr gnome-core-0.25/panel/panel_config_global.c gnome-core-0.27/panel/panel_config_global.c --- gnome-core-0.25/panel/panel_config_global.c Fri Jul 31 13:49:37 1998 +++ gnome-core-0.27/panel/panel_config_global.c Mon Aug 10 04:22:50 1998 @@ -310,6 +310,13 @@ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, CONFIG_PADDING_SIZE); + /* Minimize Delay scale frame */ + frame = make_int_scale_frame(_("Applet Padding"), + &(temp_config.applet_padding), + 0.0,10.0); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, + CONFIG_PADDING_SIZE); + return (vbox); } diff -uNr gnome-core-0.25/panel/panel_config_global.h gnome-core-0.27/panel/panel_config_global.h --- gnome-core-0.25/panel/panel_config_global.h Mon Jun 22 04:39:17 1998 +++ gnome-core-0.27/panel/panel_config_global.h Mon Aug 10 04:22:50 1998 @@ -15,6 +15,7 @@ int prompt_for_logout; PanelMovementType movement_type; int disable_animations; + int applet_padding; }; diff -uNr gnome-core-0.25/panel/session.c gnome-core-0.27/panel/session.c --- gnome-core-0.25/panel/session.c Mon Aug 3 13:36:04 1998 +++ gnome-core-0.27/panel/session.c Thu Aug 13 00:22:44 1998 @@ -33,7 +33,11 @@ DEFAULT_MINIMIZED_SIZE, DEFAULT_MINIMIZE_DELAY, TRUE, /*tooltips*/ - TRUE /*show small icons*/ + TRUE, /*show small icons*/ + TRUE, /*logout question*/ + PANEL_SWITCH_MOVE, + FALSE, /*disable anims*/ + 3 /*applet padding*/ }; char *panel_cfg_path=NULL; @@ -73,7 +77,8 @@ global_config.minimized_size, global_config.minimize_delay, global_config.movement_type, - global_config.disable_animations); + global_config.disable_animations, + global_config.applet_padding); if(global_config.tooltips_enabled) gtk_tooltips_enable(panel_tooltips); else @@ -311,10 +316,8 @@ case DRAWER_PANEL: { DrawerWidget *drawer = DRAWER_WIDGET(pd->panel); - gnome_config_set_int("orient",panel->orient); + gnome_config_set_int("orient",drawer->orient); gnome_config_set_int("state", drawer->state); - gnome_config_set_int("drop_zone_pos", - drawer->drop_zone_pos); break; } default: @@ -422,6 +425,8 @@ global_config.prompt_for_logout); gnome_config_set_bool("disable_animations", global_config.disable_animations); + gnome_config_set_int("applet_padding", + global_config.applet_padding); } gnome_config_pop_prefix (); @@ -588,9 +593,9 @@ static void load_default_applets(void) { - load_menu_applet(NULL,0, 0,panels->data); - load_extern_applet("gen_util_applet","--clock", - INT_MAX/2/*right flush*/,panels->data,NULL); + load_menu_applet(NULL,0, panels->data, 0); + load_extern_applet("gen_util_applet","--clock",NULL, + panels->data,INT_MAX/2/*right flush*/); /*we laoded default applets, so we didn't find the config or something else was wrong, so do complete save when next syncing*/ need_complete_save = TRUE; @@ -649,34 +654,34 @@ when it loads*/ g_snprintf(buf,256,"%sApplet_%d_Extern/", old_panel_cfg_path,num); - load_extern_applet(path,params,pos,panel,buf); + load_extern_applet(path,params,buf,panel,pos); g_free(path); g_free(params); } else if(strcmp(applet_name,LAUNCHER_ID) == 0) { char *params = gnome_config_get_string("parameters="); - load_launcher_applet(params,pos,panel); + load_launcher_applet(params,panel,pos); g_free(params); } else if(strcmp(applet_name,LOGOUT_ID) == 0) { - load_logout_applet(pos,panel); + load_logout_applet(panel,pos); } else if(strcmp(applet_name,SWALLOW_ID) == 0) { char *path = gnome_config_get_string("execpath="); char *params = gnome_config_get_string("parameters="); int width = gnome_config_get_int("width=0"); int height = gnome_config_get_int("height=0"); - load_swallow_applet(path,params,width,height,pos,panel); + load_swallow_applet(path,params,width,height,panel,pos); g_free(path); g_free(params); } else if(strcmp(applet_name,MENU_ID) == 0) { char *params = gnome_config_get_string("parameters="); int main_menu_type = gnome_config_get_int("main_menu_type=0"); - load_menu_applet(params,main_menu_type,pos,panel); + load_menu_applet(params,main_menu_type,panel,pos); g_free(params); } else if(strcmp(applet_name,DRAWER_ID) == 0) { char *params = gnome_config_get_string("parameters="); char *pixmap = gnome_config_get_string("pixmap="); char *tooltip = gnome_config_get_string("tooltip="); - load_drawer_applet(params,pixmap,tooltip,pos,panel); + load_drawer_applet(params,pixmap,tooltip,panel,pos); g_free(params); g_free(pixmap); g_free(tooltip); @@ -774,23 +779,16 @@ case DRAWER_PANEL: { DrawerState state; - PanelOrientation orient; - DrawerDropZonePos drop_pos; + PanelOrientType orient; g_snprintf(buf,256,"state=%d", DRAWER_SHOWN); state=gnome_config_get_int(buf); - g_snprintf(buf,256,"orient=%d", PANEL_HORIZONTAL); + g_snprintf(buf,256,"orient=%d", ORIENT_UP); orient=gnome_config_get_int(buf); - g_snprintf(buf,256, - "drop_zone_pos=%d", - DROP_ZONE_LEFT); - drop_pos=gnome_config_get_int(buf); - panel = drawer_widget_new(orient, state, - drop_pos, back_type, back_pixmap, fit_pixmap_bg, @@ -880,6 +878,8 @@ g_snprintf(buf,256,"movement_type=%d", PANEL_SWITCH_MOVE); global_config.movement_type=gnome_config_get_int(buf); + + global_config.applet_padding=gnome_config_get_int("applet_padding=3"); gnome_config_pop_prefix(); diff -uNr gnome-core-0.25/panel/swallow.c gnome-core-0.27/panel/swallow.c --- gnome-core-0.25/panel/swallow.c Thu Jul 30 18:38:49 1998 +++ gnome-core-0.27/panel/swallow.c Mon Aug 10 04:22:50 1998 @@ -129,7 +129,7 @@ GTK_SPIN_BUTTON(width_s)), gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(height_s)), - 0, current_panel); + current_panel, 0); gtk_widget_destroy(d); } @@ -318,7 +318,7 @@ void load_swallow_applet(char *path, char *params, int width, int height, - int pos, PanelWidget *panel) + PanelWidget *panel, int pos) { Swallow *swallow; @@ -327,7 +327,7 @@ if(!swallow) return; - register_toy(swallow->table,swallow, pos, panel, APPLET_SWALLOW); + register_toy(swallow->table,swallow, panel, pos, APPLET_SWALLOW); if(path && *path) { char *s = g_copy_strings("(true; ",path," &)",NULL); diff -uNr gnome-core-0.25/panel/swallow.h gnome-core-0.27/panel/swallow.h --- gnome-core-0.25/panel/swallow.h Tue Jul 21 13:55:09 1998 +++ gnome-core-0.27/panel/swallow.h Mon Aug 10 04:22:50 1998 @@ -23,7 +23,7 @@ } Swallow; void load_swallow_applet(char *path, char *params, int width, int height, - int pos, PanelWidget *panel); + PanelWidget *panela, int pos); void set_swallow_applet_orient(Swallow *swallow, SwallowOrient orient); /*I couldn't resist the naming of this function*/ diff -uNr gnome-core-0.25/pixmaps/Makefile.am gnome-core-0.27/pixmaps/Makefile.am --- gnome-core-0.25/pixmaps/Makefile.am Mon Aug 3 13:36:04 1998 +++ gnome-core-0.27/pixmaps/Makefile.am Mon Aug 10 04:22:50 1998 @@ -46,6 +46,7 @@ gnome-tigert.png \ gnome-unknown.png \ gnome-word.png \ + kterm.xpm \ launcher-program.xpm \ monitor.xpm \ netscape.png \ diff -uNr gnome-core-0.25/pixmaps/Makefile.in gnome-core-0.27/pixmaps/Makefile.in --- gnome-core-0.25/pixmaps/Makefile.in Wed Aug 5 20:26:11 1998 +++ gnome-core-0.27/pixmaps/Makefile.in Thu Aug 13 08:15:56 1998 @@ -166,6 +166,7 @@ gnome-tigert.png \ gnome-unknown.png \ gnome-word.png \ + kterm.xpm \ launcher-program.xpm \ monitor.xpm \ netscape.png \ diff -uNr gnome-core-0.25/pixmaps/kterm.xpm gnome-core-0.27/pixmaps/kterm.xpm --- gnome-core-0.25/pixmaps/kterm.xpm Wed Dec 31 19:00:00 1969 +++ gnome-core-0.27/pixmaps/kterm.xpm Mon Aug 10 04:22:50 1998 @@ -0,0 +1,101 @@ +/* XPM */ +static char *kterm[] = { +/* width height num_colors chars_per_pixel */ +" 40 40 54 1", +/* colors */ +". c #b8b8b8", +"# c #707070", +"a c #787078", +"b c #d88000", +"c c #d88800", +"d c #807080", +"e c #f8a820", +"f c #f8a818", +"g c #887088", +"h c #f8e0b8", +"i c #787070", +"j c #f8e0c0", +"k c #f8f8d8", +"l c #98a098", +"m c #a0a0a0", +"n c #98a0a0", +"o c #a0a098", +"p c #d0c8c8", +"q c #c0c0c0", +"r c #b8b8c0", +"s c #c0c0b8", +"t c #c0b8c0", +"u c #c0b8b8", +"v c #b8c0c0", +"w c #c8d0d0", +"x c #d0d0d0", +"y c #d0c8d0", +"z c #c8c8c8", +"A c #c8c8d0", +"B c #d0d0c8", +"C c #e0e0e0", +"D c #e0d8e0", +"E c #e8e8e8", +"F c #f0f0f0", +"G c #d8e0d8", +"H c #d8d4d8", +"I c #f0e8f0", +"J c #f0f0e8", +"K c #f8fcf8", +"L c #707068", +"M c #000000", +"N c #907090", +"O c #38b8b8", +"P c #887080", +"Q c #a870a8", +"R c #987098", +"S c #f8b850", +"T c #e08400", +"U c #e08800", +"V c #e88808", +"W c #807078", +"X c #707078", +"Y c #f8c880", +"Z c #f08800", +/* pixels */ +"...........####################.........", +"...........####################.........", +"..........abcccccccccccccccccc##........", +".........debccccefeefeecefeefe##........", +"........ghhhhhhhhhhhhhhhhhhhhhi#........", +"........dhjii#iiiiiiiiiiiiiikji#........", +"........djilmnonnonmonmonmom.ei#........", +"........gh#mpqrstquvtsrquwmm.ei#........", +"........gh#mv.xyxzxyxAByxylm.ei#........", +"........gh#mu..CDCEFE.CGpxmm.ei#........", +"........gj#mqx.CGHGIFFDJxAmm.ei#........", +"........gh#mrxx......KKKBBmmBeLL........", +"........gh#msyxKK.M...KKBBmMMMLL.MMM....", +"........Nh#mrByGGKOMM..KKBmMMeLL.MM.....", +"........Nh#msAxGKKKKMM...KmMMeLL.MM..MM.", +"........Nh#mrByBBBGGMMGMMMMMMMMMMMMMMMMM", +"........Nh#msAxBBBBGGGGGBBmMMeLL.MM.....", +"........Nj#mrstBBBB.BBBB.BBMMeLL.MM.....", +"........Nh#mBB.BMBB.BB.BBMGmBeLL...MM...", +"........Nj#mmmmmmMMmmmmmmMMMMMMMMMMMMM..", +"........Njk......MM......MMMMMMMMMMMMM..", +"........NheeeeeeeeMMeeMeeMMeeeMM...MM...", +".........PiiiiiLLLMMLLMLLMMLLLMM...MM...", +"....QQRNd######LLLLLLMLLLMMLLLMMLLLMM...", +"...RSeeefeefeefeeeeeeMeeeMMMMMMMMMMMM...", +"...dhhhhhhhhhhhjjjjjMMjjjMMjjjMMjjLMM...", +"..ghTUhVUhVUhVUjccjcMjccjccjccMMcjjLL...", +"..WhcchUchcUhccjccjMMjccMMMMMMMMMMMMMM..", +"..ahhhhhhhhjhhjjjjjMMjjjjjhhhhMMhhhhLL..", +".aehejeeheeheeheehMMheeheeheehMMheehLL..", +".XeheheeheeheeheMMMMheMMMMMMMMMMMMMMMMMM", +"#efhhhhhhhhhhhhhhMMMhhhhhhhhhMMhMhhheLL.", +"#feSYYYYYYYYYYYYYYMMYYYYYYYYMMYYYMheeLL.", +"#ffeefeefeefeefeeeMMeeeeeeeeMMeeeMMMeLL.", +"#cUTTTZZZZZZZZZcccMMcccccccMMcccccMMMMMM", +"L#LLLLLLLLLLLLLLLLMMMLLLLMMLLLLLLLLMMMM.", +".##############LLLLMMLMMMLLLLLLLLLLLLMM.", +"........................................", +"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK", +"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK" +}; diff -uNr gnome-core-0.25/po/ChangeLog gnome-core-0.27/po/ChangeLog --- gnome-core-0.25/po/ChangeLog Wed Aug 5 12:42:28 1998 +++ gnome-core-0.27/po/ChangeLog Mon Aug 10 04:22:50 1998 @@ -1,3 +1,7 @@ +1998-08-07 Nuno Ferreira + + * pt.po: Updated. + 1998-08-04 Nuno Ferreira * pt.po: Updated. diff -uNr gnome-core-0.25/po/POTFILES.in gnome-core-0.27/po/POTFILES.in --- gnome-core-0.25/po/POTFILES.in Wed Aug 5 12:42:28 1998 +++ gnome-core-0.27/po/POTFILES.in Mon Aug 10 04:22:50 1998 @@ -24,42 +24,58 @@ applets/netload/netload.c applets/netload/properties.c applets/webcontrol/webcontrol.c +applets/winlist/winlist.c + desktop-properties/app-background.c desktop-properties/app-bell.c desktop-properties/app-keyboard.c desktop-properties/app-mouse.c desktop-properties/app-ui.c desktop-properties/args.c +desktop-properties/main.c desktop-properties/property-background.c desktop-properties/property-bell.c desktop-properties/property-keyboard.c desktop-properties/property-mouse.c desktop-properties/property-screensaver.cc desktop-properties/property-ui.c +desktop-properties/xlockmore.cc + +gemvt/getopt.c + gmenu/dialogs.c gmenu/edit.c gmenu/gmenu.c gmenu/order.c gmenu/tree.c + gnome-terminal/gnome-terminal.c + gsm/main.c gsm/save-session.c gsm/session-properties.c + help-browser/bookmarks.c help-browser/gnome-help-browser.c help-browser/gnome-helpwin.c help-browser/history.c +help-browser/toc-man.c +help-browser/toc.c help-browser/toc2-man.c help-browser/toc2.c help-browser/visit.c help-browser/window.c + +panel/applet-lib.cc panel/applet.c panel/drawer.c panel/launcher.c panel/logout.c panel/main.c panel/menu.c +panel/mico-glue.cc panel/panel-util.c +panel/panel.c panel/panel_config.c panel/panel_config_global.c panel/session.c diff -uNr gnome-core-0.25/po/cat-id-tbl.c gnome-core-0.27/po/cat-id-tbl.c --- gnome-core-0.25/po/cat-id-tbl.c Wed Aug 5 16:13:18 1998 +++ gnome-core-0.27/po/cat-id-tbl.c Wed Aug 12 03:30:00 1998 @@ -186,368 +186,426 @@ {"Display URL label", 160}, {"Display \"launch new window\" option", 161}, {"Look", 162}, - {"Background Properties", 163}, - {"Bell Properties", 164}, - {"Keyboard Properties", 165}, - {"Mouse Properties", 166}, - {"Gnome Look and Feel Properties", 167}, - {"Set parameters from saved state and exit", 168}, - {"Color", 169}, - {"Flat", 170}, - {"Gradient", 171}, - {"Vertical", 172}, - {"Horizontal", 173}, - {"Wallpaper Selection", 174}, - {"Wallpaper", 175}, - {" Browse... ", 176}, - {"none", 177}, - {"Scaled", 178}, - {"Scaled (keep aspect)", 179}, - {"Centered", 180}, - {"Tiled", 181}, - {" Background ", 182}, - {"IMAGE", 183}, - {"Sets the wallpaper to the value specified", 184}, - {"COLOR", 185}, - {"Specifies the background color", 186}, - {"Specifies end background color for gradient", 187}, - {"ORIENT", 188}, - {"Gradient orientation: vertical or horizontal", 189}, - {"Use a solid fill for the background", 190}, - {"Use a gradient fill for the background", 191}, - {"MODE", 192}, - {"Display wallpaper: tiled, centered, scaled or ratio", 193}, - {"Sound", 194}, - {"Volume", 195}, - {"Pitch", 196}, - {"Duration", 197}, - {"Test", 198}, - {"Bell", 199}, - {"Auto-repeat", 200}, - {"Enable auto-repeat", 201}, - {"Repeat rate", 202}, - {"Repeat delay", 203}, - {"Keyboard click", 204}, - {"Click on keypress", 205}, - {"Click volume", 206}, - {"Keyboard", 207}, - {"Mouse buttons", 208}, - {"Left handed", 209}, - {"Right handed", 210}, - {"Mouse motion", 211}, - {"Acceleration", 212}, - {"Fast", 213}, - {"Slow", 214}, - {"Threshold", 215}, - {"Large", 216}, - {"Small", 217}, - {"Mouse", 218}, - {"Settings", 219}, - {"Wait", 220}, - {"Min", 221}, - {"Requires Password", 222}, - {"Use DPMS", 223}, - {"Priority", 224}, - {"Normal", 225}, - {"Low", 226}, - {"Screensavers", 227}, - {"Setup...", 228}, - {" Screensaver ", 229}, - {"Default Gtk setting [FIXME - Describe this better]", 230}, - {"Spread buttons out", 231}, - {"Put buttons on edges", 232}, - {"Left-justify buttons", 233}, - {"Right-justify buttons", 234}, - {"Let window manager decide", 235}, - {"Center of the screen", 236}, - {"At the mouse pointer", 237}, - {"Dialogs are like other windows", 238}, - {"Dialogs are treated specially by window manager", 239}, - {"Dialog buttons", 240}, - {"Dialog position", 241}, - {"Dialog hints", 242}, - {"Use statusbar instead of dialog when possible", 243}, - {"Place dialogs over application window when possible", 244}, - {"Dialogs", 245}, - {"Menubars are detachable", 246}, - {"Toolbars are detachable", 247}, - {"Toolbar buttons have relieved border", 248}, - {"Statusbar is interactive when possible", 249}, - {"Application", 250}, - {"File exists.", 251}, - {"Failed to create file.", 252}, + {"readfd writefd", 163}, + {"Background Properties", 164}, + {"Bell Properties", 165}, + {"Keyboard Properties", 166}, + {"Mouse Properties", 167}, + {"Gnome Look and Feel Properties", 168}, + {"Set parameters from saved state and exit", 169}, + {"Color", 170}, + {"Flat", 171}, + {"Gradient", 172}, + {"Vertical", 173}, + {"Horizontal", 174}, + {"Wallpaper Selection", 175}, + {"Wallpaper", 176}, + {" Browse... ", 177}, + {"none", 178}, + {"Scaled", 179}, + {"Scaled (keep aspect)", 180}, + {"Centered", 181}, + {"Tiled", 182}, + {" Background ", 183}, + {"IMAGE", 184}, + {"Sets the wallpaper to the value specified", 185}, + {"COLOR", 186}, + {"Specifies the background color", 187}, + {"Specifies end background color for gradient", 188}, + {"ORIENT", 189}, + {"Gradient orientation: vertical or horizontal", 190}, + {"Use a solid fill for the background", 191}, + {"Use a gradient fill for the background", 192}, + {"MODE", 193}, + {"Display wallpaper: tiled, centered, scaled or ratio", 194}, + {"Sound", 195}, + {"Volume", 196}, + {"Pitch", 197}, + {"Duration", 198}, + {"Test", 199}, + {"Bell", 200}, + {"Auto-repeat", 201}, + {"Enable auto-repeat", 202}, + {"Repeat rate", 203}, + {"Repeat delay", 204}, + {"Keyboard click", 205}, + {"Click on keypress", 206}, + {"Click volume", 207}, + {"Keyboard", 208}, + {"Mouse buttons", 209}, + {"Left handed", 210}, + {"Right handed", 211}, + {"Mouse motion", 212}, + {"Acceleration", 213}, + {"Fast", 214}, + {"Slow", 215}, + {"Threshold", 216}, + {"Large", 217}, + {"Small", 218}, + {"Mouse", 219}, + {"Settings", 220}, + {"Wait", 221}, + {"Min", 222}, + {"Requires Password", 223}, + {"Use DPMS", 224}, + {"Priority", 225}, + {"Normal", 226}, + {"Low", 227}, + {"Screensavers", 228}, + {"Setup...", 229}, + {" Screensaver ", 230}, + {"Default Gtk setting [FIXME - Describe this better]", 231}, + {"Spread buttons out", 232}, + {"Put buttons on edges", 233}, + {"Left-justify buttons", 234}, + {"Right-justify buttons", 235}, + {"Let window manager decide", 236}, + {"Center of the screen", 237}, + {"At the mouse pointer", 238}, + {"Dialogs are like other windows", 239}, + {"Dialogs are treated specially by window manager", 240}, + {"Notebook", 241}, + {"Toplevel", 242}, + {"Modal", 243}, + {"Left", 244}, + {"Right", 245}, + {"Top", 246}, + {"Bottom", 247}, + {"Dialog buttons", 248}, + {"Dialog position", 249}, + {"Dialog hints", 250}, + {"Use statusbar instead of dialog when possible", 251}, + {"Place dialogs over application window when possible", 252}, + {"Dialogs", 253}, + {"Menubars are detachable", 254}, + {"Toolbars are detachable", 255}, + {"Toolbar buttons have relieved border", 256}, + {"Statusbar is interactive when possible", 257}, + {"Application", 258}, + {"Default MDI mode", 259}, + {"MDI notebook tab position", 260}, + {"MDI", 261}, + {"XLockMore Properties", 262}, + {" OK ", 263}, + {" Apply ", 264}, + {" Cancel ", 265}, + {" Defaults ", 266}, + {"Help", 267}, + {" Mode ", 268}, + {" XLockMore ", 269}, + {" Options ", 270}, + {" Preview ", 271}, + {"%s: option `%s' is ambiguous\n", 272}, + {"%s: option `--%s' doesn't allow an argument\n", 273}, + {"%s: option `%c%s' doesn't allow an argument\n", 274}, + {"%s: option `%s' requires an argument\n", 275}, + {"%s: unrecognized option `--%s'\n", 276}, + {"%s: unrecognized option `%c%s'\n", 277}, + {"%s: illegal option -- %c\n", 278}, + {"%s: invalid option -- %c\n", 279}, + {"%s: option requires an argument -- %c\n", 280}, + {"%s: option `-W %s' is ambiguous\n", 281}, + {"%s: option `-W %s' doesn't allow an argument\n", 282}, + {"File exists.", 283}, + {"Failed to create file.", 284}, {"\ You can't add an entry to that folder!\n\ -To edit system entries you must be root.", 253}, - {"New Folder", 254}, - {"Create Folder:", 255}, - {"Failed to delete the folder.", 256}, - {"Failed to delete the file.", 257}, - {"You must select something first!", 258}, - {"You can not delete a top level Folder!", 259}, +To edit system entries you must be root.", 285}, + {"New Folder", 286}, + {"Create Folder:", 287}, + {"Failed to delete the folder.", 288}, + {"Failed to delete the file.", 289}, + {"You must select something first!", 290}, + {"You can not delete a top level Folder!", 291}, {"\ You can't delete that file!\n\ -To edit system entries you must be root.", 260}, - {"Delete file?", 261}, - {"Delete empty folder?", 262}, +To edit system entries you must be root.", 292}, + {"Delete file?", 293}, + {"Delete empty folder?", 294}, {"\ Cannot delete folder.\n\ -To delete a folder. it must be empty.", 263}, - {"File or Folder does not exist on filesystem.", 264}, - {"The Name text field can not be blank.", 265}, +To delete a folder. it must be empty.", 295}, + {"File or Folder does not exist on filesystem.", 296}, + {"The Name text field can not be blank.", 297}, {"\ You can't edit an entry in that folder!\n\ -To edit system entries you must be root.", 266}, - {"Save Changes?", 267}, - {"Overwrite existing file?", 268}, - {"Save file?", 269}, - {"File name:", 270}, - {"Save", 271}, - {"Revert", 272}, - {"New", 273}, - {"New Folder...", 274}, - {"Delete...", 275}, - {"Quit", 276}, - {"File", 277}, - {"Help", 278}, - {"creating user directory: %s\n", 279}, - {"unable to create user directory: %s\n", 280}, - {"GNOME menu editor", 281}, +To edit system entries you must be root.", 298}, + {"Save Changes?", 299}, + {"Overwrite existing file?", 300}, + {"Save file?", 301}, + {"File name:", 302}, + {"Save", 303}, + {"Revert", 304}, + {"New", 305}, + {"New Folder...", 306}, + {"Delete...", 307}, + {"Quit", 308}, + {"Folder", 309}, + {"Folder Recursive", 310}, + {"File", 311}, + {"Sort", 312}, + {"Create a new folder", 313}, + {"Delete", 314}, + {"Delete selected menu item", 315}, + {"Move up", 316}, + {"Move selected menu up", 317}, + {"Move down", 318}, + {"Move selected menu down", 319}, + {"Properties", 320}, + {"Edit selected menu item properties", 321}, + {"Sort Folder", 322}, + {"Sort selected folder", 323}, + {"creating user directory: %s\n", 324}, + {"unable to create user directory: %s\n", 325}, + {"GNOME menu editor", 326}, {"\ Released under the terms of the GNU Public License.\n\ -GNOME menu editor.", 282}, - {"Delete", 283}, - {"Edit Properties", 284}, - {"Unable to create file: %s\n", 285}, - {"unable to remove .order file: %s\n", 286}, - {" Folder", 287}, - {"GNOME", 288}, - {"System Menus", 289}, - {"Top of system menus", 290}, - {"Running with root privileges.\n", 291}, - {"User Menus", 292}, - {"Top of user menus", 293}, - {"GNOME Terminal", 294}, - {"The GNOME terminal emulation program.", 295}, - {"Linux console", 296}, - {"Color Xterm", 297}, - {"rxvt", 298}, - {"White on black", 299}, - {"Black on white", 300}, - {"Green on black", 301}, - {"Black on light yellow", 302}, - {"Custom colors", 303}, - {"Left", 304}, - {"Right", 305}, - {"Hidden", 306}, - {"Font:", 307}, - {"Scrollbar position", 308}, - {"Blinking cursor", 309}, - {"Scrollback lines", 310}, - {"Colors", 311}, - {"Color palette:", 312}, - {"Foreground color:", 313}, - {"Background color:", 314}, - {"Colors:", 315}, - {"Color selector", 316}, - {"New terminal", 317}, - {"Save preferences", 318}, - {"Close terminal", 319}, - {"Hide menubar...", 320}, - {"Color selector...", 321}, - {"Close all terminals", 322}, - {"Terminal", 323}, - {"FONT", 324}, - {"Specifies font name", 325}, - {"Do not start up shells as login shells", 326}, - {"Start up shells as login shells", 327}, - {"GEOMETRY", 328}, - {"Specifies the geometry for the main window", 329}, - {"COMMAND", 330}, - {"Execute this program instead of a shell", 331}, - {"Foreground color", 332}, - {"Background color", 333}, - {"ID", 334}, - {"[SESSION]", 335}, - {"Kill session", 336}, - {"save-session: couldn't connect to session manager\n", 337}, - {"Startup", 338}, - {"Programs to invoke at session startup:", 339}, - {"Gnome Session Properties", 340}, - {"Geometry of window", 341}, - {"Bookmark", 342}, - {"Page Title", 343}, - {"Gnome Help Bookmarks", 344}, - {"Remove", 345}, - {"X", 346}, - {"X position of window", 347}, - {"Y", 348}, - {"Y position of window", 349}, - {"WIDTH", 350}, - {"Width of window", 351}, - {"HEIGHT", 352}, - {"Height of window", 353}, - {"Debug level", 354}, - {"[URL]", 355}, - {"Gnome Help Browser", 356}, - {"GNOME Help Browser allows easy access to various forms of documentation on your system", 357}, - {"History size", 358}, - {"History file", 359}, - {"Cache size", 360}, - {"Cache file", 361}, - {"Bookmark file", 362}, - {"Man Path", 363}, - {"Info Path", 364}, - {"GNOME Help Path", 365}, - {"Gnome Help Configure", 366}, - {"History and cache", 367}, - {"Paths", 368}, - {"

Error: file not found

", 369}, - {"URL", 370}, - {"Last", 371}, - {"Count", 372}, - {"Gnome Help History", 373}, - {"User Commands", 374}, - {"System Calls", 375}, - {"Library Functions", 376}, - {"Special Files", 377}, - {"File Formats", 378}, - {"Games", 379}, - {"Miscellaneous", 380}, - {"Administration", 381}, - {"man9", 382}, - {"mann", 383}, - {"manx", 384}, - {"

Table of Contents

\n", 385}, - {"

Man Pages

\n", 386}, - {"

Info Pages

\n", 387}, - {"

GNOME Help

\n", 388}, +GNOME menu editor.", 327}, + {"Unable to create file: %s\n", 328}, + {"unable to remove .order file: %s\n", 329}, + {" Folder", 330}, + {"One moment, reading menus...", 331}, + {"GNOME", 332}, + {"System Menus", 333}, + {"Top of system menus", 334}, + {"Running with System Menu privileges.\n", 335}, + {"User Menus", 336}, + {"Top of user menus", 337}, + {"GNOME Terminal", 338}, + {"The GNOME terminal emulation program.", 339}, + {"Linux console", 340}, + {"Color Xterm", 341}, + {"rxvt", 342}, + {"White on black", 343}, + {"Black on white", 344}, + {"Green on black", 345}, + {"Black on light yellow", 346}, + {"Custom colors", 347}, + {"Hidden", 348}, + {"Font:", 349}, + {"Scrollbar position", 350}, + {"Blinking cursor", 351}, + {"Scrollback lines", 352}, + {"Colors", 353}, + {"Color palette:", 354}, + {"Foreground color:", 355}, + {"Background color:", 356}, + {"Colors:", 357}, + {"Color selector", 358}, + {"New terminal", 359}, + {"Save preferences", 360}, + {"Close terminal", 361}, + {"Hide menubar...", 362}, + {"Color selector...", 363}, + {"Terminal", 364}, + {"FONT", 365}, + {"Specifies font name", 366}, + {"Do not start up shells as login shells", 367}, + {"Start up shells as login shells", 368}, + {"GEOMETRY", 369}, + {"Specifies the geometry for the main window", 370}, + {"COMMAND", 371}, + {"Execute this program instead of a shell", 372}, + {"Foreground color", 373}, + {"Background color", 374}, + {"ID", 375}, + {"[SESSION]", 376}, + {"Kill session", 377}, + {"save-session: couldn't connect to session manager\n", 378}, + {"Startup", 379}, + {"Programs to invoke at session startup:", 380}, + {"Gnome Session Properties", 381}, + {"Geometry of window", 382}, + {"Bookmark", 383}, + {"Page Title", 384}, + {"Gnome Help Bookmarks", 385}, + {"Remove", 386}, + {"X", 387}, + {"X position of window", 388}, + {"Y", 389}, + {"Y position of window", 390}, + {"WIDTH", 391}, + {"Width of window", 392}, + {"HEIGHT", 393}, + {"Height of window", 394}, + {"Debug level", 395}, + {"[URL]", 396}, + {"Gnome Help Browser", 397}, + {"GNOME Help Browser allows easy access to various forms of documentation on your system", 398}, + {"History size", 399}, + {"History file", 400}, + {"Cache size", 401}, + {"Cache file", 402}, + {"Bookmark file", 403}, + {"Man Path", 404}, + {"Info Path", 405}, + {"GNOME Help Path", 406}, + {"Gnome Help Configure", 407}, + {"History and cache", 408}, + {"Paths", 409}, + {"

Error: file not found

", 410}, + {"URL", 411}, + {"Last", 412}, + {"Count", 413}, + {"Gnome Help History", 414}, + {"User Commands", 415}, + {"System Calls", 416}, + {"Library Functions", 417}, + {"Special Files", 418}, + {"File Formats", 419}, + {"Games", 420}, + {"Miscellaneous", 421}, + {"Administration", 422}, + {"man9", 423}, + {"mann", 424}, + {"manx", 425}, + {"Man Pages", 426}, + {"Info Pages", 427}, + {"GNOME Help", 428}, + {"

Table of Contents

\n", 429}, + {"

Man Pages

\n", 430}, + {"

Info Pages

\n", 431}, + {"

GNOME Help

\n", 432}, {"\ \n\ \n\ -

Results of the substring search for the string ", 389}, +

Results of the substring search for the string ", 433}, {"\

\n\
\n\

Manual Pages

\n\

\n\ -

    \n", 390}, +
      \n", 434}, {"\ \n\

      \n\
      \n\

      GNU Info Pages

      \n\

      \n\ -

        \n", 391}, +
          \n", 435}, {"\ \n\

          \n\
          \n\

          GNOME Help Pages

          \n\

          \n\ -

            \n", 392}, - {"
            No matches found\n", 393}, - {"Could not load default TOC page", 394}, - {"Unknown TOC argument", 395}, - {"New window", 396}, - {"Open new browser window", 397}, - {"Add Bookmark", 398}, - {"Add bookmark", 399}, - {"Configure", 400}, - {"Close window", 401}, - {"Exit", 402}, - {"Exit all windows", 403}, - {"About", 404}, - {"Info about this program", 405}, - {"History", 406}, - {"Show History Window", 407}, - {"Bookmarks", 408}, - {"Show Bookmarks Window", 409}, - {"Window", 410}, - {"Back", 411}, - {"Go to the previous location in the history list", 412}, - {"Forward", 413}, - {"Go to the next location in the history list", 414}, - {"Reload", 415}, - {"Index", 416}, - {"Show Documentation Index", 417}, - {"BMarks", 418}, - {"Help on Help", 419}, - {"???", 420}, - {"Remove from panel", 421}, - {"Move applet", 422}, - {"Drawer properties", 423}, - {"Tooltip/Name", 424}, - {"Icon", 425}, - {"Drawer", 426}, - {"App", 427}, - {"Launcher properties", 428}, - {"Create launcher applet", 429}, - {"Log out", 430}, - {"Discard session", 431}, - {"The GNOME Panel", 432}, - {"This program is responsible for launching other applications, embedding small applets within itself, world peace, and random X crashes.", 433}, - {"Add this launcher to panel", 434}, - {"Add this as drawer to panel", 435}, - {"Add this as menu to panel", 436}, - {"Properties ...", 437}, - {"...", 438}, - {"Applets", 439}, - {"Edge Panel", 440}, - {"Corner Panel", 441}, - {"Remove this panel", 442}, - {"Add applet", 443}, - {"Add new panel", 444}, - {"Add main menu", 445}, - {"Add log out button", 446}, - {"Add swallowed app", 447}, - {"Add new launcher", 448}, - {"This panel properties...", 449}, - {"Global properties...", 450}, - {"Panel", 451}, - {"Lock screen", 452}, - {"Browse", 453}, - {"Position", 454}, - {"Top", 455}, - {"Bottom", 456}, - {"Minimize Options", 457}, - {"Explicitly Hide", 458}, - {"Auto Hide", 459}, - {"North East", 460}, - {"South West", 461}, - {"North West", 462}, - {"South East", 463}, - {"Orientation", 464}, - {"Background", 465}, - {"Standard", 466}, - {"Pixmap", 467}, - {"Image file", 468}, - {"Scale image to fit panel", 469}, - {"Panel properties", 470}, - {"Disable animations", 471}, - {"Auto-Hide Animation Speed", 472}, - {"Explicit-Hide Animation Speed", 473}, - {"Drawer Animation Speed", 474}, - {"Auto-Hide Minimize Delay (ms)", 475}, - {"Auto-Hide Minimized Size (pixels)", 476}, - {"Tooltips", 477}, - {"Tooltips enabled", 478}, - {"Menus", 479}, - {"Show small icons", 480}, - {"Movement", 481}, - {"Switched movement", 482}, - {"Free movement (doesn't disturb other applets)", 483}, - {"Log Out", 484}, - {"Prompt before logout", 485}, - {"Global Panel Configuration", 486}, - {"Animation settings", 487}, - {"Really log out?", 488}, - {"Ask next time", 489}, - {"Create swallow applet", 490}, - {"Title of application to swallow", 491}, - {"Command (optional)", 492}, - {"Width (optional)", 493}, - {"Height (optional)", 494}, +
              \n", 436}, + {"
              No matches found\n", 437}, + {"Could not load default TOC page", 438}, + {"Unknown TOC argument", 439}, + {"New window", 440}, + {"Open new browser window", 441}, + {"Add Bookmark", 442}, + {"Add bookmark", 443}, + {"Configure", 444}, + {"Close window", 445}, + {"Exit", 446}, + {"Exit all windows", 447}, + {"About", 448}, + {"Info about this program", 449}, + {"History", 450}, + {"Show History Window", 451}, + {"Bookmarks", 452}, + {"Show Bookmarks Window", 453}, + {"Window", 454}, + {"Back", 455}, + {"Go to the previous location in the history list", 456}, + {"Forward", 457}, + {"Go to the next location in the history list", 458}, + {"Reload", 459}, + {"Index", 460}, + {"Show Documentation Index", 461}, + {"BMarks", 462}, + {"Help on Help", 463}, + {"???", 464}, + {"Remove from panel", 465}, + {"Move applet", 466}, + {"Tooltip/Name", 467}, + {"Icon", 468}, + {"Applet appearance", 469}, + {"Drawer", 470}, + {"App", 471}, + {"Launcher properties", 472}, + {"Create launcher applet", 473}, + {"Log out", 474}, + {"Discard session", 475}, + {"The GNOME Panel", 476}, + {"This program is responsible for launching other applications, embedding small applets within itself, world peace, and random X crashes.", 477}, + {"Add this launcher to panel", 478}, + {"Add this as drawer to panel", 479}, + {"Add this as menu to panel", 480}, + {"Properties ...", 481}, + {"...", 482}, + {"Applets", 483}, + {"Edge Panel", 484}, + {"Corner Panel", 485}, + {"Remove this panel", 486}, + {"Add applet", 487}, + {"Add new panel", 488}, + {"Add main menu", 489}, + {"Add log out button", 490}, + {"Add swallowed app", 491}, + {"Add new launcher", 492}, + {"This panel properties...", 493}, + {"Global properties...", 494}, + {"Panel", 495}, + {"Lock screen", 496}, + {"Menu properties", 497}, + {"Menu Type", 498}, + {"Main Menu", 499}, + {"Normal Menu", 500}, + {"Both System and User menus on the same menu", 501}, + {"System on the main menu, User menu as a submenu", 502}, + {"User on the main menu, System menu as a submenu", 503}, + {"Menu path", 504}, + {"Browse", 505}, + {"Menu", 506}, + {"Error on sending 'session save' to applet!", 507}, + {"Error on sending 'orient change' to applet!", 508}, + {"Error on sending 'do callback' to applet!", 509}, + {"Error on sending 'start new applet' to applet!", 510}, + {"Error on sending 'change back' to applet!", 511}, + {"Error on sending 'tooltips state' to applet!", 512}, + {"Position", 513}, + {"Minimize Options", 514}, + {"Explicitly Hide", 515}, + {"Auto Hide", 516}, + {"North East", 517}, + {"South West", 518}, + {"North West", 519}, + {"South East", 520}, + {"Orientation", 521}, + {"Background", 522}, + {"Standard", 523}, + {"Pixmap", 524}, + {"Image file", 525}, + {"Scale image to fit panel", 526}, + {"Panel properties", 527}, + {"Disable animations", 528}, + {"Auto-Hide Animation Speed", 529}, + {"Explicit-Hide Animation Speed", 530}, + {"Drawer Animation Speed", 531}, + {"Auto-Hide Minimize Delay (ms)", 532}, + {"Auto-Hide Minimized Size (pixels)", 533}, + {"Tooltips", 534}, + {"Tooltips enabled", 535}, + {"Menus", 536}, + {"Show small icons", 537}, + {"Movement", 538}, + {"Switched movement", 539}, + {"Free movement (doesn't disturb other applets)", 540}, + {"Log Out", 541}, + {"Prompt before logout", 542}, + {"Applet Padding", 543}, + {"Global Panel Configuration", 544}, + {"Animation settings", 545}, + {"Really log out?", 546}, + {"Ask next time", 547}, + {"Create swallow applet", 548}, + {"Title of application to swallow", 549}, + {"Command (optional)", 550}, + {"Width (optional)", 551}, + {"Height (optional)", 552}, }; -int _msg_tbl_length = 494; +int _msg_tbl_length = 552; Binary files gnome-core-0.25/po/es.gmo and gnome-core-0.27/po/es.gmo differ diff -uNr gnome-core-0.25/po/es.po gnome-core-0.27/po/es.po --- gnome-core-0.25/po/es.po Mon Aug 3 13:36:17 1998 +++ gnome-core-0.27/po/es.po Wed Aug 12 03:32:41 1998 @@ -1,22 +1,18 @@ msgid "" msgstr "" -"POT-Creation-Date: 1998-08-02 18:13-0500\n" -"Content-Type: text/plain; charset=\n" -"Date: 1998-04-15 23:34:19-0500\n" +"Date: 1998-07-31 16:31:00+0200\n" +"Project-Id-Version: gnome-core 0.20\n" +"POT-Creation-Date: 1998-07-14 11:21-0500\n" +"PO-Revision-Date: 1998-07-31 16:31+0200\n" "From: Miguel de Icaza,computo,622-4680 \n" -"Xgettext-Options: --default-domain=gnome-core --directory=.. --add-comments " -"--keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" -"Files: applets/batmon/batmon.c applets/mailcheck/mailcheck.c " -"applets/netwatch/netwatch.c panel/panel.c panel/applet-lib.cc panel/menu.c " -"panel/panel_config.c panel/panel_config_global.c panel/launcher.c " -"panel/drawer.c panel/main.c panel/logout.c " -"desktop-properties/property-background.c " -"desktop-properties/property-screensaver.cc desktop-properties/xlockmore.cc " -"desktop-properties/property-keyboard.c desktop-properties/property-mouse.c " -"desktop-properties/main.c desktop-properties/app-mouse.c " -"desktop-properties/app-keyboard.c desktop-properties/app-background.c " -"gsm/main.c gsm/save-session.c help-browser/gnome-help-browser.c " -"help-browser/window.c\n" +"Last-Translator: Pablo Saratxaga \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" +"Xgettext-Options: --default-domain=gnome-core --directory=.. --add-comments --keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" +"Files: applets/gen_util/clock.c applets/gen_util/mailcheck.c applets/gen_util/main.c applets/gen_util/printer.c applets/batmon/batmon.c applets/bussign/bussign.c applets/fish/fish.c applets/cpuload/cpuload.c applets/cpuload/properties.c applets/netload/netload.c applets/netload/properties.c panel/panel.c panel/applet-lib.cc panel/menu.c panel/panel_config.c panel/panel_config_global.c panel/launcher.c panel/drawer.c panel/main.c panel/logout.c desktop-properties/property-background.c desktop-properties/property-screensaver.cc desktop-properties/xlockmore.cc desktop-properties/property-keyboard.c desktop-properties/property-mouse.c desktop-properties/main.c desktop-properties/app-mouse.c desktop-properties/app-keyboard.c desktop-properties/app-background.c desktop-properties/app-ui.c desktop-properties/app-bell.c desktop-properties/property-ui.c desktop-properties/property-bell.c gsm/main.c gsm/save-session.c help-browser/gnome-help-browser.c help-browser/window.c " +"help-browser/gnome-helpwin.c help-browser/bookmarks.c help-browser/history.c help-browser/toc2-man.c help-browser/toc2.c help-browser/visit.c gnome-terminal/gnome-terminal.c\n" #: applets/batmon/batmon.c:105 msgid "Can't open /proc/apm; can't get data." @@ -24,20 +20,19 @@ #: applets/batmon/batmon.c:111 msgid "Something wrong with /proc/apm; can't get data." -msgstr "Algo est� mal con /proc/apm;l No puedo obtener datos" +msgstr "Algo est� mal con /proc/apm; No puedo obtener datos" #: applets/batmon/batmon.c:154 -#, fuzzy msgid "Can't open /dev/apm; can't get data." -msgstr "No puedo abrir /proc/apm; No puedo obtener datos" +msgstr "No puedo abrir /dev/apm; No puedo obtener datos" #: applets/batmon/batmon.c:160 applets/battery/read-battery.c:84 msgid "ioctl failed on /dev/apm." -msgstr "" +msgstr "Fall� el ioctl en /dev/apm." #: applets/batmon/batmon.c:210 msgid "There is no battery?!?" -msgstr "풬o hay bateria?" +msgstr "×No hay bater�a?!" #: applets/batmon/batmon.c:213 msgid "High and charging." @@ -57,40 +52,36 @@ #: applets/batmon/batmon.c:225 msgid "Critical and charging." -msgstr "Critica y cargando." +msgstr "Cr�tica y cargando." #: applets/batmon/batmon.c:228 msgid "Critical!!" -msgstr "좧ritica!" +msgstr "좧r�tica!" #: applets/batmon/batmon.c:231 msgid "Charging." msgstr "Cargando." #: applets/batmon/batmon.c:239 -#, fuzzy msgid "unknown minutes of battery." -msgstr "%d minutos de bateria." +msgstr "tiempo restante de bater�a desconocido." #: applets/batmon/batmon.c:240 -#, fuzzy msgid "unknown minutes of battery (%d%%)" -msgstr "%d minutos de bateria." +msgstr "tiempo restante de bater�a desconocido (%d%%)" #: applets/batmon/batmon.c:245 -#, c-format msgid "%d minutes of battery" -msgstr "%d minutos de bateria." +msgstr "%d minutos de bater�a" #: applets/batmon/batmon.c:246 -#, fuzzy msgid "%d minutes of battery (%d%%)" -msgstr "%d minutos de bateria." +msgstr "%d minutos de bater�a (%d%%)" #. would have to be an error #: applets/batmon/batmon.c:250 msgid "More than 100,000,000 minutes of battery life?!?" -msgstr "풫�s de 100,000,000 minutos de vida para la bater�a?" +msgstr "×M�s de 100.000.000 minutos de vida para la bater�a?!" #: applets/batmon/batmon.c:333 msgid "APM Stats" @@ -106,7 +97,7 @@ #: applets/batmon/batmon.c:380 msgid "Battery Status:" -msgstr "Estado de la bateria:" +msgstr "Estado de la bater�a:" #: applets/batmon/batmon.c:404 help-browser/window.c:142 msgid "Close" @@ -114,105 +105,87 @@ #: applets/battery/battery.c:353 msgid "Internal error: invalid mode in battery_set_mode" -msgstr "" +msgstr "Error interno: modo inv�lido en battery_set_mode" -#: applets/battery/battery.c:398 applets/cpuload/cpuload.c:201 -#: applets/fish/fish.c:293 applets/gen_util/clock.c:231 -#: applets/gen_util/mailcheck.c:566 applets/gen_util/printer.c:363 -#: applets/netload/netload.c:320 +#: applets/battery/battery.c:398 applets/cpuload/cpuload.c:201 applets/fish/fish.c:293 applets/gen_util/clock.c:231 applets/gen_util/mailcheck.c:566 applets/gen_util/printer.c:363 applets/netload/netload.c:320 msgid "Can't create applet!\n" -msgstr "" +msgstr "좳o puedo crear el applet!\n" #: applets/battery/battery.c:612 msgid "Could not allocate space for graph values" -msgstr "" +msgstr "No pude atribuir espacio para los valores de los grafos" #: applets/battery/properties.c:34 -#, fuzzy msgid "Battery Monitor Settings" -msgstr "Estado de la bateria:" +msgstr "Configuraci�n del Monitor de Bater�a" #: applets/battery/properties.c:43 -#, fuzzy msgid "General Properties" -msgstr "Propiedades" +msgstr "Propiedades Generales" -#: applets/battery/properties.c:45 applets/cpuload/properties.c:125 -#: applets/diskusage/properties.c:176 applets/netload/properties.c:129 +#: applets/battery/properties.c:45 applets/cpuload/properties.c:125 applets/diskusage/properties.c:174 applets/netload/properties.c:129 msgid "Applet Height" -msgstr "" +msgstr "Alto del applet" #: applets/battery/properties.c:55 msgid "Applet Width" -msgstr "" +msgstr "Ancho del applet" #: applets/battery/properties.c:65 msgid "Applet Mode" -msgstr "" +msgstr "Modo del applet" #: applets/battery/properties.c:66 msgid "Graph" -msgstr "" +msgstr "Grafo" #: applets/battery/properties.c:68 -#, fuzzy msgid "Readout" -msgstr "Releer" +msgstr "" #: applets/battery/properties.c:111 applets/battery/properties.c:176 msgid "AC-On Battery Color:" -msgstr "" +msgstr "Color Bater�a AC-On" #: applets/battery/properties.c:117 applets/battery/properties.c:182 msgid "AC-Off Battery Color:" -msgstr "" +msgstr "Color Bater�a AC-Off" #: applets/battery/properties.c:123 msgid "Graph Interval:" -msgstr "" +msgstr "Intervalo del Grafo:" #: applets/battery/properties.c:137 msgid "Graph Direction:" -msgstr "" +msgstr "Direcci�n del Grafo:" #: applets/battery/properties.c:140 msgid "Left to Right" -msgstr "" +msgstr "Izquierda a Derecha" #: applets/battery/properties.c:142 msgid "Right to Left" -msgstr "" +msgstr "Derecha a Izquierda" #: applets/battery/read-battery.c:21 -msgid "" -"Cannot open /proc/apm! Make sure that you built APM support into your " -"kernel.\n" -msgstr "" +msgid "Cannot open /proc/apm! Make sure that you built APM support into your kernel.\n" +msgstr "좳o puedo abrir /proc/apm! Asegurese que el n�cleo Linux tiene soporte APM.\n" #: applets/battery/read-battery.c:79 -#, fuzzy msgid "Cannot open /dev/apm; can't get data." msgstr "No puedo abrir /proc/apm; No puedo obtener datos" #: applets/battery/read-battery.c:95 msgid "APM is disabled! Cannot read battery charge information." -msgstr "" +msgstr "좥PM desactivado! No puedo leer informaci�n sobre la carga de la bater�a" -#: applets/bussign/bussign.c:98 applets/clockmail/clockmail.c:376 -#: applets/dialer/dialer.c:162 applets/diskusage/diskusage.c:572 -#: applets/drivemount/drivemount.c:345 applets/fifteen/fifteen.c:304 -#: applets/fish/fish.c:310 applets/gen_util/mailcheck.c:595 -#: applets/icewm-pager/wmpager_applet.c:85 -#: applets/modemlights/modemlights.c:533 applets/netload/netload.c:338 -#: applets/webcontrol/webcontrol.c:288 gmenu/gmenu.c:56 -#: gnome-terminal/gnome-terminal.c:676 panel/menu.c:1353 -#, fuzzy +#: applets/bussign/bussign.c:98 applets/clockmail/clockmail.c:376 applets/dialer/dialer.c:162 applets/diskusage/diskusage.c:566 applets/drivemount/drivemount.c:339 applets/fifteen/fifteen.c:304 applets/fish/fish.c:310 applets/gen_util/mailcheck.c:595 applets/icewm-pager/wmpager_applet.c:85 applets/modemlights/modemlights.c:527 applets/netload/netload.c:338 applets/webcontrol/webcontrol.c:288 gmenu/gmenu.c:56 gnome-terminal/gnome-terminal.c:676 panel/menu.c:1299 msgid "About..." msgstr "Acerca" #: applets/bussign/bussign.c:119 msgid "Refresh Image" -msgstr "" +msgstr "Refrescar la im�gen" #: applets/bussign/bussign.c:242 msgid "The Bus Sign Applet" @@ -220,7 +193,7 @@ #: applets/bussign/bussign.c:243 applets/gen_util/mailcheck.c:529 msgid "(c) 1998 the Free Software Foundation" -msgstr "" +msgstr "� 1998 la Free Software Foundation" #: applets/bussign/bussign.c:245 msgid "" @@ -230,241 +203,219 @@ "\n" "http://people.netscape.com/mtoy/sign/index.html" msgstr "" +"Este applet es una perdida de tiempo. 좻uelva a su trabajo!\n" +"\n" +"Para rellenar el \"sign\" por favor vea:\n" +"\n" +"http://people.netscape.com/mtoy/sign/index.html" #: applets/clockmail/clockmail.c:49 -#, c-format msgid "%d.%d.%d" -msgstr "" +msgstr "%d.%d.%d" #: applets/clockmail/clockmail.c:52 msgid "John Ellis (gqview@geocities.com)" -msgstr "" +msgstr "John Ellis (gqview@geocities.com)" #: applets/clockmail/clockmail.c:55 msgid "Clock and Mail Notify Applet" -msgstr "" +msgstr "Applet Reloj y Revisi�n de Correo" #: applets/clockmail/clockmail.c:56 msgid "(C) 1998" -msgstr "" +msgstr "� 1998" #: applets/clockmail/clockmail.c:58 msgid "" "Released under the GNU general public license.\n" -"Basic digital clock with date in a tooltip. Optional 12/24 time display. " -"Mail blinking can be for any unread mail, or only briefly when new mail " -"arrives." +"Basic digital clock with date in a tooltip. Optional 12/24 time display. Mail blinking can be for any unread mail, or only briefly when new mail arrives." msgstr "" +"Distribuido bajo los t�rminos de la licencia GPL de GNU.\n" +"Reloj b�sico con la fecha en un tooltip. afichage opcional en formato de 12 o 24 horas. El parpadeo del buz�n puede ser por todo mensaje no leido, o solamente brevemente cuando llegan nuevos mensajes." #: applets/clockmail/clockmail.c:339 msgid "date" -msgstr "" +msgstr "fecha" -#: applets/clockmail/clockmail.c:369 applets/cpuload/cpuload.c:219 -#: applets/diskusage/diskusage.c:583 applets/drivemount/drivemount.c:339 -#: applets/fish/fish.c:318 applets/gen_util/clock.c:258 -#: applets/gen_util/mailcheck.c:588 applets/gen_util/printer.c:388 -#: applets/icewm-pager/wmpager_applet.c:93 -#: applets/modemlights/modemlights.c:527 applets/netload/netload.c:345 -#: applets/webcontrol/webcontrol.c:296 gnome-terminal/gnome-terminal.c:667 -#: panel/drawer.c:518 panel/launcher.c:277 -#, fuzzy +#: applets/clockmail/clockmail.c:369 applets/cpuload/cpuload.c:219 applets/diskusage/diskusage.c:577 applets/drivemount/drivemount.c:344 applets/fish/fish.c:318 applets/gen_util/clock.c:258 applets/gen_util/mailcheck.c:588 applets/gen_util/printer.c:388 applets/icewm-pager/wmpager_applet.c:93 applets/modemlights/modemlights.c:532 applets/netload/netload.c:345 applets/webcontrol/webcontrol.c:296 gnome-terminal/gnome-terminal.c:667 panel/drawer.c:508 panel/launcher.c:265 msgid "Properties..." msgstr "Propiedades..." -#: applets/clockmail/properties.c:111 +#: applets/clockmail/properties.c:109 msgid "Display time in 12 hour format (AM/PM)" -msgstr "" +msgstr "Afichar en formato de 12 horas (AM/PM)" -#: applets/clockmail/properties.c:117 +#: applets/clockmail/properties.c:115 msgid "Blink when any mail is waiting. (Not just when mail arrives)" -msgstr "" +msgstr "Parpadea siempre que hay correo en espera. (no solamente cuando llega)" -#: applets/clockmail/properties.c:128 +#: applets/clockmail/properties.c:126 msgid "Mail file:" -msgstr "" +msgstr "Archivo de correo:" -#: applets/clockmail/properties.c:145 +#: applets/clockmail/properties.c:143 msgid "When new mail is received run:" -msgstr "" +msgstr "Cuando llega nuevo correo lanzar:" -#: applets/clockmail/properties.c:160 applets/cpuload/properties.c:200 -#: applets/diskusage/properties.c:279 applets/drivemount/properties.c:178 -#: applets/modemlights/properties.c:193 applets/netload/properties.c:252 +#: applets/clockmail/properties.c:158 applets/cpuload/properties.c:200 applets/diskusage/properties.c:277 applets/drivemount/properties.c:175 applets/modemlights/properties.c:191 applets/netload/properties.c:252 msgid "General" -msgstr "" +msgstr "General" -#: applets/cpuload/properties.c:59 applets/diskusage/properties.c:74 -#: applets/netload/properties.c:61 +#: applets/cpuload/properties.c:59 applets/diskusage/properties.c:72 applets/netload/properties.c:61 msgid "Can't allocate memory for color\n" -msgstr "" +msgstr "No puedo asignar emoria para el color\n" #: applets/cpuload/properties.c:115 -#, fuzzy msgid "User Load" -msgstr "Comandos de usuario" +msgstr "Carga usuario" #: applets/cpuload/properties.c:120 -#, fuzzy msgid "System Load" -msgstr "Llamadas al sistema" +msgstr "Carga sistema" -#: applets/cpuload/properties.c:131 applets/diskusage/properties.c:182 -#: applets/netload/properties.c:135 -#, fuzzy +#: applets/cpuload/properties.c:131 applets/diskusage/properties.c:180 applets/netload/properties.c:135 msgid "Width" -msgstr "Espera" +msgstr "Ancho" -#: applets/cpuload/properties.c:146 applets/diskusage/properties.c:199 -#: applets/netload/properties.c:150 +#: applets/cpuload/properties.c:146 applets/diskusage/properties.c:197 applets/netload/properties.c:150 msgid "Update Frequency" -msgstr "" +msgstr "Frecuencia de actualizaci�n" #: applets/cpuload/properties.c:197 -#, fuzzy msgid "CPULoad Settings" -msgstr "Par�metros" +msgstr "Configuraci�n de CPULoad" #: applets/dialer/dialer.c:46 msgid "PPP Dialer Applet" -msgstr "" +msgstr "Applet Discador PPP" #: applets/dialer/dialer.c:49 msgid "A funky PPP dialer, how come no-one has thought of it before!?" -msgstr "" +msgstr "Un discador PPP amigable, ×como nadie penso en el antes?!" #: applets/dialer/dialer.c:87 msgid "Off" -msgstr "" +msgstr "Cortar" -#: applets/diskusage/properties.c:155 +#: applets/diskusage/properties.c:153 msgid "Used Diskspace" -msgstr "" +msgstr "Espacio disco usado" -#: applets/diskusage/properties.c:160 +#: applets/diskusage/properties.c:158 msgid "Free Diskspace" -msgstr "" +msgstr "Espacio disco libre" -#: applets/diskusage/properties.c:165 +#: applets/diskusage/properties.c:163 msgid "Textcolor" -msgstr "" +msgstr "Color del texto" -#: applets/diskusage/properties.c:170 -#, fuzzy +#: applets/diskusage/properties.c:168 msgid "Backgroundcolor" -msgstr " Fondo " +msgstr "Color del fondo" -#: applets/diskusage/properties.c:269 -#, fuzzy +#: applets/diskusage/properties.c:267 msgid "Diskusage Settings" -msgstr "Par�metros" +msgstr "Configuraci�n Diskusage" #: applets/drivemount/drivemount.c:36 msgid "Drive Mount Applet" -msgstr "" +msgstr "Applet Montador de Discos" #: applets/drivemount/drivemount.c:39 msgid "" "Released under the GNU general public license.\n" "Mounts and Unmounts drives.." msgstr "" +"Distribuido bajo los t�rminos de la licencia GPL de GNU.\n" +"Monta y Desmonta discos/disquettes/CD/Zip/..." #: applets/drivemount/drivemount.c:67 -#, fuzzy msgid " mounted" -msgstr "Total" +msgstr " montado" #: applets/drivemount/drivemount.c:72 msgid " not mounted" -msgstr "" +msgstr " no montado" #: applets/drivemount/drivemount.c:352 -#, fuzzy msgid "Eject" -msgstr "Ejecuta" +msgstr "Eyectar" -#: applets/drivemount/properties.c:115 +#: applets/drivemount/properties.c:112 msgid "Drive Mount Settings" -msgstr "" +msgstr "Configuraci�n del Montador de Discos" -#: applets/drivemount/properties.c:123 +#: applets/drivemount/properties.c:120 msgid "Update in seconds:" -msgstr "" +msgstr "Tiempo de actualizaci�n (s):" -#: applets/drivemount/properties.c:134 -#, fuzzy +#: applets/drivemount/properties.c:131 msgid "Icon:" -msgstr "�cono" +msgstr "�cono" -#: applets/drivemount/properties.c:141 +#: applets/drivemount/properties.c:138 msgid "Floppy" -msgstr "" +msgstr "Disquette" -#: applets/drivemount/properties.c:145 +#: applets/drivemount/properties.c:142 msgid "Cdrom" -msgstr "" +msgstr "CD-ROM" -#: applets/drivemount/properties.c:149 +#: applets/drivemount/properties.c:146 msgid "Zip Drive" -msgstr "" +msgstr "Disco Zip" -#: applets/drivemount/properties.c:153 +#: applets/drivemount/properties.c:150 msgid "Hard Disk" -msgstr "" +msgstr "Disco duro" -#: applets/drivemount/properties.c:166 +#: applets/drivemount/properties.c:163 msgid "Mount point:" -msgstr "" +msgstr "Punto de Montaje:" #: applets/fifteen/fifteen.c:35 msgid "You win!" -msgstr "" +msgstr "좬an�!" #: applets/fifteen/fifteen.c:262 msgid "Fifteen sliding pieces" -msgstr "" +msgstr "Juego de 15 celdas" #: applets/fifteen/fifteen.c:263 msgid "1.0" -msgstr "" +msgstr "1.0" #: applets/fifteen/fifteen.c:264 msgid "Copyright (C) The Free Software Foundation" -msgstr "" +msgstr "Copyright � la Free Software Foundation" #: applets/fifteen/fifteen.c:266 -msgid "" -"Sam Lloyd's all-time favorite game, now for your delight in the Gnome Panel. " -"Guaranteed to be a productivity buster." -msgstr "" +msgid "Sam Lloyd's all-time favorite game, now for your delight in the Gnome Panel. Guaranteed to be a productivity buster." +msgstr "El juego favorito de Sam Lloyd, ahora para su disfrute en el Panel de Gnome." #: applets/fifteen/fifteen.c:287 msgid "Can't create fifteen applet!" -msgstr "" +msgstr "좳o puedo crear el applet del Juego de 15 celdas!" #: applets/fifteen/fifteen.c:297 msgid "Scramble pieces" -msgstr "" +msgstr "Mezclar" -#: applets/fish/fish.c:63 applets/fish/fish.c:238 -#: applets/webcontrol/webcontrol.c:52 -#, c-format +#: applets/fish/fish.c:63 applets/fish/fish.c:238 applets/webcontrol/webcontrol.c:52 msgid "%s the Fish" -msgstr "" +msgstr "El pez %s" #: applets/fish/fish.c:64 -#, c-format msgid "%s the GNOME Fish Says:" -msgstr "" +msgstr "%s, el pez de GNOME dijo:" #: applets/fish/fish.c:104 -#, fuzzy msgid "GNOME Fish Properties" -msgstr "Propiedades del rat�n" +msgstr "Propiedades del pez GNOME" #: applets/fish/fish.c:109 msgid "Your GNOME Fish's Name:" -msgstr "" +msgstr "El nombre de su pez GNOME" #: applets/fish/fish.c:122 msgid "Name" @@ -472,80 +423,75 @@ #: applets/fish/fish.c:241 msgid "(with minor help from George)" -msgstr "" +msgstr "(con un poco de ayuda de George)" #: applets/fish/fish.c:244 msgid "The GNOME Fish Applet" -msgstr "" +msgstr "El Applet del Pececillo GNOME" #: applets/fish/fish.c:247 -msgid "" -"This applet has no use what-so-ever. It only takes up disk space and " -"compilation time, and if loaded it also takes up precious panel space and " -"memory. If anyone is found using this applet, he should be promptly sent for " -"a psychiatric evaluation." -msgstr "" +msgid "This applet has no use what-so-ever. It only takes up disk space and compilation time, and if loaded it also takes up precious panel space and memory. If anyone is found using this applet, he should be promptly sent for a psychiatric evaluation." +msgstr "Este applet no sirve para nada. Solo ocupa espacio en el disco y tiempo durante la compilaci�n, y si es lanzado tambi�n ocupa una parte del precioso espacio del panel y de la memoria. Si alguien es descubierto usando este applet tiene que ser llevado de inmediato a que le hagan un ex�men siquiatrico." -#. This format string is used, to display the actual day, -#. when showing a vertical panel. For an explanation of -#. this format string type 'man strftime'. #: applets/gen_util/clock.c:98 msgid "" "%a\n" "%b %d" msgstr "" +"%a\n" +"%d de %b" #. This format string is used, to display the actual day, #. when showing a horizontal panel. #: applets/gen_util/clock.c:103 msgid "%a %b %d" -msgstr "" +msgstr "%a %d de %b" #: applets/gen_util/clock.c:112 msgid "" "%I:%M\n" "%p" msgstr "" +"%I:%M\n" +"%p" #: applets/gen_util/clock.c:115 msgid "%I:%M %p" -msgstr "" +msgstr "%I:%M %p" #. This format string is used, to display the actual time in #. 24 hour format. #: applets/gen_util/clock.c:121 msgid "%H:%M" -msgstr "" +msgstr "%H:%M" #: applets/gen_util/clock.c:311 -#, fuzzy msgid "Clock properties" -msgstr "Propiedades de la revisi�n de correo" +msgstr "Propiedades del reloj" #: applets/gen_util/clock.c:321 msgid "12 hour" -msgstr "" +msgstr "12 horas" #: applets/gen_util/clock.c:330 msgid "24 hour" -msgstr "" +msgstr "24 horas" #: applets/gen_util/clock.c:363 -#, fuzzy msgid "Clock" -msgstr "Click" +msgstr "Reloj" #: applets/gen_util/mailcheck.c:229 msgid "You have new mail." -msgstr "Hay nuevo correo." +msgstr "Le ha llegado correo." #: applets/gen_util/mailcheck.c:231 msgid "You have mail." -msgstr "Hay correo." +msgstr "Tiene correo." #: applets/gen_util/mailcheck.c:233 msgid "No mail." -msgstr "No hay correo." +msgstr "No tiene correo." #: applets/gen_util/mailcheck.c:447 msgid "Notification" @@ -553,163 +499,156 @@ #: applets/gen_util/mailcheck.c:464 msgid "Select animation" -msgstr "Selecciona animaci�n" +msgstr "Seleccionar animaci�n" #: applets/gen_util/mailcheck.c:487 msgid "Mail check properties" msgstr "Propiedades de la revisi�n de correo" #: applets/gen_util/mailcheck.c:492 -#, fuzzy msgid "Mail check" -msgstr "Propiedades de la revisi�n de correo" +msgstr "Revisi�n del correo" #: applets/gen_util/mailcheck.c:528 -#, fuzzy msgid "Mail check Applet" -msgstr "Propiedades de la revisi�n de correo" +msgstr "Applet de revisi�n del correo" #: applets/gen_util/mailcheck.c:531 msgid "Mail check notifies you when new mail is on your mailbox" -msgstr "" +msgstr "La revisi�n del correo le avisa cuando llega un correo electr�nico" #: applets/gen_util/mailcheck.c:576 msgid "Text only" -msgstr "" +msgstr "Solo texto" #: applets/gen_util/main.c:31 msgid "Start in clock mode" -msgstr "" +msgstr "Inicia en modo reloj" #: applets/gen_util/main.c:32 msgid "Start in mailcheck mode" -msgstr "" +msgstr "Inicia en modo buz�n" #: applets/gen_util/main.c:33 msgid "Start in printer mode" -msgstr "" +msgstr "Inicia en modo impresora" #: applets/gen_util/printer.c:326 -#, fuzzy msgid "Printer properties" -msgstr "Propiedades del lanzado de programas" +msgstr "Propiedades de la impresora" #: applets/gen_util/printer.c:334 msgid "Printer name:" -msgstr "" +msgstr "Nombre de la impresora:" #: applets/gen_util/printer.c:338 msgid "Print command:" -msgstr "" +msgstr "Comando de impresi�n:" #: applets/gen_util/printer.c:344 msgid "Printer" -msgstr "" +msgstr "Impresora" -#. FIXME: This should check to make sure icewm (or equiv) is running. -#. Not sure if it is working though... #: applets/icewm-pager/wmpager_applet.c:56 -msgid "" -"This applet requires you to run a window manager with the XA_ extensions.\n" -msgstr "" +msgid "This applet requires you to run a window manager with the XA_ extensions.\n" +msgstr "Este applet requiere que corra un gestor de ventanas con las extensiones XA_ \n" #: applets/icewm-pager/wmpager_applet.c:220 msgid "Desktop Pager Applet" -msgstr "" +msgstr "Desktop Pager Applet" #: applets/icewm-pager/wmpager_applet.c:221 msgid "Copyright (C)1998 M.Watson" -msgstr "" +msgstr "Copyright � 1998 M. Watson" #: applets/icewm-pager/wmpager_applet.c:277 msgid "Failed to retrieve workspace property." -msgstr "" +msgstr "Fall� en recoger las propiedades del espacio de trabajo." #: applets/modemlights/modemlights.c:64 msgid "Modem Lights Applet" -msgstr "" +msgstr "Applet Monitor de Modem" #: applets/modemlights/modemlights.c:67 msgid "" "Released under the GNU general public license.\n" -"A modem status indicator and dialer.Lights in order from the top or left are " -"RX and TX" +"A modem status indicator and dialer.Lights in order from the top or left are RX and TX" msgstr "" +"Distribuido bajo los t�rminos de la licencia GPL de GNU.\n" +"Indicador del estado del modem y discador. Las lucecitas son, por orden a partir de arriba o de la izquierda, RX y TX" #: applets/modemlights/modemlights.c:104 msgid "" "You are currently connected.\n" "Do you want to disconnect?" msgstr "" +"Est� actualmente conectado.\n" +"풡esea desconectarse?" #: applets/modemlights/modemlights.c:115 msgid "Do you want to connect?" -msgstr "" +msgstr "풡esea conectarse?" #: applets/modemlights/modemlights.c:133 msgid "not connected" -msgstr "" +msgstr "desconectado" -#: applets/modemlights/properties.c:107 +#: applets/modemlights/properties.c:105 msgid "Modem Lights Settings" -msgstr "" +msgstr "Configuraci�n Monitor del Modem" -#: applets/modemlights/properties.c:115 +#: applets/modemlights/properties.c:113 msgid "Updates per second" -msgstr "" +msgstr "Tiempo de actualizaci�n (s)" -#: applets/modemlights/properties.c:131 +#: applets/modemlights/properties.c:129 msgid "Modem lock file:" -msgstr "" +msgstr "Archivo de bloqueo del modem:" -#: applets/modemlights/properties.c:148 +#: applets/modemlights/properties.c:146 msgid "Connect command:" -msgstr "" +msgstr "Comando de conexi�n:" -#: applets/modemlights/properties.c:165 +#: applets/modemlights/properties.c:163 msgid "Disconnect command:" -msgstr "" +msgstr "Comando de desconexi�n" #. confirmation checkbox -#: applets/modemlights/properties.c:178 +#: applets/modemlights/properties.c:176 msgid "Confirm connection?" -msgstr "" +msgstr "풠onfirma la desconexi�n?" #: applets/netload/netload.c:260 msgid "Netload Error" -msgstr "" +msgstr "Error en Netload" #: applets/netload/netload.c:265 msgid "An error occured in the Netload Applet:" -msgstr "" +msgstr "Un error ocurri� en el applet Netload:" #: applets/netload/netload.c:294 msgid "The GNOME Network Load Applet" -msgstr "" +msgstr "El applet de carga de la Red de GNOME" #: applets/netload/netload.c:297 -msgid "" -"This applet is released under the terms and conditions of the GNU Public " -"Licence.This applet shows the load on a network device. It requires the " -"/proc/net/ip_acct interface to be present and set up correctly for the " -"device." -msgstr "" +msgid "This applet is released under the terms and conditions of the GNU Public Licence.This applet shows the load on a network device. It requires the /proc/net/ip_acct interface to be present and set up correctly for the device." +msgstr "Este applet es distribuido bajo los t�rminos de la licencia GPL de GNU. Este applet muestra el nivel de utilizaci�n de la red por un dispositivo de red. Requiere que la interface /proc/net/ip_acct est� present y correctamente configurada para el dispositivo." #: applets/netload/properties.c:119 msgid "Network Traffic" -msgstr "" +msgstr "Tr�fico red" #: applets/netload/properties.c:124 msgid "Traffic bars" -msgstr "" +msgstr "Barras de tr�fico" #: applets/netload/properties.c:193 msgid "Device name (like ppp0 or eth0)" -msgstr "" +msgstr "Nombre de la interface (ej. ppp0 o eth0)" #: applets/netload/properties.c:201 msgid "Vertical spacing of bars (in kilobytes)" -msgstr "" +msgstr "Espacio vertical de las barras (en kilobytes)" #: applets/netload/properties.c:243 msgid "properties.c: gnome_property_box_new() failed.\n" @@ -717,61 +656,60 @@ #: applets/netload/properties.c:249 msgid "Network Load Settings" -msgstr "" +msgstr "Configuraci�n del applet de carga de la red" #: applets/netload/properties.c:258 msgid "Device" -msgstr "" +msgstr "Dispositivo" #: applets/webcontrol/webcontrol.c:54 msgid "Garrett Smith " -msgstr "" +msgstr "Garrett Smith " #: applets/webcontrol/webcontrol.c:57 msgid "The Web Browser Controller" -msgstr "" +msgstr "Applet de Control WEB" #: applets/webcontrol/webcontrol.c:60 -msgid "" -"This applet currently sends getURL commands to netscape throught the -remote " -"interface. Hopefully later more webrowsers will be supported." -msgstr "" +msgid "This applet currently sends getURL commands to netscape throught the -remote interface. Hopefully later more webrowsers will be supported." +msgstr "Este applet en realidad envia comandos getURL a netscape a trav�s de la interface -remote. Con suerte en el futuro otros navegadores ser�n soportados." #. create the widget we are going to put on the applet #: applets/webcontrol/webcontrol.c:111 msgid "Url:" -msgstr "" +msgstr "Url:" #: applets/webcontrol/webcontrol.c:127 -#, fuzzy msgid "Launch new window" -msgstr "Nueva ventana" +msgstr "Abrir nueve ventana" #: applets/webcontrol/webcontrol.c:185 -#, fuzzy msgid "WebControl Properties" -msgstr "Propiedades del teclado" +msgstr "Propriedades de WebControl" #: applets/webcontrol/webcontrol.c:190 msgid "Display URL label" -msgstr "" +msgstr "Afichar la etiqueta del URL" #: applets/webcontrol/webcontrol.c:199 msgid "Display \"launch new window\" option" -msgstr "" +msgstr "Afichar la opci�n \"abrir nueva ventana\"" #: applets/webcontrol/webcontrol.c:212 gnome-terminal/gnome-terminal.c:499 msgid "Look" -msgstr "" +msgstr "Mirar" + +#: applets/winlist/winlist.c:39 +msgid "readfd writefd" +msgstr "readfd writefd" #: desktop-properties/app-background.c:15 msgid "Background Properties" msgstr "Propiedades del fondo" #: desktop-properties/app-bell.c:11 -#, fuzzy msgid "Bell Properties" -msgstr "Propiedades" +msgstr "Propriedades Sonido" #: desktop-properties/app-keyboard.c:11 msgid "Keyboard Properties" @@ -782,15 +720,14 @@ msgstr "Propiedades del rat�n" #: desktop-properties/app-ui.c:32 -#, fuzzy msgid "Gnome Look and Feel Properties" -msgstr "Propiedades del teclado" +msgstr "Propiedades de la apariencia de Gnome" #: desktop-properties/args.c:11 desktop-properties/property-background.c:1057 msgid "Set parameters from saved state and exit" msgstr "Usa los par�metros que se ten�an guardados y terminar" -#: desktop-properties/property-background.c:494 panel/panel_config.c:613 +#: desktop-properties/property-background.c:494 panel/panel_config.c:616 msgid "Color" msgstr "Color" @@ -802,12 +739,12 @@ msgid "Gradient" msgstr "Degradado de color" -#: desktop-properties/property-background.c:539 panel/panel_config.c:492 +#: desktop-properties/property-background.c:539 panel/panel_config.c:495 msgid "Vertical" -msgstr "Verical" +msgstr "Vertical" #. Horizontal -#: desktop-properties/property-background.c:545 panel/panel_config.c:479 +#: desktop-properties/property-background.c:545 panel/panel_config.c:482 msgid "Horizontal" msgstr "Horizontal" @@ -829,11 +766,11 @@ #: desktop-properties/property-background.c:781 msgid "Scaled" -msgstr "" +msgstr "Redimensionado" #: desktop-properties/property-background.c:790 msgid "Scaled (keep aspect)" -msgstr "" +msgstr "Redimensionado (conserva aspecto)" #: desktop-properties/property-background.c:801 msgid "Centered" @@ -849,85 +786,80 @@ #: desktop-properties/property-background.c:1058 msgid "IMAGE" -msgstr "" +msgstr "IM핯EN" #: desktop-properties/property-background.c:1058 msgid "Sets the wallpaper to the value specified" -msgstr "" +msgstr "Ajusta el fondo al valor indicado" -#: desktop-properties/property-background.c:1059 -#: desktop-properties/property-background.c:1060 -#: gnome-terminal/gnome-terminal.c:1147 gnome-terminal/gnome-terminal.c:1148 +#: desktop-properties/property-background.c:1059 desktop-properties/property-background.c:1060 gnome-terminal/gnome-terminal.c:1147 gnome-terminal/gnome-terminal.c:1148 msgid "COLOR" -msgstr "" +msgstr "COLOR" #: desktop-properties/property-background.c:1059 msgid "Specifies the background color" -msgstr "" +msgstr "Indica el color de fondo" #: desktop-properties/property-background.c:1060 msgid "Specifies end background color for gradient" -msgstr "" +msgstr "Indica el color de fondo final para el gradiente" #: desktop-properties/property-background.c:1061 msgid "ORIENT" -msgstr "" +msgstr "ORIENT" #: desktop-properties/property-background.c:1061 msgid "Gradient orientation: vertical or horizontal" -msgstr "" +msgstr "Orientaci�n del gradiente: vertical u horizontal" #: desktop-properties/property-background.c:1062 msgid "Use a solid fill for the background" -msgstr "" +msgstr "Usar un color unido para el fondo" #: desktop-properties/property-background.c:1063 msgid "Use a gradient fill for the background" -msgstr "" +msgstr "Usa un gradiente de colores para el fondo" #: desktop-properties/property-background.c:1064 msgid "MODE" -msgstr "" +msgstr "MODO" #: desktop-properties/property-background.c:1064 msgid "Display wallpaper: tiled, centered, scaled or ratio" -msgstr "" +msgstr "Im�gen de fondo: mosaico, centrada, redimensionada o racio" #: desktop-properties/property-bell.c:123 msgid "Sound" -msgstr "" +msgstr "Sonido" #: desktop-properties/property-bell.c:142 msgid "Volume" -msgstr "" +msgstr "Volumen" #: desktop-properties/property-bell.c:163 msgid "Pitch" -msgstr "" +msgstr "Tono" #: desktop-properties/property-bell.c:184 -#, fuzzy msgid "Duration" -msgstr "Documentaci�n" +msgstr "Duraci�n" -#: desktop-properties/property-bell.c:214 +#: desktop-properties/property-bell.c:214 desktop-properties/property-screensaver.cc:250 msgid "Test" msgstr "Prueba" #: desktop-properties/property-bell.c:228 msgid "Bell" -msgstr "" +msgstr "Campana" #. Auto repeat #: desktop-properties/property-keyboard.c:160 -#, fuzzy msgid "Auto-repeat" -msgstr "Auto repetir" +msgstr "Auto-repetici�n" #: desktop-properties/property-keyboard.c:179 -#, fuzzy msgid "Enable auto-repeat" -msgstr "Auto repetir" +msgstr "Activar auto-repetici�n" #: desktop-properties/property-keyboard.c:186 msgid "Repeat rate" @@ -939,9 +871,8 @@ #. Keyboard click #: desktop-properties/property-keyboard.c:235 -#, fuzzy msgid "Keyboard click" -msgstr " Teclado " +msgstr "Click del teclado" #: desktop-properties/property-keyboard.c:254 msgid "Click on keypress" @@ -952,14 +883,13 @@ msgstr "Vol�men del click" #: desktop-properties/property-keyboard.c:291 -#, fuzzy msgid "Keyboard" -msgstr " Teclado " +msgstr "Teclado" #. Mouse buttons #: desktop-properties/property-mouse.c:215 msgid "Mouse buttons" -msgstr "" +msgstr "Botones del rat�n" #: desktop-properties/property-mouse.c:224 msgid "Left handed" @@ -969,11 +899,9 @@ msgid "Right handed" msgstr "Derecho" -#. Mouse motion #: desktop-properties/property-mouse.c:243 -#, fuzzy msgid "Mouse motion" -msgstr "Movimiento" +msgstr "Movimiento del raton" #: desktop-properties/property-mouse.c:255 msgid "Acceleration" @@ -987,9 +915,10 @@ msgid "Slow" msgstr "Lento" +# una mejor traducci�n ? #: desktop-properties/property-mouse.c:267 msgid "Threshold" -msgstr "" +msgstr "Punto de activaci�n" #: desktop-properties/property-mouse.c:267 msgid "Large" @@ -1003,54 +932,97 @@ msgid "Mouse" msgstr "Rat�n" +#: desktop-properties/property-screensaver.cc:146 +msgid "Settings" +msgstr "Par�metros" + +#: desktop-properties/property-screensaver.cc:148 +msgid "Wait" +msgstr "Espera" + +#: desktop-properties/property-screensaver.cc:149 +msgid "Min" +msgstr "Min" + +#: desktop-properties/property-screensaver.cc:161 +msgid "Requires Password" +msgstr "Requiere clave de accesso" + +#: desktop-properties/property-screensaver.cc:170 +msgid "Use DPMS" +msgstr "Usar DPMS" + +#: desktop-properties/property-screensaver.cc:179 +msgid "Priority" +msgstr "Prioridad" + +#: desktop-properties/property-screensaver.cc:187 +msgid "Normal" +msgstr "Normal" + +#: desktop-properties/property-screensaver.cc:188 +msgid "Low" +msgstr "Baja" + +#: desktop-properties/property-screensaver.cc:234 +msgid "Screensavers" +msgstr "Protectores de pantalla" + +#: desktop-properties/property-screensaver.cc:246 +msgid "Setup..." +msgstr "Configuraci�n..." + +#: desktop-properties/property-screensaver.cc:356 +msgid " Screensaver " +msgstr " Protector de pantalla " + #: desktop-properties/property-ui.c:55 msgid "Default Gtk setting [FIXME - Describe this better]" -msgstr "" +msgstr "Valors de Gtk por omisi�n [FIXME - Describirlo mejor]" #: desktop-properties/property-ui.c:56 msgid "Spread buttons out" -msgstr "" +msgstr "Espaciar los botones" #: desktop-properties/property-ui.c:57 msgid "Put buttons on edges" -msgstr "" +msgstr "Poner los botones sobre los lados" #: desktop-properties/property-ui.c:58 msgid "Left-justify buttons" -msgstr "" +msgstr "Justificar los botones a la izquierda" #: desktop-properties/property-ui.c:59 msgid "Right-justify buttons" -msgstr "" +msgstr "Justificar los botones a la derecha" #: desktop-properties/property-ui.c:65 msgid "Let window manager decide" -msgstr "" +msgstr "Dejar que el gestor de ventanas decida" #: desktop-properties/property-ui.c:66 msgid "Center of the screen" -msgstr "" +msgstr "Al centro de la pantalla" #: desktop-properties/property-ui.c:67 msgid "At the mouse pointer" -msgstr "" +msgstr "A la posici�n del rat�n" #: desktop-properties/property-ui.c:73 msgid "Dialogs are like other windows" -msgstr "" +msgstr "Las ventanas de di�logo son como las dem�s ventanas" #: desktop-properties/property-ui.c:74 msgid "Dialogs are treated specially by window manager" -msgstr "" +msgstr "Las ventanas de di�logo son tratadas de manera especial por el gestor de ventanas" #: desktop-properties/property-ui.c:155 msgid "Dialog buttons" -msgstr "" +msgstr "Botones de di�logo" #: desktop-properties/property-ui.c:160 -#, fuzzy msgid "Dialog position" -msgstr "Posici�n" +msgstr "Posici�n de las ventanas de di�logo" #: desktop-properties/property-ui.c:165 msgid "Dialog hints" @@ -1058,501 +1030,506 @@ #: desktop-properties/property-ui.c:172 msgid "Use statusbar instead of dialog when possible" -msgstr "" +msgstr "Usar barra de estado en vez del di�logo siempre que sea posible" #: desktop-properties/property-ui.c:182 msgid "Place dialogs over application window when possible" -msgstr "" +msgstr "Poner las ventanas de di�logo encima de las aplicaciones siempre que posible" #: desktop-properties/property-ui.c:193 msgid "Dialogs" -msgstr "" +msgstr "Di�logos" #: desktop-properties/property-ui.c:199 msgid "Menubars are detachable" -msgstr "" +msgstr "Barras de men� desprendibles" #: desktop-properties/property-ui.c:208 msgid "Toolbars are detachable" -msgstr "" +msgstr "Barras de �conos desprendibles" #: desktop-properties/property-ui.c:217 msgid "Toolbar buttons have relieved border" -msgstr "" +msgstr "Botones de la barra de �conos con bordes en relieve" #: desktop-properties/property-ui.c:226 msgid "Statusbar is interactive when possible" -msgstr "" +msgstr "Barra de estado interactiva siempre que sea posible" #: desktop-properties/property-ui.c:235 -#, fuzzy msgid "Application" -msgstr "Notificaci�n" +msgstr "Aplicaci�n" + +#: desktop-properties/xlockmore.cc:156 +msgid "XLockMore Properties" +msgstr "Propiedades de XLockMore" + +#: desktop-properties/xlockmore.cc:174 +msgid " OK " +msgstr " OK " + +#: desktop-properties/xlockmore.cc:175 +msgid " Apply " +msgstr " Aplicar " + +#: desktop-properties/xlockmore.cc:176 +msgid " Cancel " +msgstr " Cancelar " + +#: desktop-properties/xlockmore.cc:177 +msgid " Defaults " +msgstr " Valores normales " + +#: desktop-properties/xlockmore.cc:178 gmenu/gmenu.c:64 gnome-terminal/gnome-terminal.c:685 help-browser/window.c:176 help-browser/window.c:201 +msgid "Help" +msgstr "Ayuda" + +#: desktop-properties/xlockmore.cc:183 desktop-properties/xlockmore.cc:195 +msgid " Mode " +msgstr " Modo " + +#: desktop-properties/xlockmore.cc:184 +msgid " XLockMore " +msgstr " XLockMode " + +#: desktop-properties/xlockmore.cc:193 +msgid " Options " +msgstr " Opciones " + +#: desktop-properties/xlockmore.cc:194 +msgid " Preview " +msgstr " Visionar " #: gemvt/getopt.c:669 -#, c-format msgid "%s: option `%s' is ambiguous\n" -msgstr "" +msgstr "%s: la opci�n `%s' es ambigua\n" +#. --option #: gemvt/getopt.c:693 -#, c-format msgid "%s: option `--%s' doesn't allow an argument\n" -msgstr "" +msgstr "%s: la opci�n `--%s' no admite argumento\n" #: gemvt/getopt.c:698 -#, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" -msgstr "" +msgstr "%s: la opci�n `%c%s' no admite argumento\n" #: gemvt/getopt.c:715 gemvt/getopt.c:888 -#, c-format msgid "%s: option `%s' requires an argument\n" -msgstr "" +msgstr "%s: la opci�n `%s' requiere un argumento\n" #. --option #: gemvt/getopt.c:744 -#, c-format msgid "%s: unrecognized option `--%s'\n" -msgstr "" +msgstr "%s: opci�n `--%s' desconocida\n" -#. +option or -option #: gemvt/getopt.c:748 -#, c-format msgid "%s: unrecognized option `%c%s'\n" -msgstr "" +msgstr "%s: opci�n `%c%s' desconocida\n" #. 1003.2 specifies the format of this message. #: gemvt/getopt.c:774 -#, c-format msgid "%s: illegal option -- %c\n" -msgstr "" +msgstr "%s: opci�n ilegal -- %c\n" #: gemvt/getopt.c:777 -#, c-format msgid "%s: invalid option -- %c\n" -msgstr "" +msgstr "%s: opci�n inv�lida -- %c\n" #. 1003.2 specifies the format of this message. #: gemvt/getopt.c:807 gemvt/getopt.c:937 -#, c-format msgid "%s: option requires an argument -- %c\n" -msgstr "" +msgstr "%s: la opci�n require un argumento -- %c\n" #: gemvt/getopt.c:854 -#, c-format msgid "%s: option `-W %s' is ambiguous\n" -msgstr "" +msgstr "%s: la opci�n `-W %s' es ambigua\n" #: gemvt/getopt.c:872 -#, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" -msgstr "" +msgstr "%s: la opci�n `-W %s' no admite un argumento\n" #: gmenu/dialogs.c:39 msgid "File exists." -msgstr "" +msgstr "El archivo existe." #: gmenu/dialogs.c:47 msgid "Failed to create file." -msgstr "" +msgstr "Fall� en crear el archivo." #: gmenu/dialogs.c:119 gmenu/dialogs.c:381 msgid "" "You can't add an entry to that folder!\n" "To edit system entries you must be root." msgstr "" +"좻d. no puede a�adir uan entrada en esa carpeta!\n" +"Para editar las entradas sistema se necesita ser root." -#: gmenu/dialogs.c:125 gmenu/gmenu.c:327 +#: gmenu/dialogs.c:125 gmenu/gmenu.c:329 msgid "New Folder" -msgstr "" +msgstr "Nueva Carpeta" #: gmenu/dialogs.c:127 msgid "Create Folder:" -msgstr "" +msgstr "Crear Carpeta:" #: gmenu/dialogs.c:165 msgid "Failed to delete the folder." -msgstr "" +msgstr "Fall� en borrar la carpeta." #: gmenu/dialogs.c:173 msgid "Failed to delete the file." -msgstr "" +msgstr "Fall� en borrar el archivo." #: gmenu/dialogs.c:208 msgid "You must select something first!" -msgstr "" +msgstr "좩ebe seleccionar algo primero!" #: gmenu/dialogs.c:214 msgid "You can not delete a top level Folder!" -msgstr "" +msgstr "좳o puede borrar una carpeta ra�z!" #: gmenu/dialogs.c:222 msgid "" "You can't delete that file!\n" "To edit system entries you must be root." msgstr "" +"좻d. no puede borrar este archivo!\n" +"Para editar leas entradas sistema se necesita ser root." #: gmenu/dialogs.c:228 msgid "Delete file?" -msgstr "" +msgstr "풟orrar archivo?" #: gmenu/dialogs.c:237 msgid "Delete empty folder?" -msgstr "" +msgstr "풟orrar carpeta vac�a?" #: gmenu/dialogs.c:241 msgid "" "Cannot delete folder.\n" "To delete a folder. it must be empty." msgstr "" +"No puede borrar la carpeta.\n" +"Para borrar una carpeta tiene que estar vac�a." #: gmenu/dialogs.c:244 msgid "File or Folder does not exist on filesystem." -msgstr "" +msgstr "El archivo o el directorio no existe en el sistema de archivos." #: gmenu/dialogs.c:370 msgid "The Name text field can not be blank." -msgstr "" +msgstr "El campo de texto Nombre no puede estar vacio." #: gmenu/dialogs.c:379 msgid "" "You can't edit an entry in that folder!\n" "To edit system entries you must be root." msgstr "" +"좻d. no puede editar una entrada en esta carpeta!\n" +"Para editar las entradas sistema se necesita ser root." #: gmenu/dialogs.c:388 msgid "Save Changes?" -msgstr "" +msgstr "풤uardar cambios?" #: gmenu/dialogs.c:396 msgid "Overwrite existing file?" -msgstr "" +msgstr "풱obreescribir archivo existente?" #: gmenu/dialogs.c:402 -#, fuzzy msgid "Save file?" -msgstr "Archivo de cache" +msgstr "풤uardar archivo?" #: gmenu/edit.c:173 msgid "File name:" -msgstr "" +msgstr "Nombre de archivo:" #: gmenu/edit.c:199 msgid "Save" -msgstr "" +msgstr "Guardar" #: gmenu/edit.c:216 -#, fuzzy msgid "Revert" -msgstr "Quitar" +msgstr "Revertir" #: gmenu/edit.c:233 msgid "New" -msgstr "" +msgstr "Nuevo" #: gmenu/gmenu.c:42 msgid "New Folder..." -msgstr "" +msgstr "Nueva Carpeta..." #: gmenu/gmenu.c:45 msgid "Delete..." -msgstr "" +msgstr "Borrar..." #: gmenu/gmenu.c:48 msgid "Quit" -msgstr "" +msgstr "Salir" #: gmenu/gmenu.c:62 help-browser/window.c:174 msgid "File" msgstr "Archivo" -#: gmenu/gmenu.c:64 gnome-terminal/gnome-terminal.c:685 -#: help-browser/window.c:176 help-browser/window.c:201 -msgid "Help" -msgstr "Ayuda" - #: gmenu/gmenu.c:192 -#, c-format msgid "creating user directory: %s\n" -msgstr "" +msgstr "creando directorio usuario: %s\n" #: gmenu/gmenu.c:195 -#, c-format msgid "unable to create user directory: %s\n" -msgstr "" +msgstr "incapaz de crear directorio usuario: %s\n" -#: gmenu/gmenu.c:240 gmenu/gmenu.c:388 +#: gmenu/gmenu.c:240 gmenu/gmenu.c:387 msgid "GNOME menu editor" -msgstr "" +msgstr "Editor de Men� GNOME" #: gmenu/gmenu.c:243 msgid "" "Released under the terms of the GNU Public License.\n" "GNOME menu editor." msgstr "" +"Distribuido bajo los t�rminos de la licencia GPL de GNU.\n" +"Editor de Men� GNOME. Le permite editar los menues del Panel." -#: gmenu/gmenu.c:338 gsm/session-properties.c:196 +#: gmenu/gmenu.c:346 gsm/session-properties.c:196 msgid "Delete" -msgstr "" - -#: gmenu/gmenu.c:367 -#, fuzzy -msgid "Edit Properties" -msgstr "Propiedades" +msgstr "Borrar" #: gmenu/order.c:70 -#, c-format msgid "Unable to create file: %s\n" -msgstr "" +msgstr "Incapaz de crear el archivo: %s\n" +#. g_print(_("removing .order file: %s\n"),row_file); #: gmenu/order.c:90 -#, c-format msgid "unable to remove .order file: %s\n" -msgstr "" +msgstr "incapaz de borrar el archivo .order: %s\n" #: gmenu/order.c:151 gmenu/order.c:165 -#, fuzzy msgid " Folder" -msgstr " MOdo " +msgstr " Carpeta" -#: gmenu/tree.c:363 -#, fuzzy +#: gmenu/tree.c:356 msgid "GNOME" -msgstr "Ayuda GNOME" +msgstr "GNOME" -#. system's menu tree -#: gmenu/tree.c:371 panel/menu.c:1148 panel/menu.c:1186 panel/menu.c:1386 -#, fuzzy +#: gmenu/tree.c:364 panel/menu.c:1094 panel/menu.c:1132 panel/menu.c:1332 msgid "System Menus" -msgstr "Llamadas al sistema" +msgstr "Menues Sistema" -#: gmenu/tree.c:381 +#: gmenu/tree.c:374 msgid "Top of system menus" -msgstr "" +msgstr "Ra�z de los menues sistema" -#: gmenu/tree.c:392 +#: gmenu/tree.c:385 msgid "Running with root privileges.\n" -msgstr "" +msgstr "Corriendo con privilegios de root.\n" #. user's menu tree -#: gmenu/tree.c:401 panel/menu.c:1169 panel/menu.c:1196 panel/menu.c:1397 -#, fuzzy +#: gmenu/tree.c:394 panel/menu.c:1115 panel/menu.c:1142 panel/menu.c:1343 msgid "User Menus" -msgstr "Menus" +msgstr "Menues Usuario" -#: gmenu/tree.c:411 +#: gmenu/tree.c:404 msgid "Top of user menus" -msgstr "" +msgstr "Ra�z de los menues usuario" #: gnome-terminal/gnome-terminal.c:105 -#, fuzzy msgid "GNOME Terminal" -msgstr "Ayuda GNOME" +msgstr "Terminal GNOME" #: gnome-terminal/gnome-terminal.c:108 msgid "The GNOME terminal emulation program." -msgstr "" +msgstr "El programa de emulaci�n de terminal de GNOME" #: gnome-terminal/gnome-terminal.c:440 msgid "Linux console" -msgstr "" +msgstr "Consola Linux" #: gnome-terminal/gnome-terminal.c:441 -#, fuzzy msgid "Color Xterm" -msgstr "Color" +msgstr "Xterm a color" #: gnome-terminal/gnome-terminal.c:442 msgid "rxvt" -msgstr "" +msgstr "rxvt" #: gnome-terminal/gnome-terminal.c:447 msgid "White on black" -msgstr "" +msgstr "Blanco sobre negro" #: gnome-terminal/gnome-terminal.c:448 msgid "Black on white" -msgstr "" +msgstr "Negro sobre blanco" #: gnome-terminal/gnome-terminal.c:449 msgid "Green on black" -msgstr "" +msgstr "Verde sobre negro" #: gnome-terminal/gnome-terminal.c:450 msgid "Black on light yellow" -msgstr "" +msgstr "Negro sobre amarillo brillante" #: gnome-terminal/gnome-terminal.c:451 msgid "Custom colors" -msgstr "" +msgstr "Colores personalizados" -#: gnome-terminal/gnome-terminal.c:456 panel/panel_config.c:276 +#: gnome-terminal/gnome-terminal.c:456 panel/panel_config.c:279 msgid "Left" msgstr "Izquierda" -#: gnome-terminal/gnome-terminal.c:457 panel/panel_config.c:287 +#: gnome-terminal/gnome-terminal.c:457 panel/panel_config.c:290 msgid "Right" msgstr "Derecha" #: gnome-terminal/gnome-terminal.c:458 msgid "Hidden" -msgstr "" +msgstr "Esconder" #. Font #: gnome-terminal/gnome-terminal.c:502 msgid "Font:" -msgstr "" +msgstr "Fuente:" #. Scrollbar position #: gnome-terminal/gnome-terminal.c:520 msgid "Scrollbar position" -msgstr "" +msgstr "Posici�n de la barra de desfile" -#. Blinking status #: gnome-terminal/gnome-terminal.c:530 msgid "Blinking cursor" -msgstr "" +msgstr "Cursor intermitente" -#. Scroll back #: gnome-terminal/gnome-terminal.c:539 msgid "Scrollback lines" -msgstr "" +msgstr "Lineas de desfile hacia atr�s" #: gnome-terminal/gnome-terminal.c:549 -#, fuzzy msgid "Colors" -msgstr "Color" +msgstr "Colores" #. Color palette #: gnome-terminal/gnome-terminal.c:552 msgid "Color palette:" -msgstr "" +msgstr "Paleta de colores:" #. Foreground, background buttons #: gnome-terminal/gnome-terminal.c:561 msgid "Foreground color:" -msgstr "" +msgstr "Color de primer plano:" #: gnome-terminal/gnome-terminal.c:570 -#, fuzzy msgid "Background color:" -msgstr " Fondo " +msgstr "Color del fondo:" #. default foreground/backgorund selector #: gnome-terminal/gnome-terminal.c:580 -#, fuzzy msgid "Colors:" -msgstr "Color" +msgstr "Colores:" #: gnome-terminal/gnome-terminal.c:615 msgid "Color selector" -msgstr "" +msgstr "Selector de colores" #: gnome-terminal/gnome-terminal.c:662 -#, fuzzy msgid "New terminal" -msgstr "Ejecutar dentro de una terminal" +msgstr "Nuevo terminal" #: gnome-terminal/gnome-terminal.c:663 msgid "Save preferences" -msgstr "" +msgstr "Guardar preferencias" #: gnome-terminal/gnome-terminal.c:664 -#, fuzzy msgid "Close terminal" -msgstr "Ejecutar dentro de una terminal" +msgstr "Cerrar terminal" #: gnome-terminal/gnome-terminal.c:666 msgid "Hide menubar..." -msgstr "" +msgstr "Esconder barra de men�..." #: gnome-terminal/gnome-terminal.c:669 msgid "Color selector..." -msgstr "" +msgstr "Selector de colores..." #: gnome-terminal/gnome-terminal.c:671 msgid "Close all terminals" -msgstr "" +msgstr "Cerrar todos los terminales" #: gnome-terminal/gnome-terminal.c:684 -#, fuzzy msgid "Terminal" -msgstr "Verical" +msgstr "Terminal" #: gnome-terminal/gnome-terminal.c:1142 msgid "FONT" -msgstr "" +msgstr "FUENTE" #: gnome-terminal/gnome-terminal.c:1142 msgid "Specifies font name" -msgstr "" +msgstr "Indicar nombre de la fuente" #: gnome-terminal/gnome-terminal.c:1143 msgid "Do not start up shells as login shells" -msgstr "" +msgstr "No abrir los shells como shells de inicio" #: gnome-terminal/gnome-terminal.c:1144 msgid "Start up shells as login shells" -msgstr "" +msgstr "Abrir los shells como shells de inicio" #: gnome-terminal/gnome-terminal.c:1145 msgid "GEOMETRY" -msgstr "" +msgstr "GEOMETR�A" #: gnome-terminal/gnome-terminal.c:1145 msgid "Specifies the geometry for the main window" -msgstr "" +msgstr "Indicar la geometr�a de la ventana principal" #: gnome-terminal/gnome-terminal.c:1146 msgid "COMMAND" -msgstr "" +msgstr "COMANDO" #: gnome-terminal/gnome-terminal.c:1146 msgid "Execute this program instead of a shell" -msgstr "" +msgstr "Ejecutar este programa en vez del shell" #: gnome-terminal/gnome-terminal.c:1147 msgid "Foreground color" -msgstr "" +msgstr "Color de primer plano" -#: gnome-terminal/gnome-terminal.c:1148 panel/panel_config.c:663 -#, fuzzy +#: gnome-terminal/gnome-terminal.c:1148 panel/panel_config.c:666 msgid "Background color" -msgstr " Fondo " +msgstr "Color de fondo" #: gnome-terminal/gnome-terminal.c:1149 panel/main.c:46 msgid "ID" -msgstr "" +msgstr "ID" #: gsm/main.c:42 msgid "[SESSION]" -msgstr "" +msgstr "[SESI�N]" #: gsm/save-session.c:35 msgid "Kill session" -msgstr "Elimina sesi�n" +msgstr "Eliminar sesi�n" #: gsm/save-session.c:81 msgid "save-session: couldn't connect to session manager\n" -msgstr "" +msgstr "save-session: no pude conectar al gestor de sesi�n\n" #: gsm/session-properties.c:189 msgid "Startup" -msgstr "" +msgstr "Inicio" #: gsm/session-properties.c:192 msgid "Programs to invoke at session startup:" -msgstr "" +msgstr "Programas a lanzar al inicio de la sesi�n:" #: gsm/session-properties.c:239 -#, fuzzy msgid "Gnome Session Properties" -msgstr "Propiedades del rat�n" +msgstr "Propiedades Sesi�n Gnome" #: gsm/session-properties.c:289 -#, fuzzy msgid "Geometry of window" -msgstr "Tama�o de la ventana" +msgstr "Geometr�a de la ventana" #: help-browser/bookmarks.c:219 msgid "Bookmark" @@ -1605,7 +1582,7 @@ #: help-browser/gnome-help-browser.c:89 msgid "Debug level" -msgstr "Nivel de depuraci�n" +msgstr "Nivel del rastreo de depuraci�n" #: help-browser/gnome-help-browser.c:97 msgid "[URL]" @@ -1613,15 +1590,11 @@ #: help-browser/gnome-help-browser.c:340 msgid "Gnome Help Browser" -msgstr "" +msgstr "Visualisador de ayuda de Gnome" #: help-browser/gnome-help-browser.c:343 -msgid "" -"GNOME Help Browser allows easy access to various forms of documentation on " -"your system" -msgstr "" -"El GNOME Help Browser permite acceder facilmente a todos los recursos de " -"documentaci�n de su sistema" +msgid "GNOME Help Browser allows easy access to various forms of documentation on your system" +msgstr "El GNOME Help Browser permite acceder facilmente a todos los recursos de documentaci�n de su sistema" #: help-browser/gnome-help-browser.c:602 msgid "History size" @@ -1633,11 +1606,11 @@ #: help-browser/gnome-help-browser.c:604 msgid "Cache size" -msgstr "Tama�o del cache" +msgstr "Tama�o del cach�" #: help-browser/gnome-help-browser.c:605 msgid "Cache file" -msgstr "Archivo de cache" +msgstr "Archivo de cach�" #: help-browser/gnome-help-browser.c:606 msgid "Bookmark file" @@ -1660,14 +1633,12 @@ msgstr "Configurar la Ayuda de GNOME" #: help-browser/gnome-help-browser.c:692 -#, fuzzy msgid "History and cache" -msgstr "Tama�o de la historia" +msgstr "Historia y cach�" #: help-browser/gnome-help-browser.c:693 -#, fuzzy msgid "Paths" -msgstr "Rutas para las p�ginas de manuales" +msgstr "Rutas" #: help-browser/gnome-helpwin.c:214 msgid "

              Error: file not found

              " @@ -1679,7 +1650,7 @@ #: help-browser/history.c:256 msgid "Last" -msgstr "�ltimo" +msgstr "�ltimo" #: help-browser/history.c:256 msgid "Count" @@ -1689,85 +1660,80 @@ msgid "Gnome Help History" msgstr "Historia de la ayuda de GNOME" -#: help-browser/toc-man.c:18 help-browser/toc2-man.c:21 +#: help-browser/toc-man.c:18 help-browser/toc2-man.c:23 msgid "User Commands" msgstr "Comandos de usuario" -#: help-browser/toc-man.c:19 help-browser/toc2-man.c:22 +#: help-browser/toc-man.c:19 help-browser/toc2-man.c:24 msgid "System Calls" msgstr "Llamadas al sistema" -#: help-browser/toc-man.c:20 help-browser/toc2-man.c:23 +#: help-browser/toc-man.c:20 help-browser/toc2-man.c:25 msgid "Library Functions" msgstr "Funciones de la biblioteca" -#: help-browser/toc-man.c:21 help-browser/toc2-man.c:24 +#: help-browser/toc-man.c:21 help-browser/toc2-man.c:26 msgid "Special Files" msgstr "Archivos especiales" -#: help-browser/toc-man.c:22 help-browser/toc2-man.c:25 +#: help-browser/toc-man.c:22 help-browser/toc2-man.c:27 msgid "File Formats" msgstr "Formatos de archivos" -#: help-browser/toc-man.c:23 help-browser/toc2-man.c:26 +#: help-browser/toc-man.c:23 help-browser/toc2-man.c:28 msgid "Games" msgstr "Juegos" -#: help-browser/toc-man.c:24 help-browser/toc2-man.c:27 -#: panel/panel_config_global.c:352 +#: help-browser/toc-man.c:24 help-browser/toc2-man.c:29 panel/panel_config_global.c:349 msgid "Miscellaneous" msgstr "Varios" -#: help-browser/toc-man.c:25 help-browser/toc2-man.c:28 +#: help-browser/toc-man.c:25 help-browser/toc2-man.c:30 msgid "Administration" msgstr "Administraci�n" -#: help-browser/toc-man.c:26 help-browser/toc2-man.c:29 +#: help-browser/toc-man.c:26 help-browser/toc2-man.c:31 msgid "man9" -msgstr "man9" +msgstr "Rutinas del n�cleo Linux" -#: help-browser/toc-man.c:27 help-browser/toc2-man.c:30 +#: help-browser/toc-man.c:27 help-browser/toc2-man.c:32 msgid "mann" -msgstr "" +msgstr "mann" -#: help-browser/toc-man.c:28 help-browser/toc2-man.c:31 +#: help-browser/toc-man.c:28 help-browser/toc2-man.c:33 msgid "manx" -msgstr "" +msgstr "manx" -#. Add one new item for each type -#. This really should iterate through the toc_config list #. MAN PAGES #: help-browser/toc.c:134 msgid "Man Pages" -msgstr "P�ginas de manual" +msgstr "P�ginas de Man" #. INFO PAGES #: help-browser/toc.c:146 msgid "Info Pages" -msgstr "Documentaci�n Info" +msgstr "P�ginas GNU Info" #. GNOME HELP #: help-browser/toc.c:158 msgid "GNOME Help" -msgstr "Ayuda GNOME" +msgstr "Ayuda de GNOME" #: help-browser/toc2.c:114 help-browser/toc2.c:255 help-browser/toc2.c:317 msgid "

              Table of Contents

              \n" -msgstr "" +msgstr "

              �ndice

              \n" -#. Man Pages #: help-browser/toc2.c:118 -#, fuzzy msgid "

              Man Pages

              \n" -msgstr "P�ginas de manual" +msgstr "

              P�ginas de Manual

              \n" #: help-browser/toc2.c:256 msgid "

              Info Pages

              \n" -msgstr "" +msgstr "

              P�ginas Info

              \n" #: help-browser/toc2.c:318 msgid "

              GNOME Help

              \n" -msgstr "" +msgstr "

              Ayuda de GNOME

              \n" #: help-browser/toc2.c:460 msgid "" @@ -1775,6 +1741,9 @@ "\n" "

              Results of the substring search for the string " msgstr "" +"\n" +"\n" +"

              Resultados de la b�squeda con la cadena " #: help-browser/toc2.c:466 msgid "" @@ -1784,6 +1753,11 @@ "

              \n" "

                \n" msgstr "" +"

                \n" +"
                \n" +"

                P�ginas de Manual

                \n" +"

                \n" +"

                  \n" #: help-browser/toc2.c:489 msgid "" @@ -1794,6 +1768,12 @@ "

                  \n" "

                    \n" msgstr "" +"\n" +"

                    \n" +"
                    \n" +"

                    P�ginas GNU Info

                    \n" +"

                    \n" +"

                      \n" #: help-browser/toc2.c:513 msgid "" @@ -1804,14 +1784,20 @@ "

                      \n" "

                        \n" msgstr "" +"\n" +"

                        \n" +"
                        \n" +"

                        P�ginas de Ayuda GNOME

                        \n" +"

                        \n" +"

                          \n" #: help-browser/toc2.c:535 msgid "
                          No matches found\n" -msgstr "" +msgstr "
                          No se encontr� ninguna ocurrencia\n" #: help-browser/visit.c:83 msgid "Could not load default TOC page" -msgstr "" +msgstr "No se pudo cargar la tabla de contenidos por omisi�n" #: help-browser/visit.c:101 msgid "Unknown TOC argument" @@ -1831,7 +1817,7 @@ #: help-browser/window.c:132 msgid "Add bookmark" -msgstr "A�ade una marca" +msgstr "A�adir una marca" #: help-browser/window.c:137 msgid "Configure" @@ -1899,7 +1885,7 @@ #: help-browser/window.c:193 msgid "Index" -msgstr "�ndice" +msgstr "�ndice" #: help-browser/window.c:193 msgid "Show Documentation Index" @@ -1915,7 +1901,7 @@ #: panel/applet.c:299 msgid "???" -msgstr "" +msgstr "옜??" #: panel/applet.c:326 msgid "Remove from panel" @@ -1925,38 +1911,35 @@ msgid "Move applet" msgstr "Mover applet" -#: panel/drawer.c:88 -#, fuzzy +#: panel/drawer.c:73 panel/drawer.c:123 panel/drawer.c:282 panel/menu.c:1062 +msgid "Drawer" +msgstr "Caj�n" + +#: panel/drawer.c:105 msgid "Drawer properties" -msgstr "Propiedades del lanzado de programas" +msgstr "Propriedades del Caj�n" -#: panel/drawer.c:97 -#, fuzzy +#: panel/drawer.c:114 msgid "Tooltip/Name" -msgstr "Tips activados" +msgstr "Tooltip/Nombre" -#: panel/drawer.c:101 +#: panel/drawer.c:118 msgid "Icon" -msgstr "�cono" - -#: panel/drawer.c:106 panel/menu.c:1116 -#, fuzzy -msgid "Drawer" -msgstr "A�ade caj�n" +msgstr "�cono" -#: panel/launcher.c:117 +#: panel/launcher.c:93 panel/launcher.c:157 msgid "App" -msgstr "Applicaci�n" +msgstr "Aplicaci�n" -#: panel/launcher.c:214 +#: panel/launcher.c:201 msgid "Launcher properties" msgstr "Propiedades del lanzado de programas" -#: panel/launcher.c:298 +#: panel/launcher.c:286 msgid "Create launcher applet" -msgstr "" +msgstr "Crear un applet de lanzado de programas" -#: panel/logout.c:26 panel/menu.c:1227 panel/menu.c:1363 +#: panel/logout.c:26 panel/menu.c:1173 panel/menu.c:1309 msgid "Log out" msgstr "Terminar sesi�n" @@ -1965,188 +1948,192 @@ msgstr "Descarta sesi�n" #: panel/menu.c:77 -#, fuzzy msgid "The GNOME Panel" -msgstr "Ayuda GNOME" +msgstr "El Panel de GNOME" #: panel/menu.c:80 -msgid "" -"This program is responsible for launching other applications, embedding " -"small applets within itself, world peace, and random X crashes." -msgstr "" - -#: panel/menu.c:264 -#, fuzzy -msgid "Add this launcher to panel" -msgstr "A�adir al panel" - -#: panel/menu.c:272 -msgid "Add this as drawer to panel" -msgstr "" +msgid "This program is responsible for launching other applications, embedding small applets within itself, world peace, and random X crashes." +msgstr "Este programa es reponsable de lanzar otras aplicaciones, de incluir peque�os applets dentro de si mismo, de la paz en e mundo, y de cuelgues aleatorios del sistema X." #: panel/menu.c:280 -msgid "Add this as menu to panel" -msgstr "" - -#: panel/menu.c:289 -#, fuzzy -msgid "Properties ..." -msgstr "Propiedades..." +msgid "drawer" +msgstr "caj�n" -#: panel/menu.c:352 panel/menu.c:410 -msgid "..." -msgstr "" +#. gtk_signal_connect_object(GTK_OBJECT(menuitem),"select", +#. GTK_SIGNAL_FUNC(gtk_widget_show), +#. GTK_OBJECT(w)); +#. gtk_signal_connect_object(GTK_OBJECT(menuitem),"deselect", +#. GTK_SIGNAL_FUNC(gtk_widget_hide), +#. GTK_OBJECT(w)); +#: panel/menu.c:293 +msgid "menu" +msgstr "men�" + +#: panel/menu.c:352 +msgid "add" +msgstr "a�adir" -#: panel/menu.c:1064 -#, fuzzy +#: panel/menu.c:1010 msgid "Applets" -msgstr "A�adir applet" +msgstr "Applets" -#: panel/menu.c:1123 panel/panel_config.c:778 -#, fuzzy +#: panel/menu.c:1069 panel/panel_config.c:778 msgid "Edge Panel" -msgstr "Panel" +msgstr "Panel de lado" -#: panel/menu.c:1130 panel/panel_config.c:784 +#: panel/menu.c:1076 panel/panel_config.c:784 msgid "Corner Panel" -msgstr "" +msgstr "Panel de esquina" -#: panel/menu.c:1212 -#, fuzzy +#: panel/menu.c:1158 msgid "Remove this panel" -msgstr "Remover del panel" +msgstr "Remover este panel" -#: panel/menu.c:1251 +#: panel/menu.c:1197 msgid "Add applet" msgstr "A�adir applet" -#: panel/menu.c:1260 -#, fuzzy +#: panel/menu.c:1206 msgid "Add new panel" -msgstr "A�adir al panel" +msgstr "A�adir un nuevo panel" -#: panel/menu.c:1268 +#: panel/menu.c:1214 msgid "Add main menu" msgstr "A�adir men� principal" -#: panel/menu.c:1275 +#: panel/menu.c:1221 msgid "Add log out button" -msgstr "" +msgstr "A�adir bot�n de salida de sesi�n" -#: panel/menu.c:1283 +#: panel/menu.c:1229 msgid "Add swallowed app" -msgstr "A�ade aplicaci�n remota" +msgstr "A�adir aplicaci�n miniaturizada" -#: panel/menu.c:1289 +#: panel/menu.c:1235 msgid "Add new launcher" -msgstr "" +msgstr "A�adir un nuevo lanzador" -#: panel/menu.c:1300 +#: panel/menu.c:1246 msgid "This panel properties..." msgstr "Propiedades de este panel..." -#: panel/menu.c:1310 +#: panel/menu.c:1256 msgid "Global properties..." msgstr "Propiedades globales..." -#: panel/menu.c:1337 +#: panel/menu.c:1283 msgid "Panel" msgstr "Panel" -#: panel/menu.c:1344 +#: panel/menu.c:1290 msgid "Lock screen" -msgstr "Bloquea la pantalla" +msgstr "Bloquear la pantalla" + +#: panel/mico-glue.cc:221 +msgid "Error on sending 'session save' to applet!" +msgstr "좪rror al enviar 'session save' al applet!" + +#: panel/mico-glue.cc:237 +msgid "Error on sending 'orient change' to applet!" +msgstr "좪rror al enviar 'orient change' al applet!" + +#: panel/mico-glue.cc:253 +msgid "Error on sending 'do callback' to applet!" +msgstr "좪rror al enviar 'do callback' al applet!" + +#: panel/mico-glue.cc:268 +msgid "Error on sending 'start new applet' to applet!" +msgstr "좪rror al enviar 'start new applet' al applet!" + +#: panel/mico-glue.cc:286 +msgid "Error on sending 'change back' to applet!" +msgstr "좪rror al enviar 'change back' al applet!" -#: panel/panel-util.c:186 panel/panel_config.c:636 panel/swallow.c:181 -#, fuzzy +#: panel/mico-glue.cc:301 +msgid "Error on sending 'tooltips state' to applet!" +msgstr "좪rror al enviar 'tooltips state' al applet!" + +#: panel/panel-util.c:186 panel/panel_config.c:639 panel/swallow.c:181 msgid "Browse" -msgstr " Buscar... " +msgstr "Buscar" #. Position frame -#: panel/panel_config.c:241 panel/panel_config.c:394 +#: panel/panel_config.c:244 panel/panel_config.c:397 msgid "Position" msgstr "Posici�n" #. Top Position -#: panel/panel_config.c:254 +#: panel/panel_config.c:257 msgid "Top" msgstr "Arriba" -#: panel/panel_config.c:265 +#: panel/panel_config.c:268 msgid "Bottom" msgstr "Abajo" -#. Auto-hide/stayput frame -#: panel/panel_config.c:315 +#: panel/panel_config.c:318 msgid "Minimize Options" msgstr "Opciones de minimizaci�n" #. Stay Put -#: panel/panel_config.c:326 +#: panel/panel_config.c:329 msgid "Explicitly Hide" -msgstr "Esconders manualmente" +msgstr "Esconder manualmente" -#: panel/panel_config.c:339 +#: panel/panel_config.c:342 msgid "Auto Hide" msgstr "Esconderse autom�ticamente" #. North East Position -#: panel/panel_config.c:407 +#: panel/panel_config.c:410 msgid "North East" -msgstr "" +msgstr "Noreste" -#: panel/panel_config.c:418 +#: panel/panel_config.c:421 msgid "South West" -msgstr "" +msgstr "Suroeste" -#: panel/panel_config.c:429 +#: panel/panel_config.c:432 msgid "North West" -msgstr "" +msgstr "Noroeste" -#: panel/panel_config.c:440 +#: panel/panel_config.c:443 msgid "South East" -msgstr "" +msgstr "Sureste" -#. Orientation frame -#: panel/panel_config.c:468 +#: panel/panel_config.c:471 msgid "Orientation" msgstr "Orientaci�n" #. selector frame -#: panel/panel_config.c:587 panel/panel_config.c:791 -#, fuzzy +#: panel/panel_config.c:590 panel/panel_config.c:791 msgid "Background" -msgstr " Fondo " +msgstr "Fondo" -#. standard background -#: panel/panel_config.c:597 +#: panel/panel_config.c:600 msgid "Standard" -msgstr "" +msgstr "Est�ndar" -#: panel/panel_config.c:605 +#: panel/panel_config.c:608 msgid "Pixmap" -msgstr "" +msgstr "Pixmap" #. image frame -#: panel/panel_config.c:619 -#, fuzzy +#: panel/panel_config.c:622 msgid "Image file" -msgstr "Archivo de cache" +msgstr "Archivo de im�gen" -#: panel/panel_config.c:649 +#: panel/panel_config.c:652 msgid "Scale image to fit panel" -msgstr "" +msgstr "Redimencionar para que quepa en el panel" -#: panel/panel_config.c:767 -#, fuzzy +#: panel/panel_config.c:769 msgid "Panel properties" -msgstr "Propiedades del lanzado de programas" +msgstr "Propiedades del panel" -#. Animation disable #: panel/panel_config_global.c:134 -#, fuzzy msgid "Disable animations" -msgstr "Selecciona animaci�n" +msgstr "Desactivar las animaciones" #. AutoHide Animation step_size scale frame #: panel/panel_config_global.c:142 @@ -2160,175 +2147,90 @@ #. DrawerHide Animation step_size scale frame #: panel/panel_config_global.c:160 -#, fuzzy msgid "Drawer Animation Speed" -msgstr "Auto-escondido: velocidad de la animaci�n" +msgstr "Caj�n: velocidad de la animaci�n" #. Minimize Delay scale frame #: panel/panel_config_global.c:169 msgid "Auto-Hide Minimize Delay (ms)" msgstr "Auto-escondido: tiempo de minimizaci�n (ms)" -#. Minimized size scale frame #: panel/panel_config_global.c:176 msgid "Auto-Hide Minimized Size (pixels)" msgstr "Auto-escondido: tama�o de minimizaci�n (pixeles)" -#. Tooltips frame #: panel/panel_config_global.c:218 -#, fuzzy msgid "Tooltips" -msgstr "Tips en los �conos" +msgstr "Tooltips" #. Tooltips enable #: panel/panel_config_global.c:229 msgid "Tooltips enabled" msgstr "Tips activados" -#. Menu frame #: panel/panel_config_global.c:239 msgid "Menus" -msgstr "Menus" +msgstr "Menues" #. Small Icons #: panel/panel_config_global.c:250 msgid "Show small icons" msgstr "Muestra �conos peque�os" -#. Movement frame #: panel/panel_config_global.c:260 -#, fuzzy msgid "Movement" -msgstr "Comentario" +msgstr "Movimiento" #. Switched #: panel/panel_config_global.c:271 msgid "Switched movement" -msgstr "" +msgstr "Movimiento alternado" #: panel/panel_config_global.c:283 msgid "Free movement (doesn't disturb other applets)" -msgstr "" +msgstr "Movimiento libre (no disturba los otros applets)" -#. Logout frame #: panel/panel_config_global.c:293 -#, fuzzy msgid "Log Out" -msgstr "Terminar sesi�n" +msgstr "Terminar Sesi�n" #. Prompt before log out #: panel/panel_config_global.c:304 msgid "Prompt before logout" -msgstr "" +msgstr "Preguntar antes de salir" -#: panel/panel_config_global.c:339 +#: panel/panel_config_global.c:338 msgid "Global Panel Configuration" msgstr "Configuraci�n global del panel" -#: panel/panel_config_global.c:347 +#: panel/panel_config_global.c:344 msgid "Animation settings" msgstr "Configuraci�n de la animaci�n" -#: panel/session.c:563 +#: panel/session.c:504 msgid "Really log out?" -msgstr "" +msgstr "풡esconectar realmente?" -#: panel/session.c:577 +#: panel/session.c:518 msgid "Ask next time" -msgstr "" +msgstr "Preguntar la pr�xima vez" #: panel/swallow.c:158 -#, fuzzy msgid "Create swallow applet" -msgstr "A�ade aplicaci�n remota" +msgstr "Crear applet englobado" #: panel/swallow.c:168 msgid "Title of application to swallow" -msgstr "" +msgstr "T�tulo de la aplicaci�n a englobar" #: panel/swallow.c:179 msgid "Command (optional)" -msgstr "" +msgstr "Comando (opcional)" #: panel/swallow.c:190 msgid "Width (optional)" -msgstr "" +msgstr "Ancho (opcional)" #: panel/swallow.c:196 -#, fuzzy msgid "Height (optional)" -msgstr "Tama�o de la ventana" - -#, fuzzy -#~ msgid "drawer" -#~ msgstr "A�ade caj�n" - -#, fuzzy -#~ msgid "menu" -#~ msgstr "Menus" - -#~ msgid "Apply" -#~ msgstr "Aplicar" - -#~ msgid "Main menu" -#~ msgstr "Men� principal" - -#~ msgid "Panel Configuration" -#~ msgstr "Configuraci�n del panel" - -#~ msgid "Min" -#~ msgstr "Min" - -#~ msgid "Requires Password" -#~ msgstr "Requiere clave de accesso" - -#~ msgid "Use DPMS" -#~ msgstr "Usar DPMS" - -#~ msgid "Priority" -#~ msgstr "Prioridad" - -#~ msgid "Normal" -#~ msgstr "Nomral" - -#~ msgid "Low" -#~ msgstr "Baja" - -#~ msgid "Screensavers" -#~ msgstr "Protectores de pantalla" - -#~ msgid "Setup..." -#~ msgstr "Configuraci�n..." - -#~ msgid " Screensaver " -#~ msgstr " Protector de pantalla " - -#~ msgid "XLockMore Properties" -#~ msgstr "Propiedades de XLockMore" - -#~ msgid " OK " -#~ msgstr " OK " - -#~ msgid " Apply " -#~ msgstr " Aplicar " - -#~ msgid " Cancel " -#~ msgstr " Cancelar " - -#~ msgid " Defaults " -#~ msgstr " Valores normales " - -#~ msgid " XLockMore " -#~ msgstr " XLockMode " - -#~ msgid " Options " -#~ msgstr " Opciones " - -#~ msgid " Preview " -#~ msgstr " Prever " - -#~ msgid "Speed" -#~ msgstr "Velocidad" - -#~ msgid "Buttons" -#~ msgstr "Botones" +msgstr "Alto (opcional)" diff -uNr gnome-core-0.25/po/gnome-core.pot gnome-core-0.27/po/gnome-core.pot --- gnome-core-0.25/po/gnome-core.pot Wed Aug 5 18:53:01 1998 +++ gnome-core-0.27/po/gnome-core.pot Thu Aug 13 05:32:04 1998 @@ -1,11 +1,11 @@ msgid "" msgstr "" -"Date: 1998-08-05 17:53:00-0500\n" +"Date: 1998-08-13 04:32:03-0500\n" "From: Miguel de Icaza,computo,622-4680 \n" "Content-Type: text/plain; charset=\n" "Xgettext-Options: --default-domain=gnome-core --directory=.. --add-comments --keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" -"Files: applets/batmon/batmon.c applets/battery/battery.c applets/battery/properties.c applets/battery/read-battery.c applets/bussign/bussign.c applets/clockmail/clockmail.c applets/clockmail/properties.c applets/cpuload/cpuload.c applets/cpuload/properties.c applets/dialer/dialer.c applets/diskusage/diskusage.c applets/diskusage/properties.c applets/drivemount/drivemount.c applets/drivemount/properties.c applets/fifteen/fifteen.c applets/fish/fish.c applets/gen_util/clock.c applets/gen_util/mailcheck.c applets/gen_util/main.c applets/gen_util/printer.c applets/icewm-pager/wmpager_applet.c applets/modemlights/modemlights.c applets/modemlights/properties.c applets/netload/netload.c applets/netload/properties.c applets/webcontrol/webcontrol.c desktop-properties/app-background.c desktop-properties/app-bell.c desktop-properties/app-keyboard.c desktop-properties/app-mouse.c desktop-properties/app-ui.c desktop-properties/args.c desktop-properties/property-background.c " -"desktop-properties/property-bell.c desktop-properties/property-keyboard.c desktop-properties/property-mouse.c desktop-properties/property-screensaver.cc desktop-properties/property-ui.c gmenu/dialogs.c gmenu/edit.c gmenu/gmenu.c gmenu/order.c gmenu/tree.c gnome-terminal/gnome-terminal.c gsm/main.c gsm/save-session.c gsm/session-properties.c help-browser/bookmarks.c help-browser/gnome-help-browser.c help-browser/gnome-helpwin.c help-browser/history.c help-browser/toc2-man.c help-browser/toc2.c help-browser/visit.c help-browser/window.c panel/applet.c panel/drawer.c panel/launcher.c panel/logout.c panel/main.c panel/menu.c panel/panel-util.c panel/panel_config.c panel/panel_config_global.c panel/session.c panel/swallow.c\n" +"Files: applets/batmon/batmon.c applets/battery/battery.c applets/battery/properties.c applets/battery/read-battery.c applets/bussign/bussign.c applets/clockmail/clockmail.c applets/clockmail/properties.c applets/cpuload/cpuload.c applets/cpuload/properties.c applets/dialer/dialer.c applets/diskusage/diskusage.c applets/diskusage/properties.c applets/drivemount/drivemount.c applets/drivemount/properties.c applets/fifteen/fifteen.c applets/fish/fish.c applets/gen_util/clock.c applets/gen_util/mailcheck.c applets/gen_util/main.c applets/gen_util/printer.c applets/icewm-pager/wmpager_applet.c applets/modemlights/modemlights.c applets/modemlights/properties.c applets/netload/netload.c applets/netload/properties.c applets/webcontrol/webcontrol.c applets/winlist/winlist.c desktop-properties/app-background.c desktop-properties/app-bell.c desktop-properties/app-keyboard.c desktop-properties/app-mouse.c desktop-properties/app-ui.c desktop-properties/args.c desktop-properties/main.c " +"desktop-properties/property-background.c desktop-properties/property-bell.c desktop-properties/property-keyboard.c desktop-properties/property-mouse.c desktop-properties/property-screensaver.cc desktop-properties/property-ui.c desktop-properties/xlockmore.cc gemvt/getopt.c gmenu/dialogs.c gmenu/edit.c gmenu/gmenu.c gmenu/order.c gmenu/tree.c gnome-terminal/gnome-terminal.c gsm/main.c gsm/save-session.c gsm/session-properties.c help-browser/bookmarks.c help-browser/gnome-help-browser.c help-browser/gnome-helpwin.c help-browser/history.c help-browser/toc-man.c help-browser/toc.c help-browser/toc2-man.c help-browser/toc2.c help-browser/visit.c help-browser/window.c panel/applet-lib.cc panel/applet.c panel/drawer.c panel/launcher.c panel/logout.c panel/main.c panel/menu.c panel/mico-glue.cc panel/panel-util.c panel/panel.c panel/panel_config.c panel/panel_config_global.c panel/session.c panel/swallow.c\n" #: applets/batmon/batmon.c:105 msgid "Can't open /proc/apm; can't get data." @@ -100,7 +100,7 @@ msgid "Internal error: invalid mode in battery_set_mode" msgstr "" -#: applets/battery/battery.c:398 applets/cpuload/cpuload.c:201 applets/fish/fish.c:293 applets/gen_util/clock.c:231 applets/gen_util/mailcheck.c:566 applets/gen_util/printer.c:363 applets/netload/netload.c:320 +#: applets/battery/battery.c:398 applets/cpuload/cpuload.c:203 applets/fish/fish.c:293 applets/gen_util/clock.c:231 applets/gen_util/mailcheck.c:566 applets/gen_util/printer.c:363 applets/netload/netload.c:320 msgid "Can't create applet!\n" msgstr "" @@ -172,7 +172,7 @@ msgid "APM is disabled! Cannot read battery charge information." msgstr "" -#: applets/bussign/bussign.c:98 applets/clockmail/clockmail.c:376 applets/dialer/dialer.c:162 applets/diskusage/diskusage.c:572 applets/drivemount/drivemount.c:345 applets/fifteen/fifteen.c:305 applets/fish/fish.c:310 applets/gen_util/mailcheck.c:595 applets/icewm-pager/wmpager_applet.c:85 applets/modemlights/modemlights.c:533 applets/netload/netload.c:338 applets/webcontrol/webcontrol.c:288 gmenu/gmenu.c:56 gnome-terminal/gnome-terminal.c:676 panel/menu.c:1404 +#: applets/bussign/bussign.c:98 applets/clockmail/clockmail.c:376 applets/dialer/dialer.c:162 applets/diskusage/diskusage.c:572 applets/drivemount/drivemount.c:345 applets/fifteen/fifteen.c:305 applets/fish/fish.c:310 applets/gen_util/mailcheck.c:595 applets/icewm-pager/wmpager_applet.c:85 applets/modemlights/modemlights.c:533 applets/netload/netload.c:338 applets/webcontrol/webcontrol.c:288 gmenu/gmenu.c:70 gnome-terminal/gnome-terminal.c:677 panel/menu.c:1410 msgid "About..." msgstr "" @@ -223,7 +223,7 @@ msgid "date" msgstr "" -#: applets/clockmail/clockmail.c:369 applets/cpuload/cpuload.c:219 applets/diskusage/diskusage.c:583 applets/drivemount/drivemount.c:339 applets/fish/fish.c:318 applets/gen_util/clock.c:258 applets/gen_util/mailcheck.c:588 applets/gen_util/printer.c:388 applets/icewm-pager/wmpager_applet.c:93 applets/modemlights/modemlights.c:527 applets/netload/netload.c:345 applets/webcontrol/webcontrol.c:296 gnome-terminal/gnome-terminal.c:667 panel/drawer.c:518 panel/launcher.c:277 +#: applets/clockmail/clockmail.c:369 applets/cpuload/cpuload.c:221 applets/diskusage/diskusage.c:583 applets/drivemount/drivemount.c:339 applets/fish/fish.c:318 applets/gen_util/clock.c:258 applets/gen_util/mailcheck.c:588 applets/gen_util/printer.c:388 applets/icewm-pager/wmpager_applet.c:93 applets/modemlights/modemlights.c:527 applets/netload/netload.c:345 applets/webcontrol/webcontrol.c:296 gnome-terminal/gnome-terminal.c:669 panel/drawer.c:409 panel/launcher.c:295 panel/menu.c:1960 msgid "Properties..." msgstr "" @@ -670,10 +670,14 @@ msgid "Display \"launch new window\" option" msgstr "" -#: applets/webcontrol/webcontrol.c:212 gnome-terminal/gnome-terminal.c:499 +#: applets/webcontrol/webcontrol.c:212 gnome-terminal/gnome-terminal.c:501 msgid "Look" msgstr "" +#: applets/winlist/winlist.c:39 +msgid "readfd writefd" +msgstr "" + #: desktop-properties/app-background.c:15 msgid "Background Properties" msgstr "" @@ -698,7 +702,7 @@ msgid "Set parameters from saved state and exit" msgstr "" -#: desktop-properties/property-background.c:494 panel/panel_config.c:613 +#: desktop-properties/property-background.c:494 panel/panel_config.c:624 msgid "Color" msgstr "" @@ -710,12 +714,11 @@ msgid "Gradient" msgstr "" -#: desktop-properties/property-background.c:539 panel/panel_config.c:492 +#: desktop-properties/property-background.c:539 panel/panel_config.c:503 msgid "Vertical" msgstr "" -#. Horizontal -#: desktop-properties/property-background.c:545 panel/panel_config.c:479 +#: desktop-properties/property-background.c:545 panel/panel_config.c:490 msgid "Horizontal" msgstr "" @@ -763,7 +766,7 @@ msgid "Sets the wallpaper to the value specified" msgstr "" -#: desktop-properties/property-background.c:1059 desktop-properties/property-background.c:1060 gnome-terminal/gnome-terminal.c:1147 gnome-terminal/gnome-terminal.c:1148 +#: desktop-properties/property-background.c:1059 desktop-properties/property-background.c:1060 gnome-terminal/gnome-terminal.c:1150 gnome-terminal/gnome-terminal.c:1151 msgid "COLOR" msgstr "" @@ -986,50 +989,179 @@ msgid "Dialogs are treated specially by window manager" msgstr "" -#: desktop-properties/property-ui.c:155 +#. looking for better descriptions here... +#: desktop-properties/property-ui.c:81 +msgid "Notebook" +msgstr "" + +#: desktop-properties/property-ui.c:82 +msgid "Toplevel" +msgstr "" + +#: desktop-properties/property-ui.c:83 +msgid "Modal" +msgstr "" + +#: desktop-properties/property-ui.c:89 gnome-terminal/gnome-terminal.c:458 panel/panel_config.c:287 +msgid "Left" +msgstr "" + +#: desktop-properties/property-ui.c:90 gnome-terminal/gnome-terminal.c:459 panel/panel_config.c:298 +msgid "Right" +msgstr "" + +#: desktop-properties/property-ui.c:91 panel/panel_config.c:265 +msgid "Top" +msgstr "" + +#: desktop-properties/property-ui.c:92 panel/panel_config.c:276 +msgid "Bottom" +msgstr "" + +#: desktop-properties/property-ui.c:185 msgid "Dialog buttons" msgstr "" -#: desktop-properties/property-ui.c:160 +#: desktop-properties/property-ui.c:190 msgid "Dialog position" msgstr "" -#: desktop-properties/property-ui.c:165 +#: desktop-properties/property-ui.c:195 msgid "Dialog hints" msgstr "" -#: desktop-properties/property-ui.c:172 +#: desktop-properties/property-ui.c:202 msgid "Use statusbar instead of dialog when possible" msgstr "" -#: desktop-properties/property-ui.c:182 +#: desktop-properties/property-ui.c:212 msgid "Place dialogs over application window when possible" msgstr "" -#: desktop-properties/property-ui.c:193 +#: desktop-properties/property-ui.c:223 msgid "Dialogs" msgstr "" -#: desktop-properties/property-ui.c:199 +#: desktop-properties/property-ui.c:229 msgid "Menubars are detachable" msgstr "" -#: desktop-properties/property-ui.c:208 +#: desktop-properties/property-ui.c:238 msgid "Toolbars are detachable" msgstr "" -#: desktop-properties/property-ui.c:217 +#: desktop-properties/property-ui.c:247 msgid "Toolbar buttons have relieved border" msgstr "" -#: desktop-properties/property-ui.c:226 +#: desktop-properties/property-ui.c:256 msgid "Statusbar is interactive when possible" msgstr "" -#: desktop-properties/property-ui.c:235 +#: desktop-properties/property-ui.c:265 msgid "Application" msgstr "" +#: desktop-properties/property-ui.c:270 +msgid "Default MDI mode" +msgstr "" + +#: desktop-properties/property-ui.c:275 +msgid "MDI notebook tab position" +msgstr "" + +#: desktop-properties/property-ui.c:281 +msgid "MDI" +msgstr "" + +#: desktop-properties/xlockmore.cc:156 +msgid "XLockMore Properties" +msgstr "" + +#: desktop-properties/xlockmore.cc:174 +msgid " OK " +msgstr "" + +#: desktop-properties/xlockmore.cc:175 +msgid " Apply " +msgstr "" + +#: desktop-properties/xlockmore.cc:176 +msgid " Cancel " +msgstr "" + +#: desktop-properties/xlockmore.cc:177 +msgid " Defaults " +msgstr "" + +#: desktop-properties/xlockmore.cc:178 gmenu/gmenu.c:80 gnome-terminal/gnome-terminal.c:686 help-browser/window.c:176 help-browser/window.c:201 +msgid "Help" +msgstr "" + +#: desktop-properties/xlockmore.cc:183 desktop-properties/xlockmore.cc:195 +msgid " Mode " +msgstr "" + +#: desktop-properties/xlockmore.cc:184 +msgid " XLockMore " +msgstr "" + +#: desktop-properties/xlockmore.cc:193 +msgid " Options " +msgstr "" + +#: desktop-properties/xlockmore.cc:194 +msgid " Preview " +msgstr "" + +#: gemvt/getopt.c:669 +msgid "%s: option `%s' is ambiguous\n" +msgstr "" + +#. --option +#: gemvt/getopt.c:693 +msgid "%s: option `--%s' doesn't allow an argument\n" +msgstr "" + +#: gemvt/getopt.c:698 +msgid "%s: option `%c%s' doesn't allow an argument\n" +msgstr "" + +#: gemvt/getopt.c:715 gemvt/getopt.c:888 +msgid "%s: option `%s' requires an argument\n" +msgstr "" + +#. --option +#: gemvt/getopt.c:744 +msgid "%s: unrecognized option `--%s'\n" +msgstr "" + +#: gemvt/getopt.c:748 +msgid "%s: unrecognized option `%c%s'\n" +msgstr "" + +#. 1003.2 specifies the format of this message. +#: gemvt/getopt.c:774 +msgid "%s: illegal option -- %c\n" +msgstr "" + +#: gemvt/getopt.c:777 +msgid "%s: invalid option -- %c\n" +msgstr "" + +#. 1003.2 specifies the format of this message. +#: gemvt/getopt.c:807 gemvt/getopt.c:937 +msgid "%s: option requires an argument -- %c\n" +msgstr "" + +#: gemvt/getopt.c:854 +msgid "%s: option `-W %s' is ambiguous\n" +msgstr "" + +#: gemvt/getopt.c:872 +msgid "%s: option `-W %s' doesn't allow an argument\n" +msgstr "" + #: gmenu/dialogs.c:39 msgid "File exists." msgstr "" @@ -1044,7 +1176,7 @@ "To edit system entries you must be root." msgstr "" -#: gmenu/dialogs.c:125 gmenu/gmenu.c:327 +#: gmenu/dialogs.c:125 gmenu/gmenu.c:87 msgid "New Folder" msgstr "" @@ -1130,52 +1262,96 @@ msgid "New" msgstr "" -#: gmenu/gmenu.c:42 +#: gmenu/gmenu.c:47 msgid "New Folder..." msgstr "" -#: gmenu/gmenu.c:45 +#: gmenu/gmenu.c:50 msgid "Delete..." msgstr "" -#: gmenu/gmenu.c:48 +#: gmenu/gmenu.c:53 msgid "Quit" msgstr "" -#: gmenu/gmenu.c:62 help-browser/window.c:174 +#: gmenu/gmenu.c:59 +msgid "Folder" +msgstr "" + +#: gmenu/gmenu.c:62 +msgid "Folder Recursive" +msgstr "" + +#: gmenu/gmenu.c:76 help-browser/window.c:174 msgid "File" msgstr "" -#: gmenu/gmenu.c:64 gnome-terminal/gnome-terminal.c:685 help-browser/window.c:176 help-browser/window.c:201 -msgid "Help" +#: gmenu/gmenu.c:78 +msgid "Sort" +msgstr "" + +#: gmenu/gmenu.c:87 +msgid "Create a new folder" +msgstr "" + +#: gmenu/gmenu.c:89 gsm/session-properties.c:196 +msgid "Delete" +msgstr "" + +#: gmenu/gmenu.c:89 +msgid "Delete selected menu item" +msgstr "" + +#: gmenu/gmenu.c:92 +msgid "Move up" +msgstr "" + +#: gmenu/gmenu.c:92 +msgid "Move selected menu up" +msgstr "" + +#: gmenu/gmenu.c:94 +msgid "Move down" +msgstr "" + +#: gmenu/gmenu.c:94 +msgid "Move selected menu down" +msgstr "" + +#: gmenu/gmenu.c:97 +msgid "Properties" +msgstr "" + +#: gmenu/gmenu.c:97 +msgid "Edit selected menu item properties" +msgstr "" + +#: gmenu/gmenu.c:100 +msgid "Sort Folder" msgstr "" -#: gmenu/gmenu.c:192 +#: gmenu/gmenu.c:100 +msgid "Sort selected folder" +msgstr "" + +#: gmenu/gmenu.c:269 msgid "creating user directory: %s\n" msgstr "" -#: gmenu/gmenu.c:195 +#: gmenu/gmenu.c:272 msgid "unable to create user directory: %s\n" msgstr "" -#: gmenu/gmenu.c:240 gmenu/gmenu.c:282 gmenu/gmenu.c:388 +#: gmenu/gmenu.c:317 gmenu/gmenu.c:356 gmenu/gmenu.c:409 gmenu/tree.c:376 msgid "GNOME menu editor" msgstr "" -#: gmenu/gmenu.c:243 +#: gmenu/gmenu.c:320 msgid "" "Released under the terms of the GNU Public License.\n" "GNOME menu editor." msgstr "" -#: gmenu/gmenu.c:338 gsm/session-properties.c:196 -msgid "Delete" -msgstr "" - -#: gmenu/gmenu.c:367 -msgid "Edit Properties" -msgstr "" - #: gmenu/order.c:70 msgid "Unable to create file: %s\n" msgstr "" @@ -1189,29 +1365,32 @@ msgid " Folder" msgstr "" -#: gmenu/tree.c:363 +#: gmenu/tree.c:386 +msgid "One moment, reading menus..." +msgstr "" + +#: gmenu/tree.c:411 msgid "GNOME" msgstr "" -#. system's menu tree -#: gmenu/tree.c:371 panel/menu.c:1199 panel/menu.c:1237 panel/menu.c:1437 +#: gmenu/tree.c:419 panel/menu.c:1205 panel/menu.c:1243 panel/menu.c:1443 msgid "System Menus" msgstr "" -#: gmenu/tree.c:381 +#: gmenu/tree.c:429 msgid "Top of system menus" msgstr "" -#: gmenu/tree.c:392 -msgid "Running with root privileges.\n" +#: gmenu/tree.c:436 +msgid "Running with System Menu privileges.\n" msgstr "" #. user's menu tree -#: gmenu/tree.c:401 panel/menu.c:1220 panel/menu.c:1247 panel/menu.c:1448 +#: gmenu/tree.c:445 panel/menu.c:1226 panel/menu.c:1253 panel/menu.c:1454 msgid "User Menus" msgstr "" -#: gmenu/tree.c:411 +#: gmenu/tree.c:455 msgid "Top of user menus" msgstr "" @@ -1223,164 +1402,152 @@ msgid "The GNOME terminal emulation program." msgstr "" -#: gnome-terminal/gnome-terminal.c:440 +#: gnome-terminal/gnome-terminal.c:442 msgid "Linux console" msgstr "" -#: gnome-terminal/gnome-terminal.c:441 +#: gnome-terminal/gnome-terminal.c:443 msgid "Color Xterm" msgstr "" -#: gnome-terminal/gnome-terminal.c:442 +#: gnome-terminal/gnome-terminal.c:444 msgid "rxvt" msgstr "" -#: gnome-terminal/gnome-terminal.c:447 +#: gnome-terminal/gnome-terminal.c:449 msgid "White on black" msgstr "" -#: gnome-terminal/gnome-terminal.c:448 +#: gnome-terminal/gnome-terminal.c:450 msgid "Black on white" msgstr "" -#: gnome-terminal/gnome-terminal.c:449 +#: gnome-terminal/gnome-terminal.c:451 msgid "Green on black" msgstr "" -#: gnome-terminal/gnome-terminal.c:450 +#: gnome-terminal/gnome-terminal.c:452 msgid "Black on light yellow" msgstr "" -#: gnome-terminal/gnome-terminal.c:451 +#: gnome-terminal/gnome-terminal.c:453 msgid "Custom colors" msgstr "" -#: gnome-terminal/gnome-terminal.c:456 panel/panel_config.c:276 -msgid "Left" -msgstr "" - -#: gnome-terminal/gnome-terminal.c:457 panel/panel_config.c:287 -msgid "Right" -msgstr "" - -#: gnome-terminal/gnome-terminal.c:458 +#: gnome-terminal/gnome-terminal.c:460 msgid "Hidden" msgstr "" #. Font -#: gnome-terminal/gnome-terminal.c:502 +#: gnome-terminal/gnome-terminal.c:504 msgid "Font:" msgstr "" #. Scrollbar position -#: gnome-terminal/gnome-terminal.c:520 +#: gnome-terminal/gnome-terminal.c:522 msgid "Scrollbar position" msgstr "" -#: gnome-terminal/gnome-terminal.c:530 +#: gnome-terminal/gnome-terminal.c:532 msgid "Blinking cursor" msgstr "" -#: gnome-terminal/gnome-terminal.c:539 +#: gnome-terminal/gnome-terminal.c:541 msgid "Scrollback lines" msgstr "" -#: gnome-terminal/gnome-terminal.c:549 +#: gnome-terminal/gnome-terminal.c:551 msgid "Colors" msgstr "" #. Color palette -#: gnome-terminal/gnome-terminal.c:552 +#: gnome-terminal/gnome-terminal.c:554 msgid "Color palette:" msgstr "" #. Foreground, background buttons -#: gnome-terminal/gnome-terminal.c:561 +#: gnome-terminal/gnome-terminal.c:563 msgid "Foreground color:" msgstr "" -#: gnome-terminal/gnome-terminal.c:570 +#: gnome-terminal/gnome-terminal.c:572 msgid "Background color:" msgstr "" #. default foreground/backgorund selector -#: gnome-terminal/gnome-terminal.c:580 +#: gnome-terminal/gnome-terminal.c:582 msgid "Colors:" msgstr "" -#: gnome-terminal/gnome-terminal.c:615 +#: gnome-terminal/gnome-terminal.c:617 msgid "Color selector" msgstr "" -#: gnome-terminal/gnome-terminal.c:662 +#: gnome-terminal/gnome-terminal.c:664 msgid "New terminal" msgstr "" -#: gnome-terminal/gnome-terminal.c:663 +#: gnome-terminal/gnome-terminal.c:665 msgid "Save preferences" msgstr "" -#: gnome-terminal/gnome-terminal.c:664 +#: gnome-terminal/gnome-terminal.c:666 msgid "Close terminal" msgstr "" -#: gnome-terminal/gnome-terminal.c:666 +#: gnome-terminal/gnome-terminal.c:668 msgid "Hide menubar..." msgstr "" -#: gnome-terminal/gnome-terminal.c:669 -msgid "Color selector..." -msgstr "" - #: gnome-terminal/gnome-terminal.c:671 -msgid "Close all terminals" +msgid "Color selector..." msgstr "" -#: gnome-terminal/gnome-terminal.c:684 +#: gnome-terminal/gnome-terminal.c:685 msgid "Terminal" msgstr "" -#: gnome-terminal/gnome-terminal.c:1142 +#: gnome-terminal/gnome-terminal.c:1145 msgid "FONT" msgstr "" -#: gnome-terminal/gnome-terminal.c:1142 +#: gnome-terminal/gnome-terminal.c:1145 msgid "Specifies font name" msgstr "" -#: gnome-terminal/gnome-terminal.c:1143 +#: gnome-terminal/gnome-terminal.c:1146 msgid "Do not start up shells as login shells" msgstr "" -#: gnome-terminal/gnome-terminal.c:1144 +#: gnome-terminal/gnome-terminal.c:1147 msgid "Start up shells as login shells" msgstr "" -#: gnome-terminal/gnome-terminal.c:1145 +#: gnome-terminal/gnome-terminal.c:1148 msgid "GEOMETRY" msgstr "" -#: gnome-terminal/gnome-terminal.c:1145 +#: gnome-terminal/gnome-terminal.c:1148 msgid "Specifies the geometry for the main window" msgstr "" -#: gnome-terminal/gnome-terminal.c:1146 +#: gnome-terminal/gnome-terminal.c:1149 msgid "COMMAND" msgstr "" -#: gnome-terminal/gnome-terminal.c:1146 +#: gnome-terminal/gnome-terminal.c:1149 msgid "Execute this program instead of a shell" msgstr "" -#: gnome-terminal/gnome-terminal.c:1147 +#: gnome-terminal/gnome-terminal.c:1150 msgid "Foreground color" msgstr "" -#: gnome-terminal/gnome-terminal.c:1148 panel/panel_config.c:663 +#: gnome-terminal/gnome-terminal.c:1151 panel/panel_config.c:674 msgid "Background color" msgstr "" -#: gnome-terminal/gnome-terminal.c:1149 panel/main.c:46 +#: gnome-terminal/gnome-terminal.c:1152 panel/main.c:46 msgid "ID" msgstr "" @@ -1541,50 +1708,65 @@ msgid "Gnome Help History" msgstr "" -#: help-browser/toc2-man.c:21 +#: help-browser/toc-man.c:18 help-browser/toc2-man.c:21 msgid "User Commands" msgstr "" -#: help-browser/toc2-man.c:22 +#: help-browser/toc-man.c:19 help-browser/toc2-man.c:22 msgid "System Calls" msgstr "" -#: help-browser/toc2-man.c:23 +#: help-browser/toc-man.c:20 help-browser/toc2-man.c:23 msgid "Library Functions" msgstr "" -#: help-browser/toc2-man.c:24 +#: help-browser/toc-man.c:21 help-browser/toc2-man.c:24 msgid "Special Files" msgstr "" -#: help-browser/toc2-man.c:25 +#: help-browser/toc-man.c:22 help-browser/toc2-man.c:25 msgid "File Formats" msgstr "" -#: help-browser/toc2-man.c:26 +#: help-browser/toc-man.c:23 help-browser/toc2-man.c:26 msgid "Games" msgstr "" -#: help-browser/toc2-man.c:27 panel/panel_config_global.c:352 +#: help-browser/toc-man.c:24 help-browser/toc2-man.c:27 panel/panel_config_global.c:359 msgid "Miscellaneous" msgstr "" -#: help-browser/toc2-man.c:28 +#: help-browser/toc-man.c:25 help-browser/toc2-man.c:28 msgid "Administration" msgstr "" -#: help-browser/toc2-man.c:29 +#: help-browser/toc-man.c:26 help-browser/toc2-man.c:29 msgid "man9" msgstr "" -#: help-browser/toc2-man.c:30 +#: help-browser/toc-man.c:27 help-browser/toc2-man.c:30 msgid "mann" msgstr "" -#: help-browser/toc2-man.c:31 +#: help-browser/toc-man.c:28 help-browser/toc2-man.c:31 msgid "manx" msgstr "" +#. MAN PAGES +#: help-browser/toc.c:134 +msgid "Man Pages" +msgstr "" + +#. INFO PAGES +#: help-browser/toc.c:146 +msgid "Info Pages" +msgstr "" + +#. GNOME HELP +#: help-browser/toc.c:158 +msgid "GNOME Help" +msgstr "" + #: help-browser/toc2.c:114 help-browser/toc2.c:255 help-browser/toc2.c:317 msgid "

                          Table of Contents

                          \n" msgstr "" @@ -1745,47 +1927,47 @@ msgid "Help on Help" msgstr "" -#: panel/applet.c:298 +#: panel/applet.c:310 msgid "???" msgstr "" -#: panel/applet.c:325 +#: panel/applet.c:337 msgid "Remove from panel" msgstr "" -#: panel/applet.c:332 +#: panel/applet.c:344 msgid "Move applet" msgstr "" -#: panel/drawer.c:88 -msgid "Drawer properties" -msgstr "" - -#: panel/drawer.c:97 +#: panel/drawer.c:95 msgid "Tooltip/Name" msgstr "" -#: panel/drawer.c:101 +#: panel/drawer.c:99 msgid "Icon" msgstr "" -#: panel/drawer.c:106 panel/menu.c:1167 +#: panel/drawer.c:103 +msgid "Applet appearance" +msgstr "" + +#: panel/drawer.c:112 panel/menu.c:1173 msgid "Drawer" msgstr "" -#: panel/launcher.c:117 +#: panel/launcher.c:131 msgid "App" msgstr "" -#: panel/launcher.c:214 +#: panel/launcher.c:232 msgid "Launcher properties" msgstr "" -#: panel/launcher.c:298 +#: panel/launcher.c:316 msgid "Create launcher applet" msgstr "" -#: panel/logout.c:26 panel/menu.c:1278 panel/menu.c:1414 +#: panel/logout.c:26 panel/menu.c:1284 panel/menu.c:1420 msgid "Log out" msgstr "" @@ -1793,166 +1975,216 @@ msgid "Discard session" msgstr "" -#: panel/menu.c:77 +#: panel/menu.c:79 msgid "The GNOME Panel" msgstr "" -#: panel/menu.c:80 +#: panel/menu.c:82 msgid "This program is responsible for launching other applications, embedding small applets within itself, world peace, and random X crashes." msgstr "" -#: panel/menu.c:316 +#: panel/menu.c:318 msgid "Add this launcher to panel" msgstr "" -#: panel/menu.c:324 +#: panel/menu.c:326 msgid "Add this as drawer to panel" msgstr "" -#: panel/menu.c:332 +#: panel/menu.c:334 msgid "Add this as menu to panel" msgstr "" -#: panel/menu.c:341 +#: panel/menu.c:343 msgid "Properties ..." msgstr "" -#: panel/menu.c:404 panel/menu.c:462 +#: panel/menu.c:406 panel/menu.c:464 msgid "..." msgstr "" -#: panel/menu.c:1115 +#: panel/menu.c:1121 msgid "Applets" msgstr "" -#: panel/menu.c:1174 panel/panel_config.c:778 +#: panel/menu.c:1180 panel/panel_config.c:789 msgid "Edge Panel" msgstr "" -#: panel/menu.c:1181 panel/panel_config.c:784 +#: panel/menu.c:1187 panel/panel_config.c:795 msgid "Corner Panel" msgstr "" -#: panel/menu.c:1263 +#: panel/menu.c:1269 msgid "Remove this panel" msgstr "" -#: panel/menu.c:1302 +#: panel/menu.c:1308 msgid "Add applet" msgstr "" -#: panel/menu.c:1311 +#: panel/menu.c:1317 msgid "Add new panel" msgstr "" -#: panel/menu.c:1319 +#: panel/menu.c:1325 msgid "Add main menu" msgstr "" -#: panel/menu.c:1326 +#: panel/menu.c:1332 msgid "Add log out button" msgstr "" -#: panel/menu.c:1334 +#: panel/menu.c:1340 msgid "Add swallowed app" msgstr "" -#: panel/menu.c:1340 +#: panel/menu.c:1346 msgid "Add new launcher" msgstr "" -#: panel/menu.c:1351 +#: panel/menu.c:1357 msgid "This panel properties..." msgstr "" -#: panel/menu.c:1361 +#: panel/menu.c:1367 msgid "Global properties..." msgstr "" -#: panel/menu.c:1388 +#: panel/menu.c:1394 msgid "Panel" msgstr "" -#: panel/menu.c:1395 +#: panel/menu.c:1401 msgid "Lock screen" msgstr "" -#: panel/panel-util.c:186 panel/panel_config.c:636 panel/swallow.c:181 +#: panel/menu.c:1816 +msgid "Menu properties" +msgstr "" + +#: panel/menu.c:1823 +msgid "Menu Type" +msgstr "" + +#: panel/menu.c:1830 panel/menu.c:1850 +msgid "Main Menu" +msgstr "" + +#: panel/menu.c:1841 panel/menu.c:1891 +msgid "Normal Menu" +msgstr "" + +#: panel/menu.c:1860 +msgid "Both System and User menus on the same menu" +msgstr "" + +#: panel/menu.c:1872 +msgid "System on the main menu, User menu as a submenu" +msgstr "" + +#: panel/menu.c:1883 +msgid "User on the main menu, System menu as a submenu" +msgstr "" + +#: panel/menu.c:1901 +msgid "Menu path" +msgstr "" + +#: panel/menu.c:1904 panel/panel-util.c:186 panel/panel_config.c:647 panel/swallow.c:181 msgid "Browse" msgstr "" -#: panel/panel_config.c:241 panel/panel_config.c:394 -msgid "Position" +#: panel/menu.c:1915 +msgid "Menu" msgstr "" -#. Top Position -#: panel/panel_config.c:254 -msgid "Top" +#: panel/mico-glue.cc:221 +msgid "Error on sending 'session save' to applet!" msgstr "" -#: panel/panel_config.c:265 -msgid "Bottom" +#: panel/mico-glue.cc:237 +msgid "Error on sending 'orient change' to applet!" +msgstr "" + +#: panel/mico-glue.cc:253 +msgid "Error on sending 'do callback' to applet!" +msgstr "" + +#: panel/mico-glue.cc:268 +msgid "Error on sending 'start new applet' to applet!" +msgstr "" + +#: panel/mico-glue.cc:286 +msgid "Error on sending 'change back' to applet!" +msgstr "" + +#: panel/mico-glue.cc:301 +msgid "Error on sending 'tooltips state' to applet!" +msgstr "" + +#. Position frame +#: panel/panel_config.c:252 panel/panel_config.c:405 +msgid "Position" msgstr "" #. Auto-hide/stayput frame -#: panel/panel_config.c:315 +#: panel/panel_config.c:326 msgid "Minimize Options" msgstr "" -#. Stay Put -#: panel/panel_config.c:326 +#: panel/panel_config.c:337 msgid "Explicitly Hide" msgstr "" -#: panel/panel_config.c:339 +#: panel/panel_config.c:350 msgid "Auto Hide" msgstr "" -#. North East Position -#: panel/panel_config.c:407 +#: panel/panel_config.c:418 msgid "North East" msgstr "" -#: panel/panel_config.c:418 +#: panel/panel_config.c:429 msgid "South West" msgstr "" -#: panel/panel_config.c:429 +#: panel/panel_config.c:440 msgid "North West" msgstr "" -#: panel/panel_config.c:440 +#: panel/panel_config.c:451 msgid "South East" msgstr "" #. Orientation frame -#: panel/panel_config.c:468 +#: panel/panel_config.c:479 msgid "Orientation" msgstr "" -#. selector frame -#: panel/panel_config.c:587 panel/panel_config.c:791 +#: panel/panel_config.c:598 panel/panel_config.c:811 msgid "Background" msgstr "" #. standard background -#: panel/panel_config.c:597 +#: panel/panel_config.c:608 msgid "Standard" msgstr "" -#: panel/panel_config.c:605 +#: panel/panel_config.c:616 msgid "Pixmap" msgstr "" -#: panel/panel_config.c:619 +#. image frame +#: panel/panel_config.c:630 msgid "Image file" msgstr "" -#: panel/panel_config.c:649 +#: panel/panel_config.c:660 msgid "Scale image to fit panel" msgstr "" -#: panel/panel_config.c:767 +#: panel/panel_config.c:778 msgid "Panel properties" msgstr "" @@ -2024,19 +2256,23 @@ msgid "Prompt before logout" msgstr "" -#: panel/panel_config_global.c:339 +#: panel/panel_config_global.c:314 +msgid "Applet Padding" +msgstr "" + +#: panel/panel_config_global.c:346 msgid "Global Panel Configuration" msgstr "" -#: panel/panel_config_global.c:347 +#: panel/panel_config_global.c:354 msgid "Animation settings" msgstr "" -#: panel/session.c:563 +#: panel/session.c:568 msgid "Really log out?" msgstr "" -#: panel/session.c:577 +#: panel/session.c:582 msgid "Ask next time" msgstr "" Binary files gnome-core-0.25/po/pt.gmo and gnome-core-0.27/po/pt.gmo differ diff -uNr gnome-core-0.25/po/pt.po gnome-core-0.27/po/pt.po --- gnome-core-0.25/po/pt.po Wed Aug 5 20:25:34 1998 +++ gnome-core-0.27/po/pt.po Wed Aug 12 03:35:02 1998 @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: gnome-core 0.20\n" -"POT-Creation-Date: 1998-08-04 02:14+0100\n" -"PO-Revision-Date: 1998-08-04 02:31+01:00\n" +"POT-Creation-Date: 1998-08-07 05:05+0100\n" +"PO-Revision-Date: 1998-08-07 05:55+01:00\n" "Last-Translator: Nuno Ferreira \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" @@ -11,15 +11,15 @@ #: applets/batmon/batmon.c:105 msgid "Can't open /proc/apm; can't get data." -msgstr "N\343o consegui abrir /proc/apm; n\343o posso ler dados." +msgstr "N�o consegui abrir /proc/apm; n�o posso ler dados." #: applets/batmon/batmon.c:111 msgid "Something wrong with /proc/apm; can't get data." -msgstr "Algo errado com /proc/apm; n\343o posso ler dados." +msgstr "Algo errado com /proc/apm; n�o posso ler dados." #: applets/batmon/batmon.c:154 msgid "Can't open /dev/apm; can't get data." -msgstr "N\343o consegui abrir /dev/apm; n\343o posso ler dados." +msgstr "N�o consegui abrir /dev/apm; n�o posso ler dados." #: applets/batmon/batmon.c:160 applets/battery/read-battery.c:84 msgid "ioctl failed on /dev/apm." @@ -27,7 +27,7 @@ #: applets/batmon/batmon.c:210 msgid "There is no battery?!?" -msgstr "N\343o existe bateria?!?" +msgstr "N�o existe bateria?!?" #: applets/batmon/batmon.c:213 msgid "High and charging." @@ -65,8 +65,8 @@ msgid "unknown minutes of battery (%d%%)" msgstr "minutos de carga desconhecidos (%d%%)" -# , c-format #: applets/batmon/batmon.c:245 +#, c-format msgid "%d minutes of battery" msgstr "%d minutos de carga" @@ -85,11 +85,11 @@ #: applets/batmon/batmon.c:351 msgid "Linux APM Driver Version:" -msgstr "Vers\343o do Driver APM do Linux:" +msgstr "Vers�o do Driver APM do Linux:" #: applets/batmon/batmon.c:363 msgid "APM BIOS Version:" -msgstr "Vers\343o da BIOS APM:" +msgstr "Vers�o da BIOS APM:" #: applets/batmon/batmon.c:380 msgid "Battery Status:" @@ -101,15 +101,18 @@ #: applets/battery/battery.c:353 msgid "Internal error: invalid mode in battery_set_mode" -msgstr "Erro interno: modo inv\341lido em battery_set_mode" +msgstr "Erro interno: modo inv�lido em battery_set_mode" -#: applets/battery/battery.c:398 applets/cpuload/cpuload.c:201 applets/fish/fish.c:293 applets/gen_util/clock.c:231 applets/gen_util/mailcheck.c:566 applets/gen_util/printer.c:363 applets/netload/netload.c:320 +#: applets/battery/battery.c:398 applets/cpuload/cpuload.c:201 +#: applets/fish/fish.c:293 applets/gen_util/clock.c:231 +#: applets/gen_util/mailcheck.c:566 applets/gen_util/printer.c:363 +#: applets/netload/netload.c:320 msgid "Can't create applet!\n" -msgstr "N\343o consigo criar applet!\n" +msgstr "N�o consigo criar applet!\n" #: applets/battery/battery.c:612 msgid "Could not allocate space for graph values" -msgstr "N\343o consegui reservar espa\347o para os valores do gr\341fico" +msgstr "N�o consegui reservar espa�o para os valores do gr�fico" #: applets/battery/properties.c:34 msgid "Battery Monitor Settings" @@ -119,7 +122,8 @@ msgid "General Properties" msgstr "Propriedades gerais" -#: applets/battery/properties.c:45 applets/cpuload/properties.c:125 applets/diskusage/properties.c:176 applets/netload/properties.c:129 +#: applets/battery/properties.c:45 applets/cpuload/properties.c:125 +#: applets/diskusage/properties.c:176 applets/netload/properties.c:129 msgid "Applet Height" msgstr "Altura do applet" @@ -133,7 +137,7 @@ #: applets/battery/properties.c:66 msgid "Graph" -msgstr "Gr\341fico" +msgstr "Gr�fico" #: applets/battery/properties.c:68 msgid "Readout" @@ -149,11 +153,11 @@ #: applets/battery/properties.c:123 msgid "Graph Interval:" -msgstr "Intervalo do gr\341fico:" +msgstr "Intervalo do gr�fico:" #: applets/battery/properties.c:137 msgid "Graph Direction:" -msgstr "Direc\347\343o do gr\341fico:" +msgstr "Direc豫o do gr�fico:" #: applets/battery/properties.c:140 msgid "Left to Right" @@ -164,18 +168,30 @@ msgstr "Direita para a esquerda" #: applets/battery/read-battery.c:21 -msgid "Cannot open /proc/apm! Make sure that you built APM support into your kernel.\n" -msgstr "N\343o consegui abrir /proc/apm! Verifique se o suporte APM foi compilado no seu kernel.\n" +msgid "" +"Cannot open /proc/apm! Make sure that you built APM support into your " +"kernel.\n" +msgstr "" +"N�o consegui abrir /proc/apm! Verifique se o suporte APM foi compilado no " +"seu kernel.\n" #: applets/battery/read-battery.c:79 msgid "Cannot open /dev/apm; can't get data." -msgstr "N\343o consegui abrir /dev/apm; n\343o posso ler dados." +msgstr "N�o consegui abrir /dev/apm; n�o posso ler dados." #: applets/battery/read-battery.c:95 msgid "APM is disabled! Cannot read battery charge information." msgstr "" +"APM est� desactivado! N�o posso ler informa豫o sobre a carga da bateria." -#: applets/bussign/bussign.c:98 applets/clockmail/clockmail.c:376 applets/dialer/dialer.c:162 applets/diskusage/diskusage.c:572 applets/drivemount/drivemount.c:345 applets/fifteen/fifteen.c:305 applets/fish/fish.c:310 applets/gen_util/mailcheck.c:595 applets/icewm-pager/wmpager_applet.c:85 applets/modemlights/modemlights.c:533 applets/netload/netload.c:338 applets/webcontrol/webcontrol.c:288 gmenu/gmenu.c:56 gnome-terminal/gnome-terminal.c:676 panel/menu.c:1404 +#: applets/bussign/bussign.c:98 applets/clockmail/clockmail.c:376 +#: applets/dialer/dialer.c:162 applets/diskusage/diskusage.c:572 +#: applets/drivemount/drivemount.c:345 applets/fifteen/fifteen.c:305 +#: applets/fish/fish.c:310 applets/gen_util/mailcheck.c:595 +#: applets/icewm-pager/wmpager_applet.c:85 +#: applets/modemlights/modemlights.c:533 applets/netload/netload.c:338 +#: applets/webcontrol/webcontrol.c:288 gmenu/gmenu.c:56 +#: gnome-terminal/gnome-terminal.c:677 panel/menu.c:1404 msgid "About..." msgstr "Acerca..." @@ -199,16 +215,16 @@ "\n" "http://people.netscape.com/mtoy/sign/index.html" msgstr "" -"Este applet \351 uma completa perda de tempo. Volte j\341 para o seu trabalho!\n" +"Este applet � uma completa perda de tempo. Volte j� para o seu trabalho!\n" "\n" "Para preencher o painel veja:\n" "\n" "http://people.netscape.com/mtoy/sign/index.html" -# , c-format #: applets/clockmail/clockmail.c:49 +#, c-format msgid "%d.%d.%d" -msgstr "" +msgstr "%d.%d.%d" #: applets/clockmail/clockmail.c:52 msgid "John Ellis (gqview@geocities.com)" @@ -216,7 +232,7 @@ #: applets/clockmail/clockmail.c:55 msgid "Clock and Mail Notify Applet" -msgstr "" +msgstr "Applet rel�gio e aviso de correio" #: applets/clockmail/clockmail.c:56 msgid "(C) 1998" @@ -225,24 +241,35 @@ #: applets/clockmail/clockmail.c:58 msgid "" "Released under the GNU general public license.\n" -"Basic digital clock with date in a tooltip. Optional 12/24 time display. Mail blinking can be for any unread mail, or only briefly when new mail arrives." +"Basic digital clock with date in a tooltip. Optional 12/24 time display. " +"Mail blinking can be for any unread mail, or only briefly when new mail " +"arrives." msgstr "" +"Lan�ado sob a \"GNU general public license\".\n" +"Rel�gio digital b�sico com a data numa ajuda de bal�o. Mostrador 12/24 horas. O piscar do correio pode ser para qualquer correio n�o lido ou apenas brevemente quando chega novo correio." #: applets/clockmail/clockmail.c:339 msgid "date" msgstr "data" -#: applets/clockmail/clockmail.c:369 applets/cpuload/cpuload.c:219 applets/diskusage/diskusage.c:583 applets/drivemount/drivemount.c:339 applets/fish/fish.c:318 applets/gen_util/clock.c:258 applets/gen_util/mailcheck.c:588 applets/gen_util/printer.c:388 applets/icewm-pager/wmpager_applet.c:93 applets/modemlights/modemlights.c:527 applets/netload/netload.c:345 applets/webcontrol/webcontrol.c:296 gnome-terminal/gnome-terminal.c:667 panel/drawer.c:518 panel/launcher.c:277 +#: applets/clockmail/clockmail.c:369 applets/cpuload/cpuload.c:219 +#: applets/diskusage/diskusage.c:583 applets/drivemount/drivemount.c:339 +#: applets/fish/fish.c:318 applets/gen_util/clock.c:258 +#: applets/gen_util/mailcheck.c:588 applets/gen_util/printer.c:388 +#: applets/icewm-pager/wmpager_applet.c:93 +#: applets/modemlights/modemlights.c:527 applets/netload/netload.c:345 +#: applets/webcontrol/webcontrol.c:296 gnome-terminal/gnome-terminal.c:669 +#: panel/drawer.c:518 panel/launcher.c:277 msgid "Properties..." msgstr "Propriedades..." #: applets/clockmail/properties.c:111 msgid "Display time in 12 hour format (AM/PM)" -msgstr "" +msgstr "Mostrar tempo no formato de 12h (AM/PM)" #: applets/clockmail/properties.c:117 msgid "Blink when any mail is waiting. (Not just when mail arrives)" -msgstr "" +msgstr "Piscar quando houver correio � espera. (N�o s� quando o correio chega)" #: applets/clockmail/properties.c:128 msgid "Mail file:" @@ -250,15 +277,18 @@ #: applets/clockmail/properties.c:145 msgid "When new mail is received run:" -msgstr "" +msgstr "Quando novo correio � recebido executar:" -#: applets/clockmail/properties.c:160 applets/cpuload/properties.c:200 applets/diskusage/properties.c:279 applets/drivemount/properties.c:178 applets/modemlights/properties.c:193 applets/netload/properties.c:252 +#: applets/clockmail/properties.c:160 applets/cpuload/properties.c:200 +#: applets/diskusage/properties.c:279 applets/drivemount/properties.c:178 +#: applets/modemlights/properties.c:193 applets/netload/properties.c:252 msgid "General" msgstr "Geral" -#: applets/cpuload/properties.c:59 applets/diskusage/properties.c:74 applets/netload/properties.c:61 +#: applets/cpuload/properties.c:59 applets/diskusage/properties.c:74 +#: applets/netload/properties.c:61 msgid "Can't allocate memory for color\n" -msgstr "N\343o consigo alocar mem\363ria para cor\n" +msgstr "N�o consigo alocar mem�ria para cor\n" #: applets/cpuload/properties.c:115 msgid "User Load" @@ -268,17 +298,19 @@ msgid "System Load" msgstr "Carga de sistema" -#: applets/cpuload/properties.c:131 applets/diskusage/properties.c:182 applets/netload/properties.c:135 +#: applets/cpuload/properties.c:131 applets/diskusage/properties.c:182 +#: applets/netload/properties.c:135 msgid "Width" msgstr "Largura" -#: applets/cpuload/properties.c:146 applets/diskusage/properties.c:199 applets/netload/properties.c:150 +#: applets/cpuload/properties.c:146 applets/diskusage/properties.c:199 +#: applets/netload/properties.c:150 msgid "Update Frequency" -msgstr "Frequ\352ncia de actualiza\347\343o" +msgstr "Frequ�ncia de actualiza豫o" #: applets/cpuload/properties.c:197 msgid "CPULoad Settings" -msgstr "Par\342metros da Carga da CPU" +msgstr "Par�metros da Carga da CPU" #: applets/dialer/dialer.c:46 msgid "PPP Dialer Applet" @@ -294,11 +326,11 @@ #: applets/diskusage/properties.c:155 msgid "Used Diskspace" -msgstr "Espa\347o de disco usado" +msgstr "Espa�o de disco usado" #: applets/diskusage/properties.c:160 msgid "Free Diskspace" -msgstr "Espa\347o de disco livre" +msgstr "Espa�o de disco livre" #: applets/diskusage/properties.c:165 msgid "Textcolor" @@ -310,7 +342,7 @@ #: applets/diskusage/properties.c:269 msgid "Diskusage Settings" -msgstr "Par\342metros Utiliza\347\343o de Disco" +msgstr "Par�metros Utiliza豫o de Disco" #: applets/drivemount/drivemount.c:36 msgid "Drive Mount Applet" @@ -321,7 +353,7 @@ "Released under the GNU general public license.\n" "Mounts and Unmounts drives.." msgstr "" -"Lan\347ado sob os termos da \"GNU general public license\".\n" +"Lan�ado sob os termos da \"GNU general public license\".\n" "Monta e desmonta drives.." #: applets/drivemount/drivemount.c:67 @@ -330,7 +362,7 @@ #: applets/drivemount/drivemount.c:72 msgid " not mounted" -msgstr " n\343o montado" +msgstr " n�o montado" #: applets/drivemount/drivemount.c:352 msgid "Eject" @@ -338,15 +370,15 @@ #: applets/drivemount/properties.c:115 msgid "Drive Mount Settings" -msgstr "" +msgstr "Par�metros de montagem dos dispositivos" #: applets/drivemount/properties.c:123 msgid "Update in seconds:" -msgstr "Actualiza\347\343o em segundos:" +msgstr "Actualiza豫o em segundos:" #: applets/drivemount/properties.c:134 msgid "Icon:" -msgstr "\315cone:" +msgstr "�cone:" #: applets/drivemount/properties.c:141 msgid "Floppy" @@ -362,19 +394,19 @@ #: applets/drivemount/properties.c:153 msgid "Hard Disk" -msgstr "Disco r\355gido" +msgstr "Disco r�gido" #: applets/drivemount/properties.c:166 msgid "Mount point:" -msgstr "" +msgstr "Ponto de montagem:" #: applets/fifteen/fifteen.c:35 msgid "You win!" -msgstr "Voc\352 ganhou!" +msgstr "Voc� ganhou!" #: applets/fifteen/fifteen.c:263 msgid "Fifteen sliding pieces" -msgstr "" +msgstr "Quinze pe�as deslizantes" #: applets/fifteen/fifteen.c:264 msgid "1.0" @@ -385,24 +417,27 @@ msgstr "Copyright (C) The Free Software Foundation" #: applets/fifteen/fifteen.c:267 -msgid "Sam Lloyd's all-time favorite game, now for your delight in the Gnome Panel. Guaranteed to be a productivity buster." -msgstr "" +msgid "" +"Sam Lloyd's all-time favorite game, now for your delight in the Gnome Panel. " +"Guaranteed to be a productivity buster." +msgstr "O jogo favorito de todos os tempos de Sam Lloyd, agora para seu prazer no painel Gnome. Garantia de arruinar a sua productividade." #: applets/fifteen/fifteen.c:288 msgid "Can't create fifteen applet!" -msgstr "N\343o consigo criar applet do quinze!" +msgstr "N�o consigo criar applet do quinze!" #: applets/fifteen/fifteen.c:298 msgid "Scramble pieces" -msgstr "Baralhar pe\347as" +msgstr "Baralhar pe�as" -# , c-format -#: applets/fish/fish.c:63 applets/fish/fish.c:238 applets/webcontrol/webcontrol.c:52 +#: applets/fish/fish.c:63 applets/fish/fish.c:238 +#: applets/webcontrol/webcontrol.c:52 +#, c-format msgid "%s the Fish" msgstr "O peixe %s" -# , c-format #: applets/fish/fish.c:64 +#, c-format msgid "%s the GNOME Fish Says:" msgstr "%s, o peixe GNOME diz:" @@ -427,13 +462,20 @@ msgstr "O applet do peixe GNOME" #: applets/fish/fish.c:247 -msgid "This applet has no use what-so-ever. It only takes up disk space and compilation time, and if loaded it also takes up precious panel space and memory. If anyone is found using this applet, he should be promptly sent for a psychiatric evaluation." -msgstr "" -"Este applet \351 completamente in\372til. S\363 ocupa espa\347o no disco e tempo \n" -"de compila\347\343o, e se carregado tamb\351m ocupa espa\347o precioso do painel e \n" -"mem\363ria. Se algu\351m for encontrado a usar este applet deve ser r\341pidamente\n" -"enviado para uma avalia\347\343o psiqui\341trica." +msgid "" +"This applet has no use what-so-ever. It only takes up disk space and " +"compilation time, and if loaded it also takes up precious panel space and " +"memory. If anyone is found using this applet, he should be promptly sent for " +"a psychiatric evaluation." +msgstr "" +"Este applet � completamente in�til. S� ocupa espa�o no disco e tempo \n" +"de compila豫o, e se carregado tamb�m ocupa espa�o precioso do painel e \n" +"mem�ria. Se algu�m for encontrado a usar este applet deve ser r�pidamente\n" +"enviado para uma avalia豫o psiqui�trica." +#. This format string is used, to display the actual day, +#. when showing a vertical panel. For an explanation of +#. this format string type 'man strftime'. #: applets/gen_util/clock.c:98 msgid "" "%a\n" @@ -466,7 +508,7 @@ #: applets/gen_util/clock.c:311 msgid "Clock properties" -msgstr "Propriedades do rel\363gio" +msgstr "Propriedades do rel�gio" #: applets/gen_util/clock.c:321 msgid "12 hour" @@ -478,7 +520,7 @@ #: applets/gen_util/clock.c:363 msgid "Clock" -msgstr "Rel\363gio" +msgstr "Rel�gio" #: applets/gen_util/mailcheck.c:229 msgid "You have new mail." @@ -490,43 +532,45 @@ #: applets/gen_util/mailcheck.c:233 msgid "No mail." -msgstr "N\343o tem correio." +msgstr "N�o tem correio." #: applets/gen_util/mailcheck.c:447 msgid "Notification" -msgstr "Notifica\347\343o" +msgstr "Notifica豫o" #: applets/gen_util/mailcheck.c:464 msgid "Select animation" -msgstr "Seleccione anima\347\343o" +msgstr "Seleccione anima豫o" #: applets/gen_util/mailcheck.c:487 msgid "Mail check properties" -msgstr "Propriedades da verifica\347\343o de correio" +msgstr "Propriedades da verifica豫o de correio" #: applets/gen_util/mailcheck.c:492 msgid "Mail check" -msgstr "Verifica\347\343o de correio" +msgstr "Verifica豫o de correio" #: applets/gen_util/mailcheck.c:528 msgid "Mail check Applet" -msgstr "Applet de verifica\347\343o de correio" +msgstr "Applet de verifica豫o de correio" #: applets/gen_util/mailcheck.c:531 msgid "Mail check notifies you when new mail is on your mailbox" -msgstr "A verifica\347\343o de correio notifica-o quando chega novo correio \340 sua caixa de correio" +msgstr "" +"A verifica豫o de correio notifica-o quando chega novo correio � sua caixa de " +"correio" #: applets/gen_util/mailcheck.c:576 msgid "Text only" -msgstr "S\363 texto" +msgstr "S� texto" #: applets/gen_util/main.c:31 msgid "Start in clock mode" -msgstr "Arrancar em modo rel\363gio" +msgstr "Arrancar em modo rel�gio" #: applets/gen_util/main.c:32 msgid "Start in mailcheck mode" -msgstr "Arrancar em modo de verifica\347\343o de correio" +msgstr "Arrancar em modo de verifica豫o de correio" #: applets/gen_util/main.c:33 msgid "Start in printer mode" @@ -548,9 +592,13 @@ msgid "Printer" msgstr "Impressora" +#. FIXME: This should check to make sure icewm (or equiv) is running. +#. Not sure if it is working though... #: applets/icewm-pager/wmpager_applet.c:56 -msgid "This applet requires you to run a window manager with the XA_ extensions.\n" +msgid "" +"This applet requires you to run a window manager with the XA_ extensions.\n" msgstr "" +"Este applet requer que corra um gestor de janelas com as extens�es XA_.\n" #: applets/icewm-pager/wmpager_applet.c:220 msgid "Desktop Pager Applet" @@ -558,20 +606,21 @@ #: applets/icewm-pager/wmpager_applet.c:221 msgid "Copyright (C)1998 M.Watson" -msgstr "" +msgstr "Copyright (C)1998 M.Watson" #: applets/icewm-pager/wmpager_applet.c:277 msgid "Failed to retrieve workspace property." -msgstr "N\343o consegui obter propriedade do ambiente de trabalho." +msgstr "N�o consegui obter propriedade do ambiente de trabalho." #: applets/modemlights/modemlights.c:64 msgid "Modem Lights Applet" -msgstr "" +msgstr "Applet Luzes de Modem" #: applets/modemlights/modemlights.c:67 msgid "" "Released under the GNU general public license.\n" -"A modem status indicator and dialer.Lights in order from the top or left are RX and TX" +"A modem status indicator and dialer.Lights in order from the top or left are " +"RX and TX" msgstr "" #: applets/modemlights/modemlights.c:104 @@ -579,10 +628,12 @@ "You are currently connected.\n" "Do you want to disconnect?" msgstr "" +"Encontra-se ligado.\n" +"Deseja desligar-se?" #: applets/modemlights/modemlights.c:115 msgid "Do you want to connect?" -msgstr "Deseja efectuar a liga\347\343o?" +msgstr "Deseja efectuar a liga豫o?" #: applets/modemlights/modemlights.c:133 msgid "not connected" @@ -590,15 +641,15 @@ #: applets/modemlights/properties.c:107 msgid "Modem Lights Settings" -msgstr "" +msgstr "Propriedades das Luzed de Modem" #: applets/modemlights/properties.c:115 msgid "Updates per second" -msgstr "Actualiza\347\365es por segundo" +msgstr "Actualiza寤es por segundo" #: applets/modemlights/properties.c:131 msgid "Modem lock file:" -msgstr "" +msgstr "Ficheiro de blocagem(lock file) do Modem:" #: applets/modemlights/properties.c:148 msgid "Connect command:" @@ -608,9 +659,10 @@ msgid "Disconnect command:" msgstr "Comando para desligar:" +#. confirmation checkbox #: applets/modemlights/properties.c:178 msgid "Confirm connection?" -msgstr "Confirma liga\347\343o?" +msgstr "Confirma liga豫o?" #: applets/netload/netload.c:260 msgid "Netload Error" @@ -625,20 +677,24 @@ msgstr "O applet Carga de Rede do GNOME" #: applets/netload/netload.c:297 -msgid "This applet is released under the terms and conditions of the GNU Public Licence.This applet shows the load on a network device. It requires the /proc/net/ip_acct interface to be present and set up correctly for the device." +msgid "" +"This applet is released under the terms and conditions of the GNU Public " +"Licence.This applet shows the load on a network device. It requires the " +"/proc/net/ip_acct interface to be present and set up correctly for the " +"device." msgstr "" -"Este applet \351 publicado sob os termos e condi\347\365es da licen\347a p\372blica GNU\n" +"Este applet � publicado sob os termos e condi寤es da licen�a p�blica GNU\n" "(GNU Public Licence). Este applet mostra a carga num dispositivo de rede.\n" "Requer que a interface /proc/net/ip_acct esteja presente e correctamente \n" "configurada para o dispositivo." #: applets/netload/properties.c:119 msgid "Network Traffic" -msgstr "Tr\341fego de Rede" +msgstr "Tr�fego de Rede" #: applets/netload/properties.c:124 msgid "Traffic bars" -msgstr "Barras de tr\341fego" +msgstr "Barras de tr�fego" #: applets/netload/properties.c:193 msgid "Device name (like ppp0 or eth0)" @@ -646,7 +702,7 @@ #: applets/netload/properties.c:201 msgid "Vertical spacing of bars (in kilobytes)" -msgstr "Espa\347amento vertical das barras (em kilobytes)" +msgstr "Espa�amento vertical das barras (em kilobytes)" #: applets/netload/properties.c:243 msgid "properties.c: gnome_property_box_new() failed.\n" @@ -654,7 +710,7 @@ #: applets/netload/properties.c:249 msgid "Network Load Settings" -msgstr "Par\342metros da Carga de Rede" +msgstr "Par�metros da Carga de Rede" #: applets/netload/properties.c:258 msgid "Device" @@ -666,11 +722,15 @@ #: applets/webcontrol/webcontrol.c:57 msgid "The Web Browser Controller" -msgstr "" +msgstr "O controlador de Browsers Web" #: applets/webcontrol/webcontrol.c:60 -msgid "This applet currently sends getURL commands to netscape throught the -remote interface. Hopefully later more webrowsers will be supported." +msgid "" +"This applet currently sends getURL commands to netscape throught the -remote " +"interface. Hopefully later more webrowsers will be supported." msgstr "" +"Correntemente este applet envia comandos getURL para o netscape usando a\n" +"interface -remote. Esperamos que mais tarde mais webrowsers sejam suportados." #. create the widget we are going to put on the applet #: applets/webcontrol/webcontrol.c:111 @@ -679,7 +739,7 @@ #: applets/webcontrol/webcontrol.c:127 msgid "Launch new window" -msgstr "Lan\347ar nova janela" +msgstr "Abrir nova janela" #: applets/webcontrol/webcontrol.c:185 msgid "WebControl Properties" @@ -687,15 +747,19 @@ #: applets/webcontrol/webcontrol.c:190 msgid "Display URL label" -msgstr "" +msgstr "Mostar URL" #: applets/webcontrol/webcontrol.c:199 msgid "Display \"launch new window\" option" -msgstr "" +msgstr "Mostrar op豫o \"abrir nova janela\"" -#: applets/webcontrol/webcontrol.c:212 gnome-terminal/gnome-terminal.c:499 +#: applets/webcontrol/webcontrol.c:212 gnome-terminal/gnome-terminal.c:501 msgid "Look" -msgstr "Apar\352ncia" +msgstr "Apar�ncia" + +#: applets/winlist/winlist.c:39 +msgid "readfd writefd" +msgstr "" #: desktop-properties/app-background.c:15 msgid "Background Properties" @@ -719,7 +783,7 @@ #: desktop-properties/args.c:11 desktop-properties/property-background.c:1057 msgid "Set parameters from saved state and exit" -msgstr "Usar par\342metros gravados e sair" +msgstr "Usar par�metros gravados e sair" #: desktop-properties/property-background.c:494 panel/panel_config.c:613 msgid "Color" @@ -727,7 +791,7 @@ #: desktop-properties/property-background.c:518 msgid "Flat" -msgstr "S\363lido" +msgstr "S�lido" #: desktop-properties/property-background.c:524 msgid "Gradient" @@ -744,7 +808,7 @@ #: desktop-properties/property-background.c:690 msgid "Wallpaper Selection" -msgstr "Selec\347\343o do papel de parede" +msgstr "Selec豫o do papel de parede" #: desktop-properties/property-background.c:729 msgid "Wallpaper" @@ -764,7 +828,7 @@ #: desktop-properties/property-background.c:790 msgid "Scaled (keep aspect)" -msgstr "Redimensionado (mantendo propor\347\365es)" +msgstr "Redimensionado (mantendo propor寤es)" #: desktop-properties/property-background.c:801 msgid "Centered" @@ -786,7 +850,9 @@ msgid "Sets the wallpaper to the value specified" msgstr "Atribuir o valor especificado ao papel de parede" -#: desktop-properties/property-background.c:1059 desktop-properties/property-background.c:1060 gnome-terminal/gnome-terminal.c:1147 gnome-terminal/gnome-terminal.c:1148 +#: desktop-properties/property-background.c:1059 +#: desktop-properties/property-background.c:1060 +#: gnome-terminal/gnome-terminal.c:1150 gnome-terminal/gnome-terminal.c:1151 msgid "COLOR" msgstr "COR" @@ -800,15 +866,15 @@ #: desktop-properties/property-background.c:1061 msgid "ORIENT" -msgstr "ORIENTA\307\303O" +msgstr "ORIENTA플O" #: desktop-properties/property-background.c:1061 msgid "Gradient orientation: vertical or horizontal" -msgstr "Orienta\347\343o do gradiente: vertical ou horizontal" +msgstr "Orienta豫o do gradiente: vertical ou horizontal" #: desktop-properties/property-background.c:1062 msgid "Use a solid fill for the background" -msgstr "Usar uma cor s\363lida para o fundo" +msgstr "Usar uma cor s�lida para o fundo" #: desktop-properties/property-background.c:1063 msgid "Use a gradient fill for the background" @@ -820,7 +886,8 @@ #: desktop-properties/property-background.c:1064 msgid "Display wallpaper: tiled, centered, scaled or ratio" -msgstr "Mostrar papel de parede: repetido, centrado, redimensionado ou em propor\347\343o" +msgstr "" +"Mostrar papel de parede: repetido, centrado, redimensionado ou em propor豫o" #: desktop-properties/property-bell.c:123 msgid "Sound" @@ -836,9 +903,10 @@ #: desktop-properties/property-bell.c:184 msgid "Duration" -msgstr "Dura\347\343o" +msgstr "Dura豫o" -#: desktop-properties/property-bell.c:214 desktop-properties/property-screensaver.cc:250 +#: desktop-properties/property-bell.c:214 +#: desktop-properties/property-screensaver.cc:250 msgid "Test" msgstr "Testar" @@ -849,19 +917,19 @@ #. Auto repeat #: desktop-properties/property-keyboard.c:160 msgid "Auto-repeat" -msgstr "Auto-repeti\347\343o" +msgstr "Auto-repeti豫o" #: desktop-properties/property-keyboard.c:179 msgid "Enable auto-repeat" -msgstr "Usar auto-repeti\347\343o" +msgstr "Usar auto-repeti豫o" #: desktop-properties/property-keyboard.c:186 msgid "Repeat rate" -msgstr "Taxa de repeti\347\343o" +msgstr "Taxa de repeti豫o" #: desktop-properties/property-keyboard.c:207 msgid "Repeat delay" -msgstr "Atraso na repeti\347\343o" +msgstr "Atraso na repeti豫o" #. Keyboard click #: desktop-properties/property-keyboard.c:235 @@ -883,7 +951,7 @@ #. Mouse buttons #: desktop-properties/property-mouse.c:215 msgid "Mouse buttons" -msgstr "Bot\365es do rato" +msgstr "Bot�es do rato" #: desktop-properties/property-mouse.c:224 msgid "Left handed" @@ -893,17 +961,18 @@ msgid "Right handed" msgstr "Dextro" +#. Mouse motion #: desktop-properties/property-mouse.c:243 msgid "Mouse motion" msgstr "Movimento do rato" #: desktop-properties/property-mouse.c:255 msgid "Acceleration" -msgstr "Acelera\347\343o" +msgstr "Acelera豫o" #: desktop-properties/property-mouse.c:255 msgid "Fast" -msgstr "R\341pida" +msgstr "R�pida" #: desktop-properties/property-mouse.c:255 msgid "Slow" @@ -911,7 +980,7 @@ #: desktop-properties/property-mouse.c:267 msgid "Threshold" -msgstr "Toler\342ncia" +msgstr "Toler�ncia" #: desktop-properties/property-mouse.c:267 msgid "Large" @@ -927,7 +996,7 @@ #: desktop-properties/property-screensaver.cc:146 msgid "Settings" -msgstr "Par\342metros" +msgstr "Par�metros" #: desktop-properties/property-screensaver.cc:148 msgid "Wait" @@ -959,7 +1028,7 @@ #: desktop-properties/property-screensaver.cc:234 msgid "Screensavers" -msgstr "Protec\347\365es de ecr\343" +msgstr "Protec寤es de ecr�" #: desktop-properties/property-screensaver.cc:246 msgid "Setup..." @@ -967,27 +1036,27 @@ #: desktop-properties/property-screensaver.cc:356 msgid " Screensaver " -msgstr " Protec\347\343o de ecr\343 " +msgstr " Protec豫o de ecr� " #: desktop-properties/property-ui.c:55 msgid "Default Gtk setting [FIXME - Describe this better]" -msgstr "Valor por omiss\343o do Gtk [FIXME: Descrever isto melhor]" +msgstr "Valor por omiss�o do Gtk [FIXME: Descrever isto melhor]" #: desktop-properties/property-ui.c:56 msgid "Spread buttons out" -msgstr "Espa\347ar bot\365es" +msgstr "Espa�ar bot�es" #: desktop-properties/property-ui.c:57 msgid "Put buttons on edges" -msgstr "Colocar bot\365es nos cantos" +msgstr "Colocar bot�es nos cantos" #: desktop-properties/property-ui.c:58 msgid "Left-justify buttons" -msgstr "Alinhar bot\365es \340 esquerda" +msgstr "Alinhar bot�es � esquerda" #: desktop-properties/property-ui.c:59 msgid "Right-justify buttons" -msgstr "Alinhar bot\365es \340 direita" +msgstr "Alinhar bot�es � direita" #: desktop-properties/property-ui.c:65 msgid "Let window manager decide" @@ -995,7 +1064,7 @@ #: desktop-properties/property-ui.c:66 msgid "Center of the screen" -msgstr "Centro do ecr\343" +msgstr "Centro do ecr�" #: desktop-properties/property-ui.c:67 msgid "At the mouse pointer" @@ -1003,55 +1072,200 @@ #: desktop-properties/property-ui.c:73 msgid "Dialogs are like other windows" -msgstr "Di\341logos s\343o iguais \340s outras janelas" +msgstr "Di�logos s�o iguais �s outras janelas" #: desktop-properties/property-ui.c:74 msgid "Dialogs are treated specially by window manager" -msgstr "Di\341logos s\343o tratados de modo especial pelo gestor de janelas" +msgstr "Di�logos s�o tratados de modo especial pelo gestor de janelas" + +#: desktop-properties/property-ui.c:81 +msgid "Notebook" +msgstr "" -#: desktop-properties/property-ui.c:155 +#: desktop-properties/property-ui.c:82 +msgid "Toplevel" +msgstr "" + +#: desktop-properties/property-ui.c:83 +msgid "Modal" +msgstr "Modal" + +#: desktop-properties/property-ui.c:89 gnome-terminal/gnome-terminal.c:458 +#: panel/panel_config.c:276 +msgid "Left" +msgstr "Esquerda" + +#: desktop-properties/property-ui.c:90 gnome-terminal/gnome-terminal.c:459 +#: panel/panel_config.c:287 +msgid "Right" +msgstr "Direita" + +#. Top Position +#: desktop-properties/property-ui.c:91 panel/panel_config.c:254 +msgid "Top" +msgstr "Topo" + +#: desktop-properties/property-ui.c:92 panel/panel_config.c:265 +msgid "Bottom" +msgstr "Fundo" + +#: desktop-properties/property-ui.c:185 msgid "Dialog buttons" -msgstr "Bot\365es dos di\341logos" +msgstr "Bot�es dos di�logos" -#: desktop-properties/property-ui.c:160 +#: desktop-properties/property-ui.c:190 msgid "Dialog position" -msgstr "Posi\347\343o dos di\341logos" +msgstr "Posi豫o dos di�logos" -#: desktop-properties/property-ui.c:165 +#: desktop-properties/property-ui.c:195 msgid "Dialog hints" -msgstr "Hints dos di\341logos" +msgstr "Hints dos di�logos" -#: desktop-properties/property-ui.c:172 +#: desktop-properties/property-ui.c:202 msgid "Use statusbar instead of dialog when possible" -msgstr "Usar a barra de estado em vez de uma caixa de di\341logo sempre que poss\355vel" +msgstr "" +"Usar a barra de estado em vez de uma caixa de di�logo sempre que poss�vel" -#: desktop-properties/property-ui.c:182 +#: desktop-properties/property-ui.c:212 msgid "Place dialogs over application window when possible" -msgstr "Colocar di\341logos sobre a janela da aplica\347\343o quando poss\355vel" +msgstr "Colocar di�logos sobre a janela da aplica豫o quando poss�vel" -#: desktop-properties/property-ui.c:193 +#: desktop-properties/property-ui.c:223 msgid "Dialogs" -msgstr "Di\341logos" +msgstr "Di�logos" -#: desktop-properties/property-ui.c:199 +#: desktop-properties/property-ui.c:229 msgid "Menubars are detachable" -msgstr "Barras de menu s\343o m\363veis" +msgstr "Barras de menu s�o m�veis" -#: desktop-properties/property-ui.c:208 +#: desktop-properties/property-ui.c:238 msgid "Toolbars are detachable" -msgstr "Barras de ferramentas s\343o m\363veis" +msgstr "Barras de ferramentas s�o m�veis" -#: desktop-properties/property-ui.c:217 +#: desktop-properties/property-ui.c:247 msgid "Toolbar buttons have relieved border" -msgstr "Bot\365es da barra de ferramentas t\352m lados salientes" +msgstr "Bot�es da barra de ferramentas t�m lados salientes" -#: desktop-properties/property-ui.c:226 +#: desktop-properties/property-ui.c:256 msgid "Statusbar is interactive when possible" -msgstr "Barra de estado \351 interactiva sempre que poss\355vel" +msgstr "Barra de estado � interactiva sempre que poss�vel" -#: desktop-properties/property-ui.c:235 +#: desktop-properties/property-ui.c:265 msgid "Application" -msgstr "Aplica\347\343o" +msgstr "Aplica豫o" + +#: desktop-properties/property-ui.c:270 +msgid "Default MDI mode" +msgstr "Modo MDI por omiss�o" + +#: desktop-properties/property-ui.c:275 +msgid "MDI notebook tab position" +msgstr "" + +#: desktop-properties/property-ui.c:281 +msgid "MDI" +msgstr "MDI" + +#: desktop-properties/xlockmore.cc:156 +msgid "XLockMore Properties" +msgstr "Propriedades do XLockMore" + +#: desktop-properties/xlockmore.cc:174 +msgid " OK " +msgstr " OK " + +#: desktop-properties/xlockmore.cc:175 +msgid " Apply " +msgstr " Aplicar " + +#: desktop-properties/xlockmore.cc:176 +msgid " Cancel " +msgstr " Cancelar " + +#: desktop-properties/xlockmore.cc:177 +msgid " Defaults " +msgstr " Valores por omiss�o " + +#: desktop-properties/xlockmore.cc:178 gmenu/gmenu.c:64 +#: gnome-terminal/gnome-terminal.c:686 help-browser/window.c:176 +#: help-browser/window.c:201 +msgid "Help" +msgstr "Ajuda" + +#: desktop-properties/xlockmore.cc:183 desktop-properties/xlockmore.cc:195 +msgid " Mode " +msgstr " Modo " + +#: desktop-properties/xlockmore.cc:184 +msgid " XLockMore " +msgstr " XLockMore " + +#: desktop-properties/xlockmore.cc:193 +msgid " Options " +msgstr " Op寤es " + +#: desktop-properties/xlockmore.cc:194 +msgid " Preview " +msgstr " Prever " + +#: gemvt/getopt.c:669 +#, c-format +msgid "%s: option `%s' is ambiguous\n" +msgstr "" + +#: gemvt/getopt.c:693 +#, c-format +msgid "%s: option `--%s' doesn't allow an argument\n" +msgstr "" + +#: gemvt/getopt.c:698 +#, c-format +msgid "%s: option `%c%s' doesn't allow an argument\n" +msgstr "" + +#: gemvt/getopt.c:715 gemvt/getopt.c:888 +#, c-format +msgid "%s: option `%s' requires an argument\n" +msgstr "" + +#. --option +#: gemvt/getopt.c:744 +#, c-format +msgid "%s: unrecognized option `--%s'\n" +msgstr "" + +#. +option or -option +#: gemvt/getopt.c:748 +#, c-format +msgid "%s: unrecognized option `%c%s'\n" +msgstr "" + +#. 1003.2 specifies the format of this message. +#: gemvt/getopt.c:774 +#, c-format +msgid "%s: illegal option -- %c\n" +msgstr "" + +#: gemvt/getopt.c:777 +#, c-format +msgid "%s: invalid option -- %c\n" +msgstr "" + +#. 1003.2 specifies the format of this message. +#: gemvt/getopt.c:807 gemvt/getopt.c:937 +#, c-format +msgid "%s: option requires an argument -- %c\n" +msgstr "" + +#: gemvt/getopt.c:854 +#, c-format +msgid "%s: option `-W %s' is ambiguous\n" +msgstr "" + +#: gemvt/getopt.c:872 +#, c-format +msgid "%s: option `-W %s' doesn't allow an argument\n" +msgstr "" #: gmenu/dialogs.c:39 msgid "File exists." @@ -1059,14 +1273,14 @@ #: gmenu/dialogs.c:47 msgid "Failed to create file." -msgstr "Falhou a cria\347\343o do ficheiro." +msgstr "Falhou a cria豫o do ficheiro." #: gmenu/dialogs.c:119 gmenu/dialogs.c:381 msgid "" "You can't add an entry to that folder!\n" "To edit system entries you must be root." msgstr "" -"N\343o pode adicionar uma entrada a essa pasta!\n" +"N�o pode adicionar uma entrada a essa pasta!\n" "Para editar entradas do sistema tem que ser root." #: gmenu/dialogs.c:125 gmenu/gmenu.c:327 @@ -1079,11 +1293,11 @@ #: gmenu/dialogs.c:165 msgid "Failed to delete the folder." -msgstr "N\343o consegui apagar a pasta." +msgstr "N�o consegui apagar a pasta." #: gmenu/dialogs.c:173 msgid "Failed to delete the file." -msgstr "N\343o consegui apagar o ficheiro." +msgstr "N�o consegui apagar o ficheiro." #: gmenu/dialogs.c:208 msgid "You must select something first!" @@ -1091,14 +1305,14 @@ #: gmenu/dialogs.c:214 msgid "You can not delete a top level Folder!" -msgstr "N\343o pode apagar uma pasta principal!" +msgstr "N�o pode apagar uma pasta principal!" #: gmenu/dialogs.c:222 msgid "" "You can't delete that file!\n" "To edit system entries you must be root." msgstr "" -"N\343o pode apagar este ficheiro!\n" +"N�o pode apagar este ficheiro!\n" "Para editar entradas do sistema tem que ser root." #: gmenu/dialogs.c:228 @@ -1114,28 +1328,28 @@ "Cannot delete folder.\n" "To delete a folder. it must be empty." msgstr "" -"N\343o pode apagar esta pasta.\n" -"S\363 pode apagar uma pasta vazia." +"N�o pode apagar esta pasta.\n" +"S� pode apagar uma pasta vazia." #: gmenu/dialogs.c:244 msgid "File or Folder does not exist on filesystem." -msgstr "Ficheiro ou Pasta n\343o existem no sistema." +msgstr "Ficheiro ou Pasta n�o existem no sistema." #: gmenu/dialogs.c:370 msgid "The Name text field can not be blank." -msgstr "A entrada de texto Nome n\343o pode estar em branco." +msgstr "A entrada de texto Nome n�o pode estar em branco." #: gmenu/dialogs.c:379 msgid "" "You can't edit an entry in that folder!\n" "To edit system entries you must be root." msgstr "" -"N\343o pode editar uma entrada nesta pasta!\n" +"N�o pode editar uma entrada nesta pasta!\n" "Para editar entradas do sistema tem que ser root." #: gmenu/dialogs.c:388 msgid "Save Changes?" -msgstr "Gravar altera\347\365es?" +msgstr "Gravar altera寤es?" #: gmenu/dialogs.c:396 msgid "Overwrite existing file?" @@ -1177,19 +1391,15 @@ msgid "File" msgstr "Ficheiro" -#: gmenu/gmenu.c:64 gnome-terminal/gnome-terminal.c:685 help-browser/window.c:176 help-browser/window.c:201 -msgid "Help" -msgstr "Ajuda" - -# , c-format #: gmenu/gmenu.c:192 +#, c-format msgid "creating user directory: %s\n" msgstr "criando directoria do utilizador: %s\n" -# , c-format #: gmenu/gmenu.c:195 +#, c-format msgid "unable to create user directory: %s\n" -msgstr "n\343o consegui criar directoria do utilizador: %s\n" +msgstr "n�o consegui criar directoria do utilizador: %s\n" #: gmenu/gmenu.c:240 gmenu/gmenu.c:282 gmenu/gmenu.c:388 msgid "GNOME menu editor" @@ -1200,7 +1410,7 @@ "Released under the terms of the GNU Public License.\n" "GNOME menu editor." msgstr "" -"Lan\347ado sob os termos da \"GNU Public License\".\n" +"Lan�ado sob os termos da \"GNU Public License\".\n" "Editor do menu GNOME." #: gmenu/gmenu.c:338 gsm/session-properties.c:196 @@ -1211,16 +1421,15 @@ msgid "Edit Properties" msgstr "Editar propriedades" -# , c-format #: gmenu/order.c:70 +#, c-format msgid "Unable to create file: %s\n" -msgstr "N\343o consegui criar ficheiro: %s\n" +msgstr "N�o consegui criar ficheiro: %s\n" -# , c-format -#. g_print(_("removing .order file: %s\n"),row_file); #: gmenu/order.c:90 +#, c-format msgid "unable to remove .order file: %s\n" -msgstr "N\343o consegui apagar ficheiro .order: %s\n" +msgstr "N�o consegui apagar ficheiro .order: %s\n" #: gmenu/order.c:151 gmenu/order.c:165 msgid " Folder" @@ -1241,7 +1450,7 @@ #: gmenu/tree.c:392 msgid "Running with root privileges.\n" -msgstr "A executar com privil\351gios de root.\n" +msgstr "A executar com privil�gios de root.\n" #. user's menu tree #: gmenu/tree.c:401 panel/menu.c:1220 panel/menu.c:1247 panel/menu.c:1448 @@ -1260,190 +1469,180 @@ msgid "The GNOME terminal emulation program." msgstr "O emulador de terminal GNOME." -#: gnome-terminal/gnome-terminal.c:440 +#: gnome-terminal/gnome-terminal.c:442 msgid "Linux console" msgstr "Consola Linux" -#: gnome-terminal/gnome-terminal.c:441 +#: gnome-terminal/gnome-terminal.c:443 msgid "Color Xterm" msgstr "Xterm a cores" -#: gnome-terminal/gnome-terminal.c:442 +#: gnome-terminal/gnome-terminal.c:444 msgid "rxvt" msgstr "rxvt" -#: gnome-terminal/gnome-terminal.c:447 +#: gnome-terminal/gnome-terminal.c:449 msgid "White on black" msgstr "Branco sobre preto" -#: gnome-terminal/gnome-terminal.c:448 +#: gnome-terminal/gnome-terminal.c:450 msgid "Black on white" msgstr "Preto sobre branco" -#: gnome-terminal/gnome-terminal.c:449 +#: gnome-terminal/gnome-terminal.c:451 msgid "Green on black" msgstr "Verde sobre preto" -#: gnome-terminal/gnome-terminal.c:450 +#: gnome-terminal/gnome-terminal.c:452 msgid "Black on light yellow" msgstr "Preto sobre amarelo claro" -#: gnome-terminal/gnome-terminal.c:451 +#: gnome-terminal/gnome-terminal.c:453 msgid "Custom colors" msgstr "Cores personalizadas" -#: gnome-terminal/gnome-terminal.c:456 panel/panel_config.c:276 -msgid "Left" -msgstr "Esquerda" - -#: gnome-terminal/gnome-terminal.c:457 panel/panel_config.c:287 -msgid "Right" -msgstr "Direita" - -#: gnome-terminal/gnome-terminal.c:458 +#: gnome-terminal/gnome-terminal.c:460 msgid "Hidden" msgstr "Escondida" #. Font -#: gnome-terminal/gnome-terminal.c:502 +#: gnome-terminal/gnome-terminal.c:504 msgid "Font:" msgstr "Fonte:" #. Scrollbar position -#: gnome-terminal/gnome-terminal.c:520 +#: gnome-terminal/gnome-terminal.c:522 msgid "Scrollbar position" -msgstr "Posi\347\343o da barra de arrasto" +msgstr "Posi豫o da barra de arrasto" -#: gnome-terminal/gnome-terminal.c:530 +#. Blinking status +#: gnome-terminal/gnome-terminal.c:532 msgid "Blinking cursor" msgstr "Cursor intermitente" -#: gnome-terminal/gnome-terminal.c:539 +#. Scroll back +#: gnome-terminal/gnome-terminal.c:541 msgid "Scrollback lines" msgstr "Linhas anteriores a manter" -#: gnome-terminal/gnome-terminal.c:549 +#: gnome-terminal/gnome-terminal.c:551 msgid "Colors" msgstr "Cores" #. Color palette -#: gnome-terminal/gnome-terminal.c:552 +#: gnome-terminal/gnome-terminal.c:554 msgid "Color palette:" msgstr "Paleta de cores:" #. Foreground, background buttons -#: gnome-terminal/gnome-terminal.c:561 +#: gnome-terminal/gnome-terminal.c:563 msgid "Foreground color:" msgstr "Cor do Texto:" -#: gnome-terminal/gnome-terminal.c:570 +#: gnome-terminal/gnome-terminal.c:572 msgid "Background color:" msgstr "Cor do Fundo:" #. default foreground/backgorund selector -#: gnome-terminal/gnome-terminal.c:580 +#: gnome-terminal/gnome-terminal.c:582 msgid "Colors:" msgstr "Cores:" -#: gnome-terminal/gnome-terminal.c:615 +#: gnome-terminal/gnome-terminal.c:617 msgid "Color selector" msgstr "Selector de cores" -#: gnome-terminal/gnome-terminal.c:662 +#: gnome-terminal/gnome-terminal.c:664 msgid "New terminal" msgstr "Novo terminal" -#: gnome-terminal/gnome-terminal.c:663 +#: gnome-terminal/gnome-terminal.c:665 msgid "Save preferences" -msgstr "Gravar prefer\352ncias" +msgstr "Gravar prefer�ncias" -#: gnome-terminal/gnome-terminal.c:664 +#: gnome-terminal/gnome-terminal.c:666 msgid "Close terminal" msgstr "Fechar terminal" -#: gnome-terminal/gnome-terminal.c:666 +#: gnome-terminal/gnome-terminal.c:668 msgid "Hide menubar..." msgstr "Esconder barra de menu..." -#: gnome-terminal/gnome-terminal.c:669 +#: gnome-terminal/gnome-terminal.c:671 msgid "Color selector..." msgstr "Selector de cores..." -#: gnome-terminal/gnome-terminal.c:671 -msgid "Close all terminals" -msgstr "Fechar todos os terminais" - -#: gnome-terminal/gnome-terminal.c:684 +#: gnome-terminal/gnome-terminal.c:685 msgid "Terminal" msgstr "Terminal" -#: gnome-terminal/gnome-terminal.c:1142 +#: gnome-terminal/gnome-terminal.c:1145 msgid "FONT" msgstr "FONTE" -#: gnome-terminal/gnome-terminal.c:1142 +#: gnome-terminal/gnome-terminal.c:1145 msgid "Specifies font name" msgstr "Especifica o nome da fonte" -#: gnome-terminal/gnome-terminal.c:1143 +#: gnome-terminal/gnome-terminal.c:1146 msgid "Do not start up shells as login shells" -msgstr "N\343o executar 'shells' como 'login shells'" +msgstr "N�o executar 'shells' como 'login shells'" -#: gnome-terminal/gnome-terminal.c:1144 +#: gnome-terminal/gnome-terminal.c:1147 msgid "Start up shells as login shells" msgstr "Executar 'shells' como 'login shells'" -#: gnome-terminal/gnome-terminal.c:1145 +#: gnome-terminal/gnome-terminal.c:1148 msgid "GEOMETRY" msgstr "GEOMETRIA" -#: gnome-terminal/gnome-terminal.c:1145 +#: gnome-terminal/gnome-terminal.c:1148 msgid "Specifies the geometry for the main window" msgstr "Especifica a geometria para a janela principal" -#: gnome-terminal/gnome-terminal.c:1146 +#: gnome-terminal/gnome-terminal.c:1149 msgid "COMMAND" msgstr "COMANDO" -#: gnome-terminal/gnome-terminal.c:1146 +#: gnome-terminal/gnome-terminal.c:1149 msgid "Execute this program instead of a shell" msgstr "Executar este programa em vez de uma 'shell'" -#: gnome-terminal/gnome-terminal.c:1147 +#: gnome-terminal/gnome-terminal.c:1150 msgid "Foreground color" msgstr "Cor do Texto" -#: gnome-terminal/gnome-terminal.c:1148 panel/panel_config.c:663 +#: gnome-terminal/gnome-terminal.c:1151 panel/panel_config.c:663 msgid "Background color" msgstr "Cor do Fundo" -#: gnome-terminal/gnome-terminal.c:1149 panel/main.c:46 +#: gnome-terminal/gnome-terminal.c:1152 panel/main.c:46 msgid "ID" msgstr "ID" #: gsm/main.c:42 msgid "[SESSION]" -msgstr "[SESS\303O]" +msgstr "[SESS홒]" #: gsm/save-session.c:35 msgid "Kill session" -msgstr "Terminar sess\343o" +msgstr "Terminar sess�o" #: gsm/save-session.c:81 msgid "save-session: couldn't connect to session manager\n" -msgstr "save-session: n\343o consegui ligar-me ao gestor de sess\343o\n" +msgstr "save-session: n�o consegui ligar-me ao gestor de sess�o\n" #: gsm/session-properties.c:189 msgid "Startup" -msgstr "In\355cio" +msgstr "In�cio" #: gsm/session-properties.c:192 msgid "Programs to invoke at session startup:" -msgstr "Programas a executar no in\355cio da sess\343o:" +msgstr "Programas a executar no in�cio da sess�o:" #: gsm/session-properties.c:239 msgid "Gnome Session Properties" -msgstr "Propriedades da Sess\343o GNOME" +msgstr "Propriedades da Sess�o GNOME" #: gsm/session-properties.c:289 msgid "Geometry of window" @@ -1455,7 +1654,7 @@ #: help-browser/bookmarks.c:219 msgid "Page Title" -msgstr "T\355tulo" +msgstr "T�tulo" #: help-browser/bookmarks.c:229 msgid "Gnome Help Bookmarks" @@ -1472,7 +1671,7 @@ #: help-browser/gnome-help-browser.c:85 msgid "X position of window" -msgstr "Posi\347\343o X da janela" +msgstr "Posi豫o X da janela" #: help-browser/gnome-help-browser.c:86 msgid "Y" @@ -1480,7 +1679,7 @@ #: help-browser/gnome-help-browser.c:86 msgid "Y position of window" -msgstr "Posi\347\343o Y da janela" +msgstr "Posi豫o Y da janela" #: help-browser/gnome-help-browser.c:87 msgid "WIDTH" @@ -1500,7 +1699,7 @@ #: help-browser/gnome-help-browser.c:89 msgid "Debug level" -msgstr "N\355vel de depura\347\343o" +msgstr "N�vel de depura豫o" #: help-browser/gnome-help-browser.c:97 msgid "[URL]" @@ -1511,18 +1710,20 @@ msgstr "Ajuda do GNOME" #: help-browser/gnome-help-browser.c:343 -msgid "GNOME Help Browser allows easy access to various forms of documentation on your system" +msgid "" +"GNOME Help Browser allows easy access to various forms of documentation on " +"your system" msgstr "" -"A Ajuda do GNOME permite um acesso f\341cil a v\341rias formas de documenta\347\343o no\n" +"A Ajuda do GNOME permite um acesso f�cil a v�rias formas de documenta豫o no\n" "seu sistema" #: help-browser/gnome-help-browser.c:602 msgid "History size" -msgstr "Tamanho da hist\363ria" +msgstr "Tamanho da hist�ria" #: help-browser/gnome-help-browser.c:603 msgid "History file" -msgstr "Ficheiro da hist\363ria" +msgstr "Ficheiro da hist�ria" #: help-browser/gnome-help-browser.c:604 msgid "Cache size" @@ -1550,11 +1751,11 @@ #: help-browser/gnome-help-browser.c:689 msgid "Gnome Help Configure" -msgstr "Configura\347\343o da Ajuda Gnome" +msgstr "Configura豫o da Ajuda Gnome" #: help-browser/gnome-help-browser.c:692 msgid "History and cache" -msgstr "Hist\363ria e cache" +msgstr "Hist�ria e cache" #: help-browser/gnome-help-browser.c:693 msgid "Paths" @@ -1570,71 +1771,90 @@ #: help-browser/history.c:256 msgid "Last" -msgstr "\332ltima visita" +msgstr "�ltima visita" #: help-browser/history.c:256 msgid "Count" -msgstr "N\272 de visitas" +msgstr "N� de visitas" #: help-browser/history.c:269 msgid "Gnome Help History" -msgstr "Hist\363ria da Ajuda GNOME" +msgstr "Hist�ria da Ajuda GNOME" -#: help-browser/toc2-man.c:21 +#: help-browser/toc-man.c:18 help-browser/toc2-man.c:21 msgid "User Commands" msgstr "Comados de utilizador" -#: help-browser/toc2-man.c:22 +#: help-browser/toc-man.c:19 help-browser/toc2-man.c:22 msgid "System Calls" msgstr "Chamadas de sistema" -#: help-browser/toc2-man.c:23 +#: help-browser/toc-man.c:20 help-browser/toc2-man.c:23 msgid "Library Functions" -msgstr "Fun\347\365es das bibliotecas" +msgstr "Fun寤es das bibliotecas" -#: help-browser/toc2-man.c:24 +#: help-browser/toc-man.c:21 help-browser/toc2-man.c:24 msgid "Special Files" msgstr "Ficheiros especiais" -#: help-browser/toc2-man.c:25 +#: help-browser/toc-man.c:22 help-browser/toc2-man.c:25 msgid "File Formats" msgstr "Formatos de ficheiros" -#: help-browser/toc2-man.c:26 +#: help-browser/toc-man.c:23 help-browser/toc2-man.c:26 msgid "Games" msgstr "Jogos" -#: help-browser/toc2-man.c:27 panel/panel_config_global.c:352 +#: help-browser/toc-man.c:24 help-browser/toc2-man.c:27 +#: panel/panel_config_global.c:352 msgid "Miscellaneous" -msgstr "V\341rios" +msgstr "V�rios" -#: help-browser/toc2-man.c:28 +#: help-browser/toc-man.c:25 help-browser/toc2-man.c:28 msgid "Administration" -msgstr "Administra\347\343o" +msgstr "Administra豫o" -#: help-browser/toc2-man.c:29 +#: help-browser/toc-man.c:26 help-browser/toc2-man.c:29 msgid "man9" -msgstr "Fun\347\365es do n\372cleo" +msgstr "Fun寤es do n�cleo" -#: help-browser/toc2-man.c:30 +#: help-browser/toc-man.c:27 help-browser/toc2-man.c:30 msgid "mann" msgstr "mann" -#: help-browser/toc2-man.c:31 +#: help-browser/toc-man.c:28 help-browser/toc2-man.c:31 msgid "manx" msgstr "manx" +#. Add one new item for each type +#. This really should iterate through the toc_config list +#. MAN PAGES +#: help-browser/toc.c:134 +msgid "Man Pages" +msgstr "P�ginas de Manual" + +#. INFO PAGES +#: help-browser/toc.c:146 +msgid "Info Pages" +msgstr "P�ginas Info" + +#. GNOME HELP +#: help-browser/toc.c:158 +msgid "GNOME Help" +msgstr "Ajuda GNOME" + #: help-browser/toc2.c:114 help-browser/toc2.c:255 help-browser/toc2.c:317 msgid "

                          Table of Contents

                          \n" -msgstr "

                          \315ndice

                          \n" +msgstr "

                          �ndice

                          \n" +#. Man Pages #: help-browser/toc2.c:118 msgid "

                          Man Pages

                          \n" msgstr "

                          Manuais

                          \n" #: help-browser/toc2.c:256 msgid "

                          Info Pages

                          \n" -msgstr "

                          P\341ginas Info\n" +msgstr "

                          P�ginas Info\n" #: help-browser/toc2.c:318 msgid "

                          GNOME Help

                          \n" @@ -1648,7 +1868,7 @@ msgstr "" "\n" "\n" -"Resultados da procura da express\343o " +"Resultados da procura da express�o " #: help-browser/toc2.c:466 msgid "" @@ -1660,7 +1880,7 @@ msgstr "" "

                          \n" "
                          \n" -"

                          P\341ginas dos Manuais

                          \n" +"

                          P�ginas dos Manuais

                          \n" "

                          \n" "

                            \n" @@ -1676,7 +1896,7 @@ "\n" "

                            \n" "
                            \n" -"

                            P\341ginas GNU Info

                            \n" +"

                            P�ginas GNU Info

                            \n" "

                            \n" "

                              \n" @@ -1692,21 +1912,21 @@ "\n" "

                              \n" "
                              \n" -"

                              P\341ginas da ajuda GNOME

                              \n" +"

                              P�ginas da ajuda GNOME

                              \n" "

                              \n" "

                                \n" #: help-browser/toc2.c:535 msgid "
                                No matches found\n" -msgstr "
                                Nenhuma correspond\352ncia encontrada\n" +msgstr "
                                Nenhuma correspond�ncia encontrada\n" #: help-browser/visit.c:83 msgid "Could not load default TOC page" -msgstr "N\343o consegui carregar o \355ndice por omiss\343o" +msgstr "N�o consegui carregar o �ndice por omiss�o" #: help-browser/visit.c:101 msgid "Unknown TOC argument" -msgstr "Entrada do \355ndice desconhecida" +msgstr "Entrada do �ndice desconhecida" #: help-browser/window.c:127 msgid "New window" @@ -1746,15 +1966,15 @@ #: help-browser/window.c:156 msgid "Info about this program" -msgstr "Informa\347\343o sobre este programa" +msgstr "Informa豫o sobre este programa" #: help-browser/window.c:166 help-browser/window.c:196 msgid "History" -msgstr "Hist\363ria" +msgstr "Hist�ria" #: help-browser/window.c:166 help-browser/window.c:196 msgid "Show History Window" -msgstr "Abrir Janela da Hist\363ria" +msgstr "Abrir Janela da Hist�ria" #: help-browser/window.c:168 msgid "Bookmarks" @@ -1774,15 +1994,15 @@ #: help-browser/window.c:184 msgid "Go to the previous location in the history list" -msgstr "Ir para a localiza\347\343o anterior na hist\363ria" +msgstr "Ir para a localiza豫o anterior na hist�ria" #: help-browser/window.c:186 msgid "Forward" -msgstr "Avan\347ar" +msgstr "Avan�ar" #: help-browser/window.c:187 msgid "Go to the next location in the history list" -msgstr "Ir para a localiza\347\343o seguinte na hist\363ria" +msgstr "Ir para a localiza豫o seguinte na hist�ria" #: help-browser/window.c:190 msgid "Reload" @@ -1790,11 +2010,11 @@ #: help-browser/window.c:193 msgid "Index" -msgstr "\315ndice" +msgstr "�ndice" #: help-browser/window.c:193 msgid "Show Documentation Index" -msgstr "Mostrar \355ndice da documenta\347\343o" +msgstr "Mostrar �ndice da documenta豫o" #: help-browser/window.c:198 msgid "BMarks" @@ -1822,11 +2042,11 @@ #: panel/drawer.c:97 msgid "Tooltip/Name" -msgstr "Ajuda de bal\343o/Nome" +msgstr "Ajuda de bal�o/Nome" #: panel/drawer.c:101 msgid "Icon" -msgstr "\315cone" +msgstr "�cone" #: panel/drawer.c:106 panel/menu.c:1167 msgid "Drawer" @@ -1846,19 +2066,23 @@ #: panel/logout.c:26 panel/menu.c:1278 panel/menu.c:1414 msgid "Log out" -msgstr "Terminar sess\343o" +msgstr "Terminar sess�o" #: panel/main.c:46 msgid "Discard session" -msgstr "??Rejeitar sess\343o" +msgstr "??Rejeitar sess�o" #: panel/menu.c:77 msgid "The GNOME Panel" msgstr "O painel GNOME" #: panel/menu.c:80 -msgid "This program is responsible for launching other applications, embedding small applets within itself, world peace, and random X crashes." -msgstr "Este programa \351 respons\341vel por executar outras aplica\347\365es, embeber pequenos applets, a paz mundial e \"crashes\" aleat\363rios do X." +msgid "" +"This program is responsible for launching other applications, embedding " +"small applets within itself, world peace, and random X crashes." +msgstr "" +"Este programa � respons�vel por executar outras aplica寤es, embeber pequenos " +"applets, a paz mundial e \"crashes\" aleat�rios do X." #: panel/menu.c:316 msgid "Add this launcher to panel" @@ -1910,11 +2134,11 @@ #: panel/menu.c:1326 msgid "Add log out button" -msgstr "Adicionar bot\343o para terminar sess\343o" +msgstr "Adicionar bot�o para terminar sess�o" #: panel/menu.c:1334 msgid "Add swallowed app" -msgstr "Adicionar aplica\347\343o \"engolida\"" +msgstr "Adicionar aplica豫o \"engolida\"" #: panel/menu.c:1340 msgid "Add new launcher" @@ -1934,29 +2158,45 @@ #: panel/menu.c:1395 msgid "Lock screen" -msgstr "Trancar ecr\343" +msgstr "Trancar ecr�" + +#: panel/mico-glue.cc:221 +msgid "Error on sending 'session save' to applet!" +msgstr "" + +#: panel/mico-glue.cc:237 +msgid "Error on sending 'orient change' to applet!" +msgstr "" + +#: panel/mico-glue.cc:253 +msgid "Error on sending 'do callback' to applet!" +msgstr "" + +#: panel/mico-glue.cc:268 +msgid "Error on sending 'start new applet' to applet!" +msgstr "" + +#: panel/mico-glue.cc:286 +msgid "Error on sending 'change back' to applet!" +msgstr "" + +#: panel/mico-glue.cc:301 +msgid "Error on sending 'tooltips state' to applet!" +msgstr "" #: panel/panel-util.c:186 panel/panel_config.c:636 panel/swallow.c:181 msgid "Browse" msgstr "Procurar" +#. Position frame #: panel/panel_config.c:241 panel/panel_config.c:394 msgid "Position" -msgstr "Posi\347\343o" - -#. Top Position -#: panel/panel_config.c:254 -msgid "Top" -msgstr "Topo" - -#: panel/panel_config.c:265 -msgid "Bottom" -msgstr "Fundo" +msgstr "Posi豫o" #. Auto-hide/stayput frame #: panel/panel_config.c:315 msgid "Minimize Options" -msgstr "Minimiza\347\343o" +msgstr "Minimiza豫o" #. Stay Put #: panel/panel_config.c:326 @@ -1987,7 +2227,7 @@ #. Orientation frame #: panel/panel_config.c:468 msgid "Orientation" -msgstr "Orienta\347\343o" +msgstr "Orienta豫o" #. selector frame #: panel/panel_config.c:587 panel/panel_config.c:791 @@ -2003,6 +2243,7 @@ msgid "Pixmap" msgstr "Imagem" +#. image frame #: panel/panel_config.c:619 msgid "Image file" msgstr "Ficheiro com imagem" @@ -2015,9 +2256,10 @@ msgid "Panel properties" msgstr "Propriedades do Painel" +#. Animation disable #: panel/panel_config_global.c:134 msgid "Disable animations" -msgstr "N\343o usar anima\347\365es" +msgstr "N�o usar anima寤es" #. AutoHide Animation step_size scale frame #: panel/panel_config_global.c:142 @@ -2032,26 +2274,29 @@ #. DrawerHide Animation step_size scale frame #: panel/panel_config_global.c:160 msgid "Drawer Animation Speed" -msgstr "Velocidade de anima\347\343o das gavetas" +msgstr "Velocidade de anima豫o das gavetas" #. Minimize Delay scale frame #: panel/panel_config_global.c:169 msgid "Auto-Hide Minimize Delay (ms)" -msgstr "Atraso na minimiza\347\343o autom\341tica (ms)" +msgstr "Atraso na minimiza豫o autom�tica (ms)" +#. Minimized size scale frame #: panel/panel_config_global.c:176 msgid "Auto-Hide Minimized Size (pixels)" msgstr "Tamanho (em pixels) quando automaticamente escondido" +#. Tooltips frame #: panel/panel_config_global.c:218 msgid "Tooltips" -msgstr "Ajudas de bal\343o" +msgstr "Ajudas de bal�o" #. Tooltips enable #: panel/panel_config_global.c:229 msgid "Tooltips enabled" -msgstr "Mostrar ajudas de bal\343o" +msgstr "Mostrar ajudas de bal�o" +#. Menu frame #: panel/panel_config_global.c:239 msgid "Menus" msgstr "Menus" @@ -2059,8 +2304,9 @@ #. Small Icons #: panel/panel_config_global.c:250 msgid "Show small icons" -msgstr "Mostrar \355cones pequenos" +msgstr "Mostrar �cones pequenos" +#. Movement frame #: panel/panel_config_global.c:260 msgid "Movement" msgstr "Movimento" @@ -2068,28 +2314,29 @@ #. Switched #: panel/panel_config_global.c:271 msgid "Switched movement" -msgstr "Trocando de posi\347\343o" +msgstr "Trocando de posi豫o" #: panel/panel_config_global.c:283 msgid "Free movement (doesn't disturb other applets)" -msgstr "Livre (n\343o interfere com outros applets)" +msgstr "Livre (n�o interfere com outros applets)" +#. Logout frame #: panel/panel_config_global.c:293 msgid "Log Out" -msgstr "Terminar sess\343o" +msgstr "Terminar sess�o" #. Prompt before log out #: panel/panel_config_global.c:304 msgid "Prompt before logout" -msgstr "Confirmar t\351rmino de sess\343o" +msgstr "Confirmar t�rmino de sess�o" #: panel/panel_config_global.c:339 msgid "Global Panel Configuration" -msgstr "Configura\347\343o global do painel" +msgstr "Configura豫o global do painel" #: panel/panel_config_global.c:347 msgid "Animation settings" -msgstr "Par\342metros das anima\347\365es" +msgstr "Par�metros das anima寤es" #: panel/session.c:563 msgid "Really log out?" @@ -2097,15 +2344,15 @@ #: panel/session.c:577 msgid "Ask next time" -msgstr "Perguntar na pr\363xima vez" +msgstr "Perguntar na pr�xima vez" #: panel/swallow.c:158 msgid "Create swallow applet" -msgstr "Adicionar aplica\347\343o \"engolida\"" +msgstr "Adicionar aplica豫o \"engolida\"" #: panel/swallow.c:168 msgid "Title of application to swallow" -msgstr "T\355tulo da aplica\347\343o a \"engolir\"" +msgstr "T�tulo da aplica豫o a \"engolir\"" #: panel/swallow.c:179 msgid "Command (optional)"