forked from osmocom/wireshark
Fix indent and add Modelines info for new common ui source file(s)
svn path=/trunk/; revision=45765
This commit is contained in:
parent
8a7e8b3b62
commit
14f2efec2b
|
@ -42,7 +42,7 @@
|
||||||
void
|
void
|
||||||
failure_alert_box(const char *msg_format, va_list ap)
|
failure_alert_box(const char *msg_format, va_list ap)
|
||||||
{
|
{
|
||||||
vsimple_error_message_box(msg_format, ap);
|
vsimple_error_message_box(msg_format, ap);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -60,13 +60,13 @@ failure_alert_box(const char *msg_format, va_list ap)
|
||||||
void
|
void
|
||||||
open_failure_alert_box(const char *filename, int err, gboolean for_writing)
|
open_failure_alert_box(const char *filename, int err, gboolean for_writing)
|
||||||
{
|
{
|
||||||
gchar *display_basename;
|
gchar *display_basename;
|
||||||
|
|
||||||
display_basename = g_filename_display_basename(filename);
|
display_basename = g_filename_display_basename(filename);
|
||||||
simple_message_box(ESD_TYPE_ERROR, NULL, NULL,
|
simple_message_box(ESD_TYPE_ERROR, NULL, NULL,
|
||||||
file_open_error_message(err, for_writing),
|
file_open_error_message(err, for_writing),
|
||||||
display_basename);
|
display_basename);
|
||||||
g_free(display_basename);
|
g_free(display_basename);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -76,13 +76,13 @@ open_failure_alert_box(const char *filename, int err, gboolean for_writing)
|
||||||
void
|
void
|
||||||
read_failure_alert_box(const char *filename, int err)
|
read_failure_alert_box(const char *filename, int err)
|
||||||
{
|
{
|
||||||
gchar *display_basename;
|
gchar *display_basename;
|
||||||
|
|
||||||
display_basename = g_filename_display_basename(filename);
|
display_basename = g_filename_display_basename(filename);
|
||||||
simple_message_box(ESD_TYPE_ERROR, NULL, NULL,
|
simple_message_box(ESD_TYPE_ERROR, NULL, NULL,
|
||||||
"An error occurred while reading from the file \"%s\": %s.",
|
"An error occurred while reading from the file \"%s\": %s.",
|
||||||
display_basename, g_strerror(err));
|
display_basename, g_strerror(err));
|
||||||
g_free(display_basename);
|
g_free(display_basename);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -99,27 +99,40 @@ read_failure_alert_box(const char *filename, int err)
|
||||||
void
|
void
|
||||||
write_failure_alert_box(const char *filename, int err)
|
write_failure_alert_box(const char *filename, int err)
|
||||||
{
|
{
|
||||||
gchar *display_basename;
|
gchar *display_basename;
|
||||||
|
|
||||||
display_basename = g_filename_display_basename(filename);
|
display_basename = g_filename_display_basename(filename);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
switch (err) {
|
switch (err) {
|
||||||
|
|
||||||
case WTAP_ERR_SHORT_WRITE:
|
case WTAP_ERR_SHORT_WRITE:
|
||||||
simple_message_box(ESD_TYPE_ERROR, NULL, NULL,
|
simple_message_box(ESD_TYPE_ERROR, NULL, NULL,
|
||||||
"A full write couldn't be done to the file \"%s\".",
|
"A full write couldn't be done to the file \"%s\".",
|
||||||
display_basename);
|
display_basename);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
simple_message_box(ESD_TYPE_ERROR, NULL, NULL,
|
simple_message_box(ESD_TYPE_ERROR, NULL, NULL,
|
||||||
"An error occurred while writing to the file \"%s\": %s.",
|
"An error occurred while writing to the file \"%s\": %s.",
|
||||||
display_basename, wtap_strerror(err));
|
display_basename, wtap_strerror(err));
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
simple_message_box(ESD_TYPE_ERROR, NULL, NULL,
|
||||||
|
file_write_error_message(err), display_basename);
|
||||||
}
|
}
|
||||||
} else {
|
g_free(display_basename);
|
||||||
simple_message_box(ESD_TYPE_ERROR, NULL, NULL,
|
|
||||||
file_write_error_message(err), display_basename);
|
|
||||||
}
|
|
||||||
g_free(display_basename);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Editor modelines
|
||||||
|
*
|
||||||
|
* Local Variables:
|
||||||
|
* c-basic-offset: 4
|
||||||
|
* tab-width: 8
|
||||||
|
* indent-tabs-mode: nil
|
||||||
|
* End:
|
||||||
|
*
|
||||||
|
* ex: set shiftwidth=4 tabstop=8 expandtab:
|
||||||
|
* :indentSize=4:tabSize=8:noTabs=true:
|
||||||
|
*/
|
||||||
|
|
|
@ -61,3 +61,16 @@ extern void write_failure_alert_box(const char *filename, int err);
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
#endif /* __ALERT_BOX_H__ */
|
#endif /* __ALERT_BOX_H__ */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Editor modelines
|
||||||
|
*
|
||||||
|
* Local Variables:
|
||||||
|
* c-basic-offset: 4
|
||||||
|
* tab-width: 8
|
||||||
|
* indent-tabs-mode: nil
|
||||||
|
* End:
|
||||||
|
*
|
||||||
|
* ex: set shiftwidth=4 tabstop=8 expandtab:
|
||||||
|
* :indentSize=4:tabSize=8:noTabs=true:
|
||||||
|
*/
|
||||||
|
|
Loading…
Reference in New Issue