Commit 522bb782c486833425633d9ba383c968d52d2289

Authored by Perry Werneck
1 parent 98dfac76
Exists in master and in 1 other branch develop

Indicador de SSL não estava atualizando em algumas situações.

Showing 2 changed files with 7 additions and 15 deletions   Show diff stats
oia.c
... ... @@ -1081,6 +1081,8 @@ void v3270_stop_timer(GtkWidget *widget)
1081 1081  
1082 1082 void v3270_update_ssl(H3270 *session, LIB3270_SSL_STATE state)
1083 1083 {
  1084 + debug("%s **************************************** %d",__FUNCTION__,(int) state);
  1085 +
1084 1086 v3270 * terminal = GTK_V3270(session->user_data);
1085 1087 cairo_t * cr;
1086 1088 GdkRectangle * r;
... ...
widget.c
... ... @@ -226,28 +226,22 @@ gboolean v3270_query_tooltip(GtkWidget *widget, gint x, gint y, gboolean keyboa
226 226 {
227 227 if(!lib3270_connected(GTK_V3270(widget)->host))
228 228 {
229   -#if GTK_CHECK_VERSION(2,14,0)
  229 +#ifndef _WIN32
230 230 gtk_tooltip_set_icon_from_icon_name(tooltip,"gtk-disconnect",GTK_ICON_SIZE_MENU);
231   -#else
232   - gtk_tooltip_set_icon_from_stock(tooltip,GTK_STOCK_DISCONNECT,GTK_ICON_SIZE_MENU);
233 231 #endif // GTK_CHECK_VERSION
234 232 gtk_tooltip_set_markup(tooltip,_( "<b>Identity not verified</b>\nDisconnected from host" ) );
235 233 }
236 234 else if(lib3270_get_secure(GTK_V3270(widget)->host) == LIB3270_SSL_UNSECURE)
237 235 {
238   -#if GTK_CHECK_VERSION(2,14,0)
  236 +#ifndef _WIN32
239 237 gtk_tooltip_set_icon_from_icon_name(tooltip,"dialog-information",GTK_ICON_SIZE_MENU);
240   -#else
241   - gtk_tooltip_set_icon_from_stock(tooltip,GTK_STOCK_INFO,GTK_ICON_SIZE_MENU);
242 238 #endif
243 239 gtk_tooltip_set_markup(tooltip,_( "<b>Identity not verified</b>\nThe connection is insecure" ) );
244 240 }
245 241 else if(!lib3270_get_SSL_verify_result(GTK_V3270(widget)->host))
246 242 {
247   -#if GTK_CHECK_VERSION(2,14,0)
  243 +#ifndef _WIN32
248 244 gtk_tooltip_set_icon_from_icon_name(tooltip,"gtk-dialog-authentication",GTK_ICON_SIZE_MENU);
249   -#else
250   - gtk_tooltip_set_icon_from_stock(tooltip,GTK_STOCK_DIALOG_AUTHENTICATION,GTK_ICON_SIZE_MENU);
251 245 #endif
252 246 gtk_tooltip_set_markup(tooltip,_( "<b>Identity verified</b>\nThe connection is secure" ) );
253 247 }
... ... @@ -258,10 +252,8 @@ gboolean v3270_query_tooltip(GtkWidget *widget, gint x, gint y, gboolean keyboa
258 252 if(msg)
259 253 {
260 254 gchar *text = g_strdup_printf("<b>%s</b>\n%s",_("Identity not verified"),gettext(msg->text));
261   -#if GTK_CHECK_VERSION(2,14,0)
  255 +#ifndef _WIN32
262 256 gtk_tooltip_set_icon_from_icon_name(tooltip,msg->icon,GTK_ICON_SIZE_MENU);
263   -#else
264   - gtk_tooltip_set_icon_from_stock(tooltip,msg->icon,GTK_ICON_SIZE_MENU);
265 257 #endif
266 258 gtk_tooltip_set_markup(tooltip,text);
267 259 g_free(text);
... ... @@ -269,10 +261,8 @@ gboolean v3270_query_tooltip(GtkWidget *widget, gint x, gint y, gboolean keyboa
269 261 else
270 262 {
271 263 gchar *text = g_strdup_printf(_("<b>SSL state is undefined</b>Unexpected SSL status %ld"),lib3270_get_SSL_verify_result(GTK_V3270(widget)->host));
272   -#if GTK_CHECK_VERSION(2,14,0)
  264 +#ifndef _WIN32
273 265 gtk_tooltip_set_icon_from_icon_name(tooltip,"dialog-error",GTK_ICON_SIZE_MENU);
274   -#else
275   - gtk_tooltip_set_icon_from_stock(tooltip,GTK_STOCK_DIALOG_ERROR,GTK_ICON_SIZE_MENU);
276 266 #endif // GTK_CHECK_VERSION
277 267 gtk_tooltip_set_markup(tooltip,text);
278 268 g_free(text);
... ...