[Xfce4-commits] <terminal:master> Remove some unused functions and make some static.
Nick Schermer
noreply at xfce.org
Wed Dec 16 21:08:01 CET 2009
Updating branch refs/heads/master
to a7e1daeb5780ef256208142c8954b47fbe874246 (commit)
from 6e234a91925dbcb095186d3e1a37672ccbe2dc4f (commit)
commit a7e1daeb5780ef256208142c8954b47fbe874246
Author: Nick Schermer <nick at xfce.org>
Date: Wed Dec 16 21:05:39 2009 +0100
Remove some unused functions and make some static.
terminal/terminal-app.c | 81 +++++++++++++++++++++-----------------------
terminal/terminal-app.h | 3 --
terminal/terminal-screen.c | 19 ----------
terminal/terminal-screen.h | 1 -
terminal/terminal-window.c | 17 ---------
terminal/terminal-window.h | 3 --
6 files changed, 39 insertions(+), 85 deletions(-)
diff --git a/terminal/terminal-app.c b/terminal/terminal-app.c
index 3401ed4..ecf15ce 100644
--- a/terminal/terminal-app.c
+++ b/terminal/terminal-app.c
@@ -67,6 +67,8 @@ static void terminal_app_window_destroyed (GtkWidget
static void terminal_app_save_yourself (ExoXsessionClient *client,
TerminalApp *app);
static GdkScreen *terminal_app_find_screen (const gchar *display_name);
+static void terminal_app_open_window (TerminalApp *app,
+ TerminalWindowAttr *attr);
@@ -440,48 +442,9 @@ terminal_app_find_screen (const gchar *display_name)
-/**
- * terminal_app_process:
- * @app
- * @argv
- * @argc
- * @error
- *
- * Return value:
- **/
-gboolean
-terminal_app_process (TerminalApp *app,
- gchar **argv,
- gint argc,
- GError **error)
-{
- GSList *attrs, *lp;
-
- attrs = terminal_window_attr_parse (argc, argv, error);
- if (G_UNLIKELY (attrs == NULL))
- return FALSE;
-
- for (lp = attrs; lp != NULL; lp = lp->next)
- {
- terminal_app_open_window (app, lp->data);
- terminal_window_attr_free (lp->data);
- }
-
- g_slist_free (attrs);
-
- return TRUE;
-}
-
-
-
-/**
- * terminal_app_open_window:
- * @app : A #TerminalApp object.
- * @attr : The attributes for the new window.
- **/
-void
-terminal_app_open_window (TerminalApp *app,
- TerminalWindowAttr *attr)
+static void
+terminal_app_open_window (TerminalApp *app,
+ TerminalWindowAttr *attr)
{
TerminalTabAttr *tab_attr;
GdkDisplay *display;
@@ -573,3 +536,37 @@ terminal_app_open_window (TerminalApp *app,
G_CALLBACK (terminal_app_save_yourself), app);
}
}
+
+
+
+/**
+ * terminal_app_process:
+ * @app
+ * @argv
+ * @argc
+ * @error
+ *
+ * Return value:
+ **/
+gboolean
+terminal_app_process (TerminalApp *app,
+ gchar **argv,
+ gint argc,
+ GError **error)
+{
+ GSList *attrs, *lp;
+
+ attrs = terminal_window_attr_parse (argc, argv, error);
+ if (G_UNLIKELY (attrs == NULL))
+ return FALSE;
+
+ for (lp = attrs; lp != NULL; lp = lp->next)
+ {
+ terminal_app_open_window (app, lp->data);
+ terminal_window_attr_free (lp->data);
+ }
+
+ g_slist_free (attrs);
+
+ return TRUE;
+}
diff --git a/terminal/terminal-app.h b/terminal/terminal-app.h
index 8471f2b..5b30336 100644
--- a/terminal/terminal-app.h
+++ b/terminal/terminal-app.h
@@ -60,9 +60,6 @@ gboolean terminal_app_process (TerminalApp *app,
gint argc,
GError **error);
-void terminal_app_open_window (TerminalApp *app,
- TerminalWindowAttr *attr);
-
G_END_DECLS
#endif /* !__TERMINAL_APP_H__ */
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 047a2cd..88dd111 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -1642,25 +1642,6 @@ terminal_screen_set_working_directory (TerminalScreen *screen,
/**
- * terminal_screen_get_hold:
- * @screen : A #TerminalScreen.
- *
- * Checks whether the terminal screen will be destroyed when
- * the child exits.
- *
- * Return value: %TRUE if @screen will be destroyed once
- * it's child exits.
- **/
-gboolean
-terminal_screen_get_hold (TerminalScreen *screen)
-{
- terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
- return screen->hold;
-}
-
-
-
-/**
* terminal_screen_set_hold:
* @screen : A #TerminalScreen.
* @hold : %TRUE to keep @screen around when the child exits.
diff --git a/terminal/terminal-screen.h b/terminal/terminal-screen.h
index 1b0a9af..a7630d9 100644
--- a/terminal/terminal-screen.h
+++ b/terminal/terminal-screen.h
@@ -66,7 +66,6 @@ const gchar *terminal_screen_get_working_directory (TerminalScreen *scree
void terminal_screen_set_working_directory (TerminalScreen *screen,
const gchar *directory);
-gboolean terminal_screen_get_hold (TerminalScreen *screen);
void terminal_screen_set_hold (TerminalScreen *screen,
gboolean hold);
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index 0a15062..4b475e0 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -1740,23 +1740,6 @@ terminal_window_add (TerminalWindow *window,
/**
- * terminal_window_remove:
- * @window : A #TerminalWindow.
- * @screen : A #TerminalScreen.
- **/
-void
-terminal_window_remove (TerminalWindow *window,
- TerminalScreen *screen)
-{
- terminal_return_if_fail (TERMINAL_IS_WINDOW (window));
- terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
-
- gtk_widget_destroy (GTK_WIDGET (screen));
-}
-
-
-
-/**
* terminal_window_get_active:
* @window : a #TerminalWindow.
*
diff --git a/terminal/terminal-window.h b/terminal/terminal-window.h
index aa81595..53c709e 100644
--- a/terminal/terminal-window.h
+++ b/terminal/terminal-window.h
@@ -52,9 +52,6 @@ GtkWidget *terminal_window_new (gboolean fullsc
void terminal_window_add (TerminalWindow *window,
TerminalScreen *screen);
-void terminal_window_remove (TerminalWindow *window,
- TerminalScreen *screen);
-
TerminalScreen *terminal_window_get_active (TerminalWindow *window);
GSList *terminal_window_get_restart_command (TerminalWindow *window);
More information about the Xfce4-commits
mailing list