This is an automated email from the git hooks/post-receive script. ochosi pushed a commit to branch master in repository apps/xfce4-terminal.
commit ba20f36918561edf187da3b1c773ab5611becdcb Author: minus <mi...@mnus.de> Date: Thu Apr 30 00:04:05 2015 +0200 fixed notebook tab signal handlers and setting of encoding Signed-off-by: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at> --- terminal/terminal-screen.c | 2 +- terminal/terminal-window.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c index 0a78fb1..3cc611e 100644 --- a/terminal/terminal-screen.c +++ b/terminal/terminal-screen.c @@ -835,7 +835,7 @@ static void terminal_screen_update_encoding (TerminalScreen *screen) { gchar *encoding; - GError *error; + GError *error = NULL; g_object_get (G_OBJECT (screen->preferences), "encoding", &encoding, NULL); if (!vte_terminal_set_encoding (VTE_TERMINAL (screen->terminal), encoding, &error)) { diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c index 02f2f5a..34358e4 100644 --- a/terminal/terminal-window.c +++ b/terminal/terminal-window.c @@ -86,9 +86,11 @@ static gboolean terminal_window_accel_activate (GtkAccelGr static void terminal_window_update_actions (TerminalWindow *window); static void terminal_window_rebuild_tabs_menu (TerminalWindow *window); static void terminal_window_notebook_page_switched (GtkNotebook *notebook, + GtkWidget *page, guint page_num, TerminalWindow *window); static void terminal_window_notebook_page_reordered (GtkNotebook *notebook, + GtkWidget *child, guint page_num, TerminalWindow *window); static void terminal_window_notebook_page_added (GtkNotebook *notebook, @@ -780,6 +782,7 @@ terminal_window_rebuild_tabs_menu (TerminalWindow *window) static void terminal_window_notebook_page_switched (GtkNotebook *notebook, + GtkWidget *page, guint page_num, TerminalWindow *window) { @@ -788,7 +791,8 @@ terminal_window_notebook_page_switched (GtkNotebook *notebook, const gchar *encoding; /* get the new active page */ - active = TERMINAL_SCREEN (gtk_notebook_get_nth_page (notebook, page_num)); + active = TERMINAL_SCREEN (page); + terminal_return_if_fail (window == NULL); terminal_return_if_fail (active == NULL || TERMINAL_IS_SCREEN (active)); /* only update when really changed */ @@ -824,6 +828,7 @@ terminal_window_notebook_page_switched (GtkNotebook *notebook, static void terminal_window_notebook_page_reordered (GtkNotebook *notebook, + GtkWidget *child, guint page_num, TerminalWindow *window) { -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits