comparison: pidgin/gtkwebview.c
pidgin/gtkwebview.c
- changeset 33224
- 4bb64c5ef111
- parent 33223
- 8bc668d886f4
- child 33225
- 8e4bdfb9fced
equal
deleted
inserted
replaced
| 33223:8bc668d886f4 | 33224:4bb64c5ef111 |
|---|---|
| 578 g_return_if_fail(webview != NULL); | 578 g_return_if_fail(webview != NULL); |
| 579 | 579 |
| 580 priv = GTK_WEBVIEW_GET_PRIVATE(webview); | 580 priv = GTK_WEBVIEW_GET_PRIVATE(webview); |
| 581 g_queue_push_tail(priv->load_queue, GINT_TO_POINTER(LOAD_JS)); | 581 g_queue_push_tail(priv->load_queue, GINT_TO_POINTER(LOAD_JS)); |
| 582 g_queue_push_tail(priv->load_queue, g_strdup(script)); | 582 g_queue_push_tail(priv->load_queue, g_strdup(script)); |
| 583 if (!priv->is_loading) | 583 if (!priv->is_loading && priv->loader == 0) |
| 584 g_idle_add((GSourceFunc)process_load_queue, webview); | 584 priv->loader = g_idle_add((GSourceFunc)process_load_queue, webview); |
| 585 } | 585 } |
| 586 | 586 |
| 587 void | 587 void |
| 588 gtk_webview_load_html_string(GtkWebView *webview, const char *html) | 588 gtk_webview_load_html_string(GtkWebView *webview, const char *html) |
| 589 { | 589 { |
| 620 g_return_if_fail(webview != NULL); | 620 g_return_if_fail(webview != NULL); |
| 621 | 621 |
| 622 priv = GTK_WEBVIEW_GET_PRIVATE(webview); | 622 priv = GTK_WEBVIEW_GET_PRIVATE(webview); |
| 623 g_queue_push_tail(priv->load_queue, GINT_TO_POINTER(LOAD_HTML)); | 623 g_queue_push_tail(priv->load_queue, GINT_TO_POINTER(LOAD_HTML)); |
| 624 g_queue_push_tail(priv->load_queue, g_strdup(html)); | 624 g_queue_push_tail(priv->load_queue, g_strdup(html)); |
| 625 if (!priv->is_loading) | 625 if (!priv->is_loading && priv->loader == 0) |
| 626 g_idle_add((GSourceFunc)process_load_queue, webview); | 626 priv->loader = g_idle_add((GSourceFunc)process_load_queue, webview); |
| 627 } | 627 } |
| 628 | 628 |
| 629 void | 629 void |
| 630 gtk_webview_set_vadjustment(GtkWebView *webview, GtkAdjustment *vadj) | 630 gtk_webview_set_vadjustment(GtkWebView *webview, GtkAdjustment *vadj) |
| 631 { | 631 { |
