1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00

Update to 2.3.3.

This commit is contained in:
Joe Marcus Clarke 2003-07-03 00:03:57 +00:00
parent f8c79ad04b
commit ea8b792936
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=84089
5 changed files with 34 additions and 18 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= gswitchit
PORTVERSION= 2.3.1
PORTREVISION= 1
PORTVERSION= 2.3.3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gswitchit

View File

@ -1 +1 @@
MD5 (gswitchit-2.3.1.tar.gz) = afb96539e1a5a90cf316d1494a670edf
MD5 (gswitchit-2.3.3.tar.gz) = 883728c7752d5d75ccd3c15fb92f6faf

View File

@ -0,0 +1,29 @@
--- capplets/xkb_capplet_preview.c.orig Wed Jul 2 19:50:07 2003
+++ capplets/xkb_capplet_preview.c Wed Jul 2 19:56:26 2003
@@ -35,8 +35,9 @@
static void XkbCappletPreviewRealized( GtkWidget * bonoboWidget,
GSwitchItCapplet * gswic )
{
+ GtkWidget *bonoboWindow;
XklDebug( 150, "REALIZED\n" );
- GtkWidget *bonoboWindow =
+ bonoboWindow =
GTK_WIDGET( g_object_get_data( G_OBJECT( gswic->capplet ),
PREVIEW_BONOBO_WINDOW_PROPERTY ) );
@@ -110,12 +111,13 @@
} else
{
// Existing bonobo window
- XklDebug( 150, "Reusing existing bonobo window\n" );
GtkWidget *oldChild;
+ BonoboUIEngine *uiEngine;
+ XklDebug( 150, "Reusing existing bonobo window\n" );
bonoboWindow = GTK_WIDGET( bw );
bonobo_window_set_contents( BONOBO_WINDOW( bonoboWindow ), NULL );
uiContainer = bonobo_ui_container_new( );
- BonoboUIEngine *uiEngine =
+ uiEngine =
bonobo_window_get_ui_engine( BONOBO_WINDOW( bonoboWindow ) );
bonobo_ui_container_set_engine( uiContainer, uiEngine );
}

View File

@ -1,11 +0,0 @@
--- common/gswitchit_config.c.orig Mon Jun 9 09:02:24 2003
+++ common/gswitchit_config.c Mon Jun 9 09:03:28 2003
@@ -660,7 +660,7 @@
for( i = data.numOptions; --i >= 0; )
{
char group[XKL_MAX_CI_NAME_LENGTH];
- char *delim = strchr( *p, ':' );
+ char *delim = *p ? strchr( *p, ':' ) : NULL;
int len;
if( ( delim != NULL ) &&
( ( len = ( delim - *p ) ) < XKL_MAX_CI_NAME_LENGTH ) )

View File

@ -9,7 +9,6 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/XKB/%gconf.xml
etc/gconf/schemas/gswitchit.schemas
libdata/bonobo/servers/GNOME_GSwitchItApplet.server
libexec/gswitchit-applet
share/gnome/control-center-2.0/capplets/gswitchit-properties.desktop
share/gnome/control-center-2.0/capplets/xkb-properties.desktop
share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml
share/gnome/gswitchit/interfaces/gswitchit-properties.glade
@ -125,8 +124,6 @@ share/gnome/pixmaps/gswitchit/pt.xpm
share/gnome/pixmaps/gswitchit/qc.xpm
share/gnome/pixmaps/gswitchit/ro.xpm
share/gnome/pixmaps/gswitchit/ru.xpm
share/gnome/pixmaps/gswitchit/ru7.xpm
share/gnome/pixmaps/gswitchit/ru_new.xpm
share/gnome/pixmaps/gswitchit/sa.xpm
share/gnome/pixmaps/gswitchit/si.xpm
share/gnome/pixmaps/gswitchit/sk.xpm
@ -140,7 +137,6 @@ share/gnome/pixmaps/gswitchit/tr.xpm
share/gnome/pixmaps/gswitchit/ua.xpm
share/gnome/pixmaps/gswitchit/uk.xpm
share/gnome/pixmaps/gswitchit/us.xpm
share/gnome/pixmaps/gswitchit/us_new.xpm
share/gnome/pixmaps/gswitchit/uy.xpm
share/gnome/pixmaps/gswitchit/vn.xpm
share/gnome/pixmaps/gswitchit/ye.xpm
@ -154,14 +150,17 @@ share/locale/el/LC_MESSAGES/gswitchit.mo
share/locale/es/LC_MESSAGES/gswitchit.mo
share/locale/fa/LC_MESSAGES/gswitchit.mo
share/locale/fr/LC_MESSAGES/gswitchit.mo
share/locale/he/LC_MESSAGES/gswitchit.mo
share/locale/ja/LC_MESSAGES/gswitchit.mo
share/locale/lv/LC_MESSAGES/gswitchit.mo
share/locale/ml/LC_MESSAGES/gswitchit.mo
share/locale/mn/LC_MESSAGES/gswitchit.mo
share/locale/nl/LC_MESSAGES/gswitchit.mo
share/locale/no/LC_MESSAGES/gswitchit.mo
share/locale/pt/LC_MESSAGES/gswitchit.mo
share/locale/pt_BR/LC_MESSAGES/gswitchit.mo
share/locale/ru/LC_MESSAGES/gswitchit.mo
share/locale/sq/LC_MESSAGES/gswitchit.mo
share/locale/sr/LC_MESSAGES/gswitchit.mo
share/locale/sr@Latn/LC_MESSAGES/gswitchit.mo
share/locale/sv/LC_MESSAGES/gswitchit.mo