[gnome-panel] multiscreen: remove unused function
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel] multiscreen: remove unused function
- Date: Wed, 20 Jul 2016 11:49:37 +0000 (UTC)
commit f89661d8489a75d1c356925c6e53e8ccc9d7fbb9
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Wed Jul 20 14:46:23 2016 +0300
multiscreen: remove unused function
configure.ac | 3 --
gnome-panel/panel-multiscreen.c | 43 ---------------------------------------
gnome-panel/panel-multiscreen.h | 2 -
3 files changed, 0 insertions(+), 48 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 675a67c..45ed9c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,9 +96,6 @@ m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below
PANEL_INTLTOOL_PANEL_APPLET_RULE='%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard
$(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
AC_SUBST([PANEL_INTLTOOL_PANEL_APPLET_RULE])
-AC_CHECK_HEADERS(crt_externs.h)
-AC_CHECK_FUNCS(_NSGetEnviron)
-
LIBGNOME_DESKTOP_REQUIRED=2.91.0
GDK_PIXBUF_REQUIRED=2.25.2
PANGO_REQUIRED=1.15.4
diff --git a/gnome-panel/panel-multiscreen.c b/gnome-panel/panel-multiscreen.c
index 9512cf3..bea12ad 100644
--- a/gnome-panel/panel-multiscreen.c
+++ b/gnome-panel/panel-multiscreen.c
@@ -34,13 +34,6 @@
#include <string.h>
-#if defined(HAVE_CRT_EXTERNS_H) && defined(HAVE__NSGETENVIRON)
-#include <crt_externs.h> /* for _NSGetEnviron */
-#define environ (*_NSGetEnviron())
-#else
-extern char **environ;
-#endif
-
static int screens = 0;
static int *monitors = NULL;
static GdkRectangle **geometries = NULL;
@@ -733,39 +726,3 @@ panel_multiscreen_is_at_visible_extreme (GdkScreen *screen,
}
}
}
-
-char **
-panel_make_environment_for_screen (GdkScreen *screen,
- char **envp)
-{
- char **retval = NULL;
- char *display_name;
- int display_index = -1;
- int i, env_len;
-
- g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
- if (envp == NULL)
- envp = environ;
-
- for (env_len = 0; envp[env_len]; env_len++)
- if (strncmp (envp[env_len], "DISPLAY", strlen ("DISPLAY")) == 0)
- display_index = env_len;
-
- retval = g_new (char *, env_len + 1);
- retval[env_len] = NULL;
-
- display_name = gdk_screen_make_display_name (screen);
-
- for (i = 0; i < env_len; i++)
- if (i == display_index)
- retval[i] = g_strconcat ("DISPLAY=", display_name, NULL);
- else
- retval[i] = g_strdup (envp[i]);
-
- g_assert (i == env_len);
-
- g_free (display_name);
-
- return retval;
-}
diff --git a/gnome-panel/panel-multiscreen.h b/gnome-panel/panel-multiscreen.h
index dd31b89..2e4934c 100644
--- a/gnome-panel/panel-multiscreen.h
+++ b/gnome-panel/panel-multiscreen.h
@@ -52,7 +52,5 @@ void panel_multiscreen_is_at_visible_extreme (GdkScreen *screen,
gboolean *rightmost,
gboolean *topmost,
gboolean *bottommost);
-char **panel_make_environment_for_screen (GdkScreen *screen,
- char **envp);
#endif /* __PANEL_MULTISCREEN_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]