From 872d1975409875bb3b63b541137494751aef27c3 Mon Sep 17 00:00:00 2001 From: mutantturkey Date: Wed, 18 May 2011 23:49:55 -0400 Subject: switched to g_object_connect from g_signal_connect to clean up callbacks --- sb.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sb.c b/sb.c index 0fe7252..c08f75f 100644 --- a/sb.c +++ b/sb.c @@ -193,11 +193,11 @@ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(t->scroll), GTK_POLICY_NEVER, webkit_web_view_set_zoom_level(t->view, DEFAULT_ZOOM_LEVEL); /*callbacks*/ -g_signal_connect (G_OBJECT (t->view), "title-changed", G_CALLBACK (cb_title_changed), t); -g_signal_connect (G_OBJECT (t->view), "notify::load-status", G_CALLBACK (cb_load_status), t); -g_signal_connect (G_OBJECT (t->view), "hovering-over-link", G_CALLBACK (cb_link_hover), t->view); -g_signal_connect (G_OBJECT (t->view), "download-requested", G_CALLBACK (cb_download), t->view); -g_signal_connect (G_OBJECT (t->view), "create-web-view", G_CALLBACK (tab_new_requested), NULL); +g_object_connect (G_OBJECT (t->view), "signal::title-changed", G_CALLBACK (cb_title_changed), t, + "signal::notify::load-status", G_CALLBACK (cb_load_status), t, + "signal::hovering-over-link", G_CALLBACK (cb_link_hover), t->view, + "signal::download-requested", G_CALLBACK (cb_download), t->view, + "signal::create-web-view", G_CALLBACK (tab_new_requested), NULL, NULL); /*settings*/ g_object_set_qdata_full(G_OBJECT(gtk_notebook_get_nth_page((GtkNotebook*)w.notebook, index)), term_data_id, t, NULL); @@ -225,6 +225,7 @@ void tab_focus(GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpo gtk_statusbar_push(GTK_STATUSBAR(w.status), 0, ""); struct tab *t = get_tab(NULL, page_num); + const char *url = webkit_web_view_get_uri(t->view); const char *title = webkit_web_view_get_title(t->view); if (title == NULL && url == NULL) { -- cgit v1.2.3