X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fcallbacks.c;h=ec29ff6c054d8e56bfcd54e04bd999cb2b2a825f;hb=0884cb45aeeb60a46effe1d1056a61fe68300ea7;hp=682b90cf6a755cc36473affaf666b924683694f4;hpb=bc4ca95f1c72e6e30b9b5df7e809c1ba1abbd308;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index 682b90cf..ec29ff6c 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -29,11 +29,15 @@ #include #include + +#if !defined(_NO_UPDATE_CHECK) #if defined(_OLD_WEBKIT) #include #else #include #endif +#endif + #include #include #else @@ -2972,6 +2976,7 @@ ghb_timer_cb(gpointer data) update_preview = FALSE; } +#if !defined(_NO_UPDATE_CHECK) if (!appcast_busy) { gchar *updates; @@ -3002,6 +3007,7 @@ ghb_timer_cb(gpointer data) } } } +#endif return TRUE; } @@ -4664,6 +4670,7 @@ process_appcast(signal_user_data_t *ud) gtk_label_set_text(GTK_LABEL(label), msg); #if !defined(_WIN32) +#if !defined(_NO_UPDATE_CHECK) if (html == NULL) { html = webkit_web_view_new(); @@ -4675,6 +4682,7 @@ process_appcast(signal_user_data_t *ud) } webkit_web_view_open(WEBKIT_WEB_VIEW(html), description); #endif +#endif dialog = GHB_WIDGET(ud->builder, "update_dialog"); response = gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_hide(dialog); @@ -4730,7 +4738,10 @@ ghb_net_recv_cb(GIOChannel *ioc, GIOCondition cond, gpointer data) } if (status == G_IO_STATUS_EOF) { - ud->appcast[ud->appcast_len] = 0; + if ( ud->appcast != NULL ) + { + ud->appcast[ud->appcast_len] = 0; + } ghb_net_close(ioc); process_appcast(ud); return FALSE;