aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-01-04 18:45:21 -0800
committerGuy Harris <guy@alum.mit.edu>2017-01-05 02:46:00 +0000
commit229f573846af147a73662e0ec68fec322c2f3b13 (patch)
tree46e31b566f8e59d1dc4c12daa0373342aafffb94
parent3f176f94e7b3939dbcc4f3195427345a077cbfb1 (diff)
Remove RA_CONFIGURATION.
It's not used at all in the Qt UI, and the point at which it's used in the GTK+ UI doesn't involve reading configuration files - between it and RA_INTERFACES, some mostly quick command-line argument processing is done. Change-Id: Ib4de97c8b6dba658a6e9d8f596b551f7c45739d2 Reviewed-on: https://code.wireshark.org/review/19551 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r--register.h3
-rw-r--r--ui/gtk/about_dlg.c7
-rw-r--r--ui/gtk/main.c1
-rw-r--r--ui/qt/splash_overlay.cpp3
4 files changed, 3 insertions, 11 deletions
diff --git a/register.h b/register.h
index 1f2d078446..acb6964c09 100644
--- a/register.h
+++ b/register.h
@@ -43,8 +43,7 @@ typedef enum {
RA_LUA_PLUGINS, /* Lua plugin register */
RA_LUA_DEREGISTER, /* Lua plugin deregister */
RA_PREFERENCES, /* Module preferences */
- RA_INTERFACES, /* Local interfaces */
- RA_CONFIGURATION /* Configuration files */
+ RA_INTERFACES /* Local interfaces */
} register_action_e;
typedef void (*register_cb)(register_action_e action, const char *message, gpointer client_data);
diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c
index 5568f602ff..cf2fb93589 100644
--- a/ui/gtk/about_dlg.c
+++ b/ui/gtk/about_dlg.c
@@ -242,9 +242,6 @@ splash_update(register_action_e action, const char *message, gpointer client_dat
case RA_INTERFACES:
action_msg = "Finding local interfaces ...";
break;
- case RA_CONFIGURATION:
- action_msg = "Loading configuration files ...";
- break;
default:
action_msg = "(Unknown action)";
break;
@@ -254,10 +251,10 @@ splash_update(register_action_e action, const char *message, gpointer client_dat
}
if(ul_count == 0) { /* get the count of dissectors */
- ul_count = register_count() + 7; /* additional 7 for:
+ ul_count = register_count() + 6; /* additional 7 for:
dissectors, listeners,
registering plugins, handingoff plugins,
- preferences, interfaces and configuration */
+ preferences, and interfaces */
#ifdef HAVE_LUA
ul_count += wslua_count_plugins (); /* get count of lua plugins */
#endif
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index ba5e770cb9..8234f56fc2 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -2350,7 +2350,6 @@ main(int argc, char *argv[])
* https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9e277ae6154fd04bf6a0a34ec5655a73e5a736a3
*/
- splash_update(RA_CONFIGURATION, NULL, (gpointer)splash_win);
cap_file_init(&cfile);
/* Fill in capture options with values from the preferences */
diff --git a/ui/qt/splash_overlay.cpp b/ui/qt/splash_overlay.cpp
index 2b9785c55f..dca2111425 100644
--- a/ui/qt/splash_overlay.cpp
+++ b/ui/qt/splash_overlay.cpp
@@ -173,9 +173,6 @@ void SplashOverlay::splashUpdate(register_action_e action, const char *message)
case RA_INTERFACES:
action_msg = tr("Finding local interfaces");
break;
- case RA_CONFIGURATION:
- action_msg = tr("Loading configuration files");
- break;
default:
action_msg = tr("(Unknown action)");
break;