From 5694c35edb56bb605fa38c906221bd1e1e1d65c0 Mon Sep 17 00:00:00 2001 From: billh Date: Fri, 3 Sep 2004 11:54:59 +0000 Subject: [PATCH] Fixed C99isms in atk-bridge/bridge.c, cspi/bonobo/cspi-bonobo.c. Patch from Jens Granseuer. git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@700 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- ChangeLog | 8 ++++++++ atk-bridge/bridge.c | 5 +++-- cspi/bonobo/cspi-bonobo.c | 5 +++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6726fc7..1ca0b01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-09-03 Bill Haneman + + * cspi/bonobo/cspi-bonobo.c: + (cspi_display_name): Fix C99ism. + * atk-bridge/bridge.c: + (spi_display_name): Fix C99ism. + Patch from Jens Granseuer, jensgr@gmx.net. + 2004-09-03 Gora Mohanty * configure.in: Added "or" to ALL_LINGUAS. diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c index 0807285..6161b19 100644 --- a/atk-bridge/bridge.c +++ b/atk-bridge/bridge.c @@ -287,9 +287,10 @@ spi_display_name (void) canonical_display_name = ":0"; else { + gchar *display_p, *screen_p; canonical_display_name = g_strdup (display_env); - gchar *display_p = strrchr (canonical_display_name, ':'); - gchar *screen_p = strrchr (canonical_display_name, '.'); + display_p = strrchr (canonical_display_name, ':'); + screen_p = strrchr (canonical_display_name, '.'); if (screen_p && display_p && ((guint) screen_p > (guint) display_p)) { *screen_p = '\0'; diff --git a/cspi/bonobo/cspi-bonobo.c b/cspi/bonobo/cspi-bonobo.c index fde0f0a..0ab14a8 100644 --- a/cspi/bonobo/cspi-bonobo.c +++ b/cspi/bonobo/cspi-bonobo.c @@ -96,9 +96,10 @@ cspi_display_name (void) canonical_display_name = ":0"; else { + gchar *display_p, *screen_p; canonical_display_name = g_strdup (display_env); - gchar *display_p = strrchr (canonical_display_name, ':'); - gchar *screen_p = strrchr (canonical_display_name, '.'); + display_p = strrchr (canonical_display_name, ':'); + screen_p = strrchr (canonical_display_name, '.'); if (screen_p && display_p && ((guint) screen_p > (guint) display_p)) { *screen_p = '\0'; -- 2.7.4