gnome-terminal r3079 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Wed Sep 24 20:11:05 2008
New Revision: 3079
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3079&view=rev

Log:
Rename.

Added:
   trunk/src/eggshell.c
      - copied, changed from r3078, /trunk/src/eggusershell.c
   trunk/src/eggshell.h
      - copied, changed from r3078, /trunk/src/eggusershell.h
Removed:
   trunk/src/eggusershell.c
   trunk/src/eggusershell.h
Modified:
   trunk/src/Makefile.am
   trunk/src/terminal-screen.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Sep 24 20:11:05 2008
@@ -5,8 +5,8 @@
 bin_PROGRAMS = gnome-terminal
 
 gnome_terminal_SOURCES= \
-	eggusershell.c \
-	eggusershell.h \
+	eggshell.c \
+	eggshell.h \
 	encoding.c \
 	encoding.h \
 	profile-editor.c \

Copied: trunk/src/eggshell.c (from r3078, /trunk/src/eggusershell.c)
==============================================================================
--- /trunk/src/eggusershell.c	(original)
+++ trunk/src/eggshell.c	Wed Sep 24 20:11:05 2008
@@ -34,7 +34,7 @@
 
 #include <config.h>
 
-#include "eggusershell.h"
+#include "eggshell.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -47,14 +47,14 @@
 #include <glib.h>
 
 /**
- * egg_user_shell:
+ * egg_shell:
  *
  * Retrieves the user's preferred shell.
  *
  * Returns: A newly allocated string that is the path to the shell.
  */
 char *
-egg_user_shell (void)
+egg_shell (void)
 {
 #ifndef G_OS_WIN32
 	struct passwd *pw;
@@ -93,7 +93,7 @@
 	}
 
 	/* If /bin/sh doesn't exist, your system is truly broken.  */
-	abort ();
+	g_assert_not_reached ();
 
 	/* Placate compiler.  */
 	return NULL;

Copied: trunk/src/eggshell.h (from r3078, /trunk/src/eggusershell.h)
==============================================================================
--- /trunk/src/eggusershell.h	(original)
+++ trunk/src/eggshell.h	Wed Sep 24 20:11:05 2008
@@ -33,7 +33,7 @@
 G_BEGIN_DECLS
 
 /* Find the name of the user's shell.  */
-char *egg_user_shell (void);
+char *egg_shell (void);
 
 G_END_DECLS
 

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Wed Sep 24 20:11:05 2008
@@ -40,7 +40,7 @@
 #include "terminal-util.h"
 #include "terminal-window.h"
 
-#include "eggusershell.h"
+#include "eggshell.h"
 
 #define HTTP_PROXY_DIR "/system/http_proxy"
 
@@ -1140,7 +1140,7 @@
       const char *only_name;
       char *shell;
 
-      shell = egg_user_shell ();
+      shell = egg_shell ();
 
       file = g_strdup (shell);