[Xfce4-commits] r30351 - terminal/trunk/terminal
Nick Schermer
nick at xfce.org
Sun Jul 19 17:31:07 CEST 2009
Author: nick
Date: 2009-07-19 15:31:07 +0000 (Sun, 19 Jul 2009)
New Revision: 30351
Modified:
terminal/trunk/terminal/main.c
terminal/trunk/terminal/terminal-accel-map.c
terminal/trunk/terminal/terminal-accel-map.h
terminal/trunk/terminal/terminal-app.c
terminal/trunk/terminal/terminal-app.h
terminal/trunk/terminal/terminal-preferences-dialog.c
terminal/trunk/terminal/terminal-screen.c
terminal/trunk/terminal/terminal-screen.h
terminal/trunk/terminal/terminal-shortcut-editor.c
terminal/trunk/terminal/terminal-shortcut-editor.h
terminal/trunk/terminal/terminal-toolbars-view.c
terminal/trunk/terminal/terminal-toolbars-view.h
terminal/trunk/terminal/terminal-widget.c
terminal/trunk/terminal/terminal-widget.h
terminal/trunk/terminal/terminal-window.c
Log:
Cleanup some code.
Modified: terminal/trunk/terminal/main.c
===================================================================
--- terminal/trunk/terminal/main.c 2009-07-18 22:00:39 UTC (rev 30350)
+++ terminal/trunk/terminal/main.c 2009-07-19 15:31:07 UTC (rev 30351)
@@ -255,7 +255,7 @@
/* set default window icon */
gtk_window_set_default_icon_name ("Terminal");
- app = terminal_app_new ();
+ app = g_object_new (TERMINAL_TYPE_APP, NULL);
#ifdef HAVE_DBUS
if (!options->disable_server)
Modified: terminal/trunk/terminal/terminal-accel-map.c
===================================================================
--- terminal/trunk/terminal/terminal-accel-map.c 2009-07-18 22:00:39 UTC (rev 30350)
+++ terminal/trunk/terminal/terminal-accel-map.c 2009-07-19 15:31:07 UTC (rev 30351)
@@ -208,16 +208,3 @@
}
g_free (property);
}
-
-
-
-/**
- * terminal_accel_map_new:
- *
- * Return value :
- **/
-TerminalAccelMap*
-terminal_accel_map_new (void)
-{
- return g_object_new (TERMINAL_TYPE_ACCEL_MAP, NULL);
-}
Modified: terminal/trunk/terminal/terminal-accel-map.h
===================================================================
--- terminal/trunk/terminal/terminal-accel-map.h 2009-07-18 22:00:39 UTC (rev 30350)
+++ terminal/trunk/terminal/terminal-accel-map.h 2009-07-19 15:31:07 UTC (rev 30351)
@@ -43,8 +43,6 @@
GType terminal_accel_map_get_type (void) G_GNUC_CONST;
-TerminalAccelMap *terminal_accel_map_new (void);
-
G_END_DECLS
#endif /* !__TERMINAL_ACCEL_MAP_H__ */
Modified: terminal/trunk/terminal/terminal-app.c
===================================================================
--- terminal/trunk/terminal/terminal-app.c 2009-07-18 22:00:39 UTC (rev 30350)
+++ terminal/trunk/terminal/terminal-app.c 2009-07-19 15:31:07 UTC (rev 30351)
@@ -127,7 +127,7 @@
terminal_app_update_accels (app);
/* connect the accel map */
- app->accel_map = terminal_accel_map_new ();
+ app->accel_map = g_object_new (TERMINAL_TYPE_ACCEL_MAP, NULL);
}
@@ -423,19 +423,6 @@
/**
- * terminal_app_new:
- *
- * Return value :
- **/
-TerminalApp*
-terminal_app_new (void)
-{
- return g_object_new (TERMINAL_TYPE_APP, NULL);
-}
-
-
-
-/**
* terminal_app_process:
* @app
* @argv
@@ -517,7 +504,7 @@
for (lp = attr->tabs; lp != NULL; lp = lp->next)
{
- terminal = terminal_screen_new ();
+ terminal = g_object_new (TERMINAL_TYPE_SCREEN, NULL);
tab_attr = lp->data;
if (tab_attr->command != NULL)
Modified: terminal/trunk/terminal/terminal-app.h
===================================================================
--- terminal/trunk/terminal/terminal-app.h 2009-07-18 22:00:39 UTC (rev 30350)
+++ terminal/trunk/terminal/terminal-app.h 2009-07-19 15:31:07 UTC (rev 30351)
@@ -53,8 +53,6 @@
GType terminal_app_get_type (void) G_GNUC_CONST;
-TerminalApp *terminal_app_new (void);
-
gboolean terminal_app_process (TerminalApp *app,
gchar **argv,
gint argc,
Modified: terminal/trunk/terminal/terminal-preferences-dialog.c
===================================================================
--- terminal/trunk/terminal/terminal-preferences-dialog.c 2009-07-18 22:00:39 UTC (rev 30350)
+++ terminal/trunk/terminal/terminal-preferences-dialog.c 2009-07-19 15:31:07 UTC (rev 30351)
@@ -170,7 +170,7 @@
G_CALLBACK (terminal_preferences_dialog_reset_compat), dialog);
/* add shortcuts editor */
- editor = terminal_shortcut_editor_new ();
+ editor = g_object_new (TERMINAL_TYPE_SHORTCUT_EDITOR, NULL);
object = gtk_builder_get_object (GTK_BUILDER (dialog), "editor-container");
terminal_return_if_fail (G_IS_OBJECT (object));
gtk_container_add (GTK_CONTAINER (object), editor);
Modified: terminal/trunk/terminal/terminal-screen.c
===================================================================
--- terminal/trunk/terminal/terminal-screen.c 2009-07-18 22:00:39 UTC (rev 30350)
+++ terminal/trunk/terminal/terminal-screen.c 2009-07-19 15:31:07 UTC (rev 30351)
@@ -223,11 +223,8 @@
terminal_screen_init (TerminalScreen *screen)
{
screen->working_directory = g_get_current_dir ();
- screen->custom_title = NULL;
- screen->last_size_change = 0;
- screen->activity_timeout_id = 0;
- screen->terminal = terminal_widget_new ();
+ screen->terminal = g_object_new (TERMINAL_TYPE_WIDGET, NULL);
g_object_connect (G_OBJECT (screen->terminal),
"signal::child-exited", G_CALLBACK (terminal_screen_vte_child_exited), screen,
"signal::eof", G_CALLBACK (terminal_screen_vte_eof), screen,
@@ -1100,19 +1097,6 @@
/**
- * terminal_screen_new:
- *
- * Return value :
- **/
-GtkWidget*
-terminal_screen_new (void)
-{
- return g_object_new (TERMINAL_TYPE_SCREEN, NULL);
-}
-
-
-
-/**
* terminal_screen_launch_child:
* @screen : A #TerminalScreen.
*
Modified: terminal/trunk/terminal/terminal-screen.h
===================================================================
--- terminal/trunk/terminal/terminal-screen.h 2009-07-18 22:00:39 UTC (rev 30350)
+++ terminal/trunk/terminal/terminal-screen.h 2009-07-19 15:31:07 UTC (rev 30351)
@@ -38,8 +38,6 @@
GType terminal_screen_get_type (void) G_GNUC_CONST;
-GtkWidget *terminal_screen_new (void);
-
void terminal_screen_launch_child (TerminalScreen *screen);
void terminal_screen_set_custom_command (TerminalScreen *screen,
Modified: terminal/trunk/terminal/terminal-shortcut-editor.c
===================================================================
--- terminal/trunk/terminal/terminal-shortcut-editor.c 2009-07-18 22:00:39 UTC (rev 30350)
+++ terminal/trunk/terminal/terminal-shortcut-editor.c 2009-07-19 15:31:07 UTC (rev 30351)
@@ -511,18 +511,3 @@
g_free (accel);
}
-
-
-
-/**
- * terminal_shortcut_editor_new:
- *
- * Return value :
- **/
-GtkWidget*
-terminal_shortcut_editor_new (void)
-{
- return g_object_new (TERMINAL_TYPE_SHORTCUT_EDITOR, NULL);
-}
-
-
Modified: terminal/trunk/terminal/terminal-shortcut-editor.h
===================================================================
--- terminal/trunk/terminal/terminal-shortcut-editor.h 2009-07-18 22:00:39 UTC (rev 30350)
+++ terminal/trunk/terminal/terminal-shortcut-editor.h 2009-07-19 15:31:07 UTC (rev 30351)
@@ -43,8 +43,6 @@
GType terminal_shortcut_editor_get_type (void) G_GNUC_CONST;
-GtkWidget *terminal_shortcut_editor_new (void);
-
G_END_DECLS
#endif /* !__TERMINAL_SHORTCUT_EDITOR_H__ */
Modified: terminal/trunk/terminal/terminal-toolbars-view.c
===================================================================
--- terminal/trunk/terminal/terminal-toolbars-view.c 2009-07-18 22:00:39 UTC (rev 30350)
+++ terminal/trunk/terminal/terminal-toolbars-view.c 2009-07-19 15:31:07 UTC (rev 30351)
@@ -88,24 +88,6 @@
/**
- * terminal_toolbars_view_new:
- * @ui_manager : The #GtkUIManager to use for this toolbar.
- *
- * Return value : A new #TerminalToolbarsView.
- **/
-GtkWidget*
-terminal_toolbars_view_new (GtkUIManager *ui_manager)
-{
- terminal_return_val_if_fail (GTK_IS_UI_MANAGER (ui_manager), NULL);
-
- return g_object_new (TERMINAL_TYPE_TOOLBARS_VIEW,
- "ui-manager", ui_manager,
- NULL);
-}
-
-
-
-/**
* terminal_toolbars_view_edit:
* @toolbar : A #TerminalToolbarsView.
**/
Modified: terminal/trunk/terminal/terminal-toolbars-view.h
===================================================================
--- terminal/trunk/terminal/terminal-toolbars-view.h 2009-07-18 22:00:39 UTC (rev 30350)
+++ terminal/trunk/terminal/terminal-toolbars-view.h 2009-07-19 15:31:07 UTC (rev 30351)
@@ -50,8 +50,6 @@
GType terminal_toolbars_view_get_type (void) G_GNUC_CONST;
-GtkWidget *terminal_toolbars_view_new (GtkUIManager *ui_manager);
-
void terminal_toolbars_view_edit (TerminalToolbarsView *toolbar);
G_END_DECLS
Modified: terminal/trunk/terminal/terminal-widget.c
===================================================================
--- terminal/trunk/terminal/terminal-widget.c 2009-07-18 22:00:39 UTC (rev 30350)
+++ terminal/trunk/terminal/terminal-widget.c 2009-07-19 15:31:07 UTC (rev 30351)
@@ -772,16 +772,3 @@
}
}
}
-
-
-
-/**
- * terminal_widget_new:
- *
- * Return value:
- **/
-GtkWidget*
-terminal_widget_new (void)
-{
- return g_object_new (TERMINAL_TYPE_WIDGET, NULL);
-}
Modified: terminal/trunk/terminal/terminal-widget.h
===================================================================
--- terminal/trunk/terminal/terminal-widget.h 2009-07-18 22:00:39 UTC (rev 30350)
+++ terminal/trunk/terminal/terminal-widget.h 2009-07-19 15:31:07 UTC (rev 30351)
@@ -50,7 +50,6 @@
typedef struct _TerminalWidgetClass TerminalWidgetClass;
GType terminal_widget_get_type (void) G_GNUC_CONST;
-GtkWidget *terminal_widget_new (void);
G_END_DECLS
Modified: terminal/trunk/terminal/terminal-window.c
===================================================================
--- terminal/trunk/terminal/terminal-window.c 2009-07-18 22:00:39 UTC (rev 30350)
+++ terminal/trunk/terminal/terminal-window.c 2009-07-19 15:31:07 UTC (rev 30351)
@@ -314,7 +314,6 @@
GtkRcStyle *style;
window->preferences = terminal_preferences_get ();
- window->active = NULL;
/* The Terminal size needs correction when the font name or the scrollbar
* visibility is changed.
@@ -1270,7 +1269,7 @@
const gchar *directory;
GtkWidget *terminal;
- terminal = terminal_screen_new ();
+ terminal = g_object_new (TERMINAL_TYPE_SCREEN, NULL);
if (G_LIKELY (window->active != NULL))
{
@@ -1423,6 +1422,8 @@
{
GtkAction *action_edit;
GtkWidget *vbox;
+
+ terminal_return_if_fail (GTK_IS_UI_MANAGER (window->ui_manager));
action_edit = gtk_action_group_get_action (window->action_group,
"edit-toolbars");
@@ -1433,7 +1434,8 @@
{
vbox = gtk_bin_get_child (GTK_BIN (window));
- window->toolbars = terminal_toolbars_view_new (window->ui_manager);
+ window->toolbars = g_object_new (TERMINAL_TYPE_TOOLBARS_VIEW,
+ "ui-manager", window->ui_manager, NULL);
gtk_box_pack_start (GTK_BOX (vbox), window->toolbars, FALSE, FALSE, 0);
gtk_box_reorder_child (GTK_BOX (vbox), window->toolbars, 1);
gtk_widget_show (window->toolbars);
More information about the Xfce4-commits
mailing list