diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-08-30 16:10:01 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-08-30 16:10:01 +0000 |
| commit | b4c2ed1b86949dd79ac107d7edbc0be68f59d618 (patch) | |
| tree | 9ea32300dcac661f69c271986c4b92e56be5bde4 /gtk/drag_and_drop.c | |
| parent | 05f5bf510b6c4c8533aba2823afe68089fb8c268 (diff) | |
Remove some unnecessary includes: a lot of things don't need globals.h and register.h
svn path=/trunk/; revision=34017
Diffstat (limited to 'gtk/drag_and_drop.c')
| -rw-r--r-- | gtk/drag_and_drop.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gtk/drag_and_drop.c b/gtk/drag_and_drop.c index 14f23775b6..9f6e99fda8 100644 --- a/gtk/drag_and_drop.c +++ b/gtk/drag_and_drop.c @@ -36,7 +36,6 @@ #include <epan/prefs.h> -#include "../globals.h" #include "../util.h" #include "../file.h" #include "../simple_dialog.h" @@ -261,7 +260,7 @@ dnd_open_file_cmd(gchar *cf_names_freeme) default: /* build and show the info dialog */ dialog_text = g_string_sized_new(200); - g_string_printf(dialog_text, + g_string_printf(dialog_text, "%sMerging the following files:%s\n\n", simple_dialog_primary_start(), simple_dialog_primary_end()); for(files_work = 0; files_work < in_files; files_work++) { @@ -270,7 +269,7 @@ dnd_open_file_cmd(gchar *cf_names_freeme) } g_string_append(dialog_text, "\nThe packets in these files will be merged chronologically into a new temporary file."); simple_dialog(ESD_TYPE_CONFIRMATION, - ESD_BTN_OK, "%s", + ESD_BTN_OK, "%s", dialog_text->str); g_string_free(dialog_text, TRUE); |