[Xfce4-commits] r30349 - terminal/trunk/terminal
Nick Schermer
nick at xfce.org
Sat Jul 18 23:57:37 CEST 2009
Author: nick
Date: 2009-07-18 21:57:37 +0000 (Sat, 18 Jul 2009)
New Revision: 30349
Modified:
terminal/trunk/terminal/main.c
terminal/trunk/terminal/terminal-app.c
terminal/trunk/terminal/terminal-window.c
terminal/trunk/terminal/terminal-window.h
Log:
Cleanup some more code.
Modified: terminal/trunk/terminal/main.c
===================================================================
--- terminal/trunk/terminal/main.c 2009-07-18 18:07:25 UTC (rev 30348)
+++ terminal/trunk/terminal/main.c 2009-07-18 21:57:37 UTC (rev 30349)
@@ -157,7 +157,7 @@
/* Do NOT remove this line for now, If something doesn't work,
* fix your code instead!
*/
- //g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+ g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL /* | G_LOG_LEVEL_WARNING */);
#endif
if (!terminal_options_parse (argc, argv, NULL, &options, &error))
Modified: terminal/trunk/terminal/terminal-app.c
===================================================================
--- terminal/trunk/terminal/terminal-app.c 2009-07-18 18:07:25 UTC (rev 30348)
+++ terminal/trunk/terminal/terminal-app.c 2009-07-18 21:57:37 UTC (rev 30349)
@@ -52,8 +52,7 @@
gboolean fullscreen,
TerminalVisibility menubar,
TerminalVisibility borders,
- TerminalVisibility toolbars,
- gboolean maximize);
+ TerminalVisibility toolbars);
static void terminal_app_new_window (TerminalWindow *window,
const gchar *working_directory,
TerminalApp *app);
@@ -192,12 +191,11 @@
gboolean fullscreen,
TerminalVisibility menubar,
TerminalVisibility borders,
- TerminalVisibility toolbars,
- gboolean maximize)
+ TerminalVisibility toolbars)
{
GtkWidget *window;
- window = terminal_window_new (fullscreen, menubar, borders, toolbars, maximize);
+ window = terminal_window_new (fullscreen, menubar, borders, toolbars);
g_signal_connect (G_OBJECT (window), "destroy",
G_CALLBACK (terminal_app_window_destroyed), app);
g_signal_connect (G_OBJECT (window), "new-window",
@@ -269,8 +267,7 @@
window = terminal_app_create_window (app, FALSE,
TERMINAL_VISIBILITY_DEFAULT,
TERMINAL_VISIBILITY_DEFAULT,
- TERMINAL_VISIBILITY_DEFAULT,
- FALSE);
+ TERMINAL_VISIBILITY_DEFAULT);
/* set new window position */
if (x > -1 && y > -1)
@@ -494,13 +491,14 @@
attr->fullscreen,
attr->menubar,
attr->borders,
- attr->toolbars,
- attr->maximize);
+ attr->toolbars);
if (attr->role != NULL)
gtk_window_set_role (GTK_WINDOW (window), attr->role);
if (attr->startup_id != NULL)
- terminal_window_set_startup_id (TERMINAL_WINDOW (window), attr->startup_id);
+ gtk_window_set_startup_id (GTK_WINDOW (window), attr->startup_id);
+ if (attr->maximize)
+ gtk_window_maximize (GTK_WINDOW (window));
if (attr->icon != NULL)
{
Modified: terminal/trunk/terminal/terminal-window.c
===================================================================
--- terminal/trunk/terminal/terminal-window.c 2009-07-18 18:07:25 UTC (rev 30348)
+++ terminal/trunk/terminal/terminal-window.c 2009-07-18 21:57:37 UTC (rev 30349)
@@ -1256,7 +1256,7 @@
if (screen == window->active)
{
title = terminal_screen_get_title (window->active);
- //gtk_window_set_title (GTK_WINDOW (window), title);
+ gtk_window_set_title (GTK_WINDOW (window), title);
g_free (title);
}
}
@@ -1666,8 +1666,7 @@
terminal_window_new (gboolean fullscreen,
TerminalVisibility menubar,
TerminalVisibility borders,
- TerminalVisibility toolbars,
- gboolean maximize)
+ TerminalVisibility toolbars)
{
TerminalWindow *window;
GtkAction *action;
@@ -1680,10 +1679,6 @@
if (fullscreen && gtk_action_is_sensitive (action))
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
- /* maximize */
- if (maximize)
- gtk_window_maximize (GTK_WINDOW (window));
-
/* setup menubar visibility */
if (G_LIKELY (menubar == TERMINAL_VISIBILITY_DEFAULT))
g_object_get (G_OBJECT (window->preferences), "misc-menubar-default", &setting, NULL);
@@ -1788,24 +1783,6 @@
/**
- * terminal_window_set_startup_id:
- * @window
- * @startup_id
- **/
-void
-terminal_window_set_startup_id (TerminalWindow *window,
- const gchar *startup_id)
-{
- terminal_return_if_fail (TERMINAL_IS_WINDOW (window));
- terminal_return_if_fail (startup_id != NULL);
-
- if (IS_STRING (startup_id))
- gtk_window_set_startup_id (GTK_WINDOW (window), startup_id);
-}
-
-
-
-/**
* terminal_window_get_restart_command:
* @window : A #TerminalWindow.
*
Modified: terminal/trunk/terminal/terminal-window.h
===================================================================
--- terminal/trunk/terminal/terminal-window.h 2009-07-18 18:07:25 UTC (rev 30348)
+++ terminal/trunk/terminal/terminal-window.h 2009-07-18 21:57:37 UTC (rev 30349)
@@ -47,8 +47,7 @@
GtkWidget *terminal_window_new (gboolean fullscreen,
TerminalVisibility menubar,
TerminalVisibility borders,
- TerminalVisibility toolbars,
- gboolean maximize);
+ TerminalVisibility toolbars);
void terminal_window_add (TerminalWindow *window,
TerminalScreen *screen);
@@ -58,9 +57,6 @@
TerminalScreen *terminal_window_get_active (TerminalWindow *window);
-void terminal_window_set_startup_id (TerminalWindow *window,
- const gchar *startup_id);
-
GSList *terminal_window_get_restart_command (TerminalWindow *window);
G_END_DECLS
More information about the Xfce4-commits
mailing list