compat_macros.h is gone now!!!

all GTK1 compatibility code was removed, so this file can simply be dropped

svn path=/trunk/; revision=24923

10 files changed, 69 insertions, 105 deletions

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 0ac538ecd7..7f1e1be4ee 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -54,7 +54,6 @@ noinst_HEADERS = \
 	color_edit_dlg.h	\
 	colors.h	\
 	column_prefs.h	\
-	compat_macros.h	\
 	conversations_table.h \
 	decode_as_ber.h	\
 	decode_as_dlg.h	\
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index ee8c4b49b9..6a2892aba9 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -54,7 +54,6 @@
 #include <epan/prefs.h>
 #include "ringbuffer.h"
 #include <epan/filesystem.h>
-#include "compat_macros.h"
 #include "stock_icons.h"
 #include "capture_file_dlg.h"
 #include "help_dlg.h"
@@ -1763,10 +1762,11 @@ capture_start_confirmed(void)
         if(prefs.capture_device == NULL) {
             simple_dialog(ESD_TYPE_CONFIRMATION,
                         ESD_BTN_OK,
-                        PRIMARY_TEXT_START "No capture interface selected!" PRIMARY_TEXT_END "\n\n"
+                        "%sNo capture interface selected!%s\n\n"
                         "To select an interface use:\n\n"
                         "Capture->Options (until Wireshark is stopped)\n"
-                        "Edit->Preferences/Capture (permanent, if saved)");
+                        "Edit->Preferences/Capture (permanent, if saved)",
+                        simple_dialog_primary_start(), simple_dialog_primary_end());
             return;
         }
         if_device = g_strdup(prefs.capture_device);
@@ -1840,8 +1840,9 @@ capture_start_cb(GtkWidget *w _U_, gpointer d _U_)
   if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
     /* user didn't saved his current file, ask him */
     dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_SAVE_DONTSAVE_CANCEL,
-                PRIMARY_TEXT_START "Save capture file before starting a new capture?" PRIMARY_TEXT_END "\n\n"
-                "If you start a new capture without saving, your current capture data will\nbe discarded.");
+                "%sSave capture file before starting a new capture?%s\n\n"
+                "If you start a new capture without saving, your current capture data will\nbe discarded.",
+                simple_dialog_primary_start(), simple_dialog_primary_end());
     simple_dialog_set_cb(dialog, capture_start_answered_cb, NULL);
   } else {
     /* unchanged file, just capture a new one */
@@ -2156,8 +2157,9 @@ capture_dlg_prep(gpointer parent_w) {
         capture_opts->autostop_filesize = tmp;
       } else {
         simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-          PRIMARY_TEXT_START "Multiple files: Requested filesize too large!\n\n" PRIMARY_TEXT_END
-          "The setting \"Next file every x byte(s)\" can't be greater than %u bytes (2GB).", G_MAXINT);
+          "%sMultiple files: Requested filesize too large!%s\n\n"
+          "The setting \"Next file every x byte(s)\" can't be greater than %u bytes (2GB).", 
+          simple_dialog_primary_start(), simple_dialog_primary_end(), G_MAXINT);
         return;
       }
     }
@@ -2165,14 +2167,16 @@ capture_dlg_prep(gpointer parent_w) {
     /* test if the settings are ok for a ringbuffer */
     if (capture_opts->save_file == NULL) {
       simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-        PRIMARY_TEXT_START "Multiple files: No capture file name given!\n\n" PRIMARY_TEXT_END
-        "You must specify a filename if you want to use multiple files.");
+        "%sMultiple files: No capture file name given!%s\n\n"
+        "You must specify a filename if you want to use multiple files.",
+        simple_dialog_primary_start(), simple_dialog_primary_end());
       return;
     } else if (!capture_opts->has_autostop_filesize && !capture_opts->has_file_duration) {
       simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-        PRIMARY_TEXT_START "Multiple files: No file limit given!\n\n" PRIMARY_TEXT_END
+        "%sMultiple files: No file limit given!%s\n\n"
         "You must specify a file size or duration at which is switched to the next capture file\n"
-        "if you want to use multiple files.");
+        "if you want to use multiple files.",
+        simple_dialog_primary_start(), simple_dialog_primary_end());
       g_free(capture_opts->save_file);
       capture_opts->save_file = NULL;
       return;
@@ -2187,8 +2191,9 @@ capture_dlg_prep(gpointer parent_w) {
         capture_opts->autostop_filesize = tmp;
       } else {
         simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-          PRIMARY_TEXT_START "Stop Capture: Requested filesize too large!\n\n" PRIMARY_TEXT_END
-          "The setting \"... after x byte(s)\" can't be greater than %u bytes (2GB).", G_MAXINT);
+          "%sStop Capture: Requested filesize too large!%s\n\n"
+          "The setting \"... after x byte(s)\" can't be greater than %u bytes (2GB).", 
+          simple_dialog_primary_start(), simple_dialog_primary_end(), G_MAXINT);
         return;
       }
     }
diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c
index f541d7d32a..1cc6331db7 100644
--- a/gtk/capture_file_dlg.c
+++ b/gtk/capture_file_dlg.c
@@ -46,7 +46,6 @@
 #include "file_dlg.h"
 #include "capture_file_dlg.h"
 #include "main.h"
-#include "compat_macros.h"
 #include <epan/prefs.h>
 #include "recent.h"
 #include "color.h"
@@ -630,8 +629,9 @@ file_open_cmd_cb(GtkWidget *widget, gpointer data _U_) {
   if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
     /* user didn't saved his current file, ask him */
     dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_SAVE_DONTSAVE_CANCEL,
-                PRIMARY_TEXT_START "Save capture file before opening a new one?" PRIMARY_TEXT_END "\n\n"
-                "If you open a new capture file without saving, your capture data will be discarded.");
+                "%sSave capture file before opening a new one?%s\n\n"
+                "If you open a new capture file without saving, your capture data will be discarded.",
+                simple_dialog_primary_start(), simple_dialog_primary_end());
     simple_dialog_set_cb(dialog, file_open_answered_cb, widget);
   } else {
     /* unchanged file, just open a new one */
@@ -990,8 +990,9 @@ file_merge_cmd_cb(GtkWidget *widget, gpointer data _U_) {
   if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
     /* user didn't saved his current file, ask him */
     dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_OK_CANCEL,
-                PRIMARY_TEXT_START "Save the capture file before merging to another one?" PRIMARY_TEXT_END "\n\n"
-                "A temporary capture file can't be merged.");
+                "%sSave the capture file before merging to another one?%s\n\n"
+                "A temporary capture file can't be merged.",
+                simple_dialog_primary_start(), simple_dialog_primary_end());
     simple_dialog_set_cb(dialog, file_merge_answered_cb, widget);
   } else {
     /* unchanged file, just start to merge */
@@ -1157,8 +1158,9 @@ file_close_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) {
   if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
     /* user didn't saved his current file, ask him */
     dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_SAVE_DONTSAVE_CANCEL,
-                PRIMARY_TEXT_START "Save capture file before closing it?" PRIMARY_TEXT_END "\n\n"
-                "If you close without saving, your capture data will be discarded.");
+                "%sSave capture file before closing it?%s\n\n"
+                "If you close without saving, your capture data will be discarded.",
+                simple_dialog_primary_start(), simple_dialog_primary_end());
 
     simple_dialog_set_cb(dialog, file_close_answered_cb, NULL);
   } else {
@@ -1585,9 +1587,9 @@ file_save_as_ok_cb(GtkWidget *w _U_, gpointer fs) {
 
   /* the file exists, ask the user to remove it first */
   dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_OK_CANCEL,
-      PRIMARY_TEXT_START "A file named \"%s\" already exists."
-      PRIMARY_TEXT_END "\n\n"
-      "Do you want to replace it with the capture you are saving?", cf_name);
+      "%sA file named \"%s\" already exists.%s\n\n"
+      "Do you want to replace it with the capture you are saving?", 
+      simple_dialog_primary_start(), cf_name, simple_dialog_primary_end());
   simple_dialog_set_cb(dialog, file_save_as_exists_answered_cb, fs);
 
   g_free(cf_name);
diff --git a/gtk/capture_if_details_dlg.c b/gtk/capture_if_details_dlg.c
index 99d1603261..ff75d56f10 100644
--- a/gtk/capture_if_details_dlg.c
+++ b/gtk/capture_if_details_dlg.c
@@ -42,7 +42,6 @@
 #include "main.h"
 #include "dlg_utils.h"
 #include "gui_utils.h"
-#include "compat_macros.h"
 #include "help_dlg.h"
 
 #include <epan/value_string.h>
@@ -2277,8 +2276,9 @@ capture_if_details_open_win(char *iface)
     adapter = wpcap_packet_open(iface);
     if(adapter == NULL) {
         simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-            PRIMARY_TEXT_START "Could not open adapter: %s!" PRIMARY_TEXT_END
-            "\n\nThe adapter might be removed from the system in the meantime!", iface);
+            "%sCould not open adapter: %s!%s"
+            "\n\nThe adapter might be removed from the system in the meantime!", 
+            simple_dialog_primary_start(), iface, simple_dialog_primary_end());
         return;
     }
 
@@ -2403,9 +2403,10 @@ capture_if_details_open(char *iface)
         /* couldn't even get the packet.dll version, must be a very old one or just not existing -> give up */
         /* (this seems to be the case for 2.3 beta and all previous releases) */
         simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
-            PRIMARY_TEXT_START "Couldn't obtain WinPcap packet.dll version!" PRIMARY_TEXT_END
+            "%sCouldn't obtain WinPcap packet.dll version!%s"
             "\n\nThe WinPcap packet.dll is not installed or the version you use seems to be very old!"
-            "\n\nPlease update/install WinPcap.");
+            "\n\nPlease update/install WinPcap.",
+            simple_dialog_primary_start(), simple_dialog_primary_end());
         return;
     }
 
@@ -2434,12 +2435,12 @@ capture_if_details_open(char *iface)
     if(!version_ok) {
         /* packet.dll version not known to us, warn user but try to continue */
         dialog = simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK | ESD_BTN_CANCEL,
-            PRIMARY_TEXT_START "Unknown WinPcap version might crash or fail!" PRIMARY_TEXT_END
+            "%sUnknown WinPcap version might crash or fail!%s"
             "\n\nThe WinPcap packet.dll version \"%s\" is unknown if it supports required functions!"
             "\n\nOnly WinPcap versions 3.0 and 3.1 are known to work with this feature."
             "\n\nCrashes or unexpected behaviour might occur, you have been warned!"
             "\n\nContinue anyway?",
-            version);
+            simple_dialog_primary_start(), simple_dialog_primary_end(), version);
         simple_dialog_set_cb(dialog, capture_if_details_open_answered_cb, iface);
     } else {
         capture_if_details_open_win(iface);
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index 4902ed4981..bbfa7ec7ee 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -42,7 +42,6 @@
 #include "dlg_utils.h"
 #include "gui_utils.h"
 #include "dfilter_expr_dlg.h"
-#include "compat_macros.h"
 #include "stock_icons.h"
 #include "filter_dlg.h"
 #include "capture_file_dlg.h"
@@ -973,9 +972,10 @@ color_clear_cb(GtkWidget *widget, gpointer data _U_) {
 
     /* ask user, if he/she is really sure */
     dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTN_CLEAR | ESD_BTN_CANCEL,
-                PRIMARY_TEXT_START "Remove all your personal color settings?" PRIMARY_TEXT_END "\n\n"
+                "%sRemove all your personal color settings?%s\n\n"
                 "This will revert the color settings to global defaults.\n\n"
-                "Are you really sure?");
+                "Are you really sure?",
+                simple_dialog_primary_start(), simple_dialog_primary_end());
 
     simple_dialog_set_cb(dialog, color_clear_answered_cb, widget);
 }
diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
deleted file mode 100644
index 3c7be349be..0000000000
--- a/gtk/compat_macros.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* compat_macros.h
- * GTK-related Global defines, etc.
- *
- * $Id$
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifndef __COMPAT_MACROS_H__
-#define __COMPAT_MACROS_H__
-
-
-/** @file
- *
- * Helper macros for gtk1.x / gtk2.x compatibility. Use these macros instead of the GTK deprecated functions,
- * to keep compatibility between GTK 1.x and 2.x.
- * For example in gtk2.x, gtk_signal_xxx is deprecated in favor of g_signal_xxx,
- *          gtk_object_xxx is deprecated in favor of g_object_xxx,
- *          gtk_widget_set_usize is deprecated in favor of
- *              gtk_widget_set_size_request, ...
- */
-
-/* for details, see "Pango Text Attribute Markup" */
-/* maybe it's a good idea to keep this macro beyond the ongoing GTK1 cleanup!
-   If we want to change the look of the dialog boxes primary line the other day,
-   we can easily do so, without changing lot's of places */
-/* XXX - moving it to a better place (file) might be a good idea anyway */
-#define PRIMARY_TEXT_START "<span weight=\"bold\" size=\"larger\">"
-#define PRIMARY_TEXT_END "</span>"
-
-#endif /* __COMPAT_MACROS_H__ */
diff --git a/gtk/drag_and_drop.c b/gtk/drag_and_drop.c
index 7939f3ccb4..78c593c472 100644
--- a/gtk/drag_and_drop.c
+++ b/gtk/drag_and_drop.c
@@ -38,7 +38,6 @@
 #include "util.h"
 #include "capture_file_dlg.h"
 #include "../menu.h"
-#include "compat_macros.h"
 #include "file.h"
 #include "simple_dialog.h"
 #include "main.h"
@@ -257,8 +256,9 @@ dnd_open_file_cmd(gchar *cf_names_freeme)
     default:
         /* build and show the info dialog */
         dialog_text = g_string_sized_new(200);
-        g_string_append(dialog_text, PRIMARY_TEXT_START
-            "Merging the following files:" PRIMARY_TEXT_END "\n\n");
+        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++) {
             g_string_append(dialog_text, in_filenames[files_work]);
             g_string_append(dialog_text, "\n");
@@ -318,8 +318,9 @@ GtkSelectionData *selection_data, guint info, guint t _U_, gpointer data _U_)
         if((capture_opts->state != CAPTURE_STOPPED)) {
             dialog = simple_dialog(ESD_TYPE_CONFIRMATION,
                         ESD_BTN_OK,
-                        PRIMARY_TEXT_START "Drag and Drop currently not possible!" PRIMARY_TEXT_END "\n\n"
-                        "Dropping a file isn't possible while a capture is in progress.");
+                        "%sDrag and Drop currently not possible!%s\n\n"
+                        "Dropping a file isn't possible while a capture is in progress.",
+                        simple_dialog_primary_start(), simple_dialog_primary_end());
             return;
         }
 #endif
@@ -328,8 +329,9 @@ GtkSelectionData *selection_data, guint info, guint t _U_, gpointer data _U_)
         if((cfile.state == FILE_READ_IN_PROGRESS)) {
             dialog = simple_dialog(ESD_TYPE_CONFIRMATION,
                         ESD_BTN_OK,
-                        PRIMARY_TEXT_START "Drag and Drop currently not possible!" PRIMARY_TEXT_END "\n\n"
-                        "Dropping a file isn't possible while loading another capture file.");
+                        "%sDrag and Drop currently not possible!%s\n\n"
+                        "Dropping a file isn't possible while loading another capture file.",
+                        simple_dialog_primary_start(), simple_dialog_primary_end());
             return;
         }
 
@@ -344,8 +346,9 @@ GtkSelectionData *selection_data, guint info, guint t _U_, gpointer data _U_)
             /* user didn't saved his current file, ask him */
             dialog = simple_dialog(ESD_TYPE_CONFIRMATION,
                         ESD_BTNS_SAVE_DONTSAVE_CANCEL,
-                        PRIMARY_TEXT_START "Save capture file before opening a new one?" PRIMARY_TEXT_END "\n\n"
-                        "If you open a new capture file without saving, your current capture data will be discarded.");
+                        "%sSave capture file before opening a new one?%s\n\n"
+                        "If you open a new capture file without saving, your current capture data will be discarded.",
+                        simple_dialog_primary_start(), simple_dialog_primary_end());
             simple_dialog_set_cb(dialog, dnd_save_file_answered_cb, cf_names_freeme );
         } else {
             /* unchanged file */
diff --git a/gtk/main.c b/gtk/main.c
index 7695c66fc9..b49b478731 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -124,7 +124,6 @@
 #include "gtkglobals.h"
 #include "colors.h"
 #include "gui_utils.h"
-#include "compat_macros.h"
 #include "color_dlg.h"
 
 #include "main.h"
@@ -435,7 +434,7 @@ selected_ptree_info_cb(GtkWidget *widget _U_, gpointer data _U_)
 
         /* ask the user if the wiki page really should be opened */
         dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_OK_CANCEL,
-                    PRIMARY_TEXT_START "Open Wireshark Wiki page of protocol \"%s\"?" PRIMARY_TEXT_END "\n"
+                    "%sOpen Wireshark Wiki page of protocol \"%s\"?%s\n"
                     "\n"
                     "This will open the \"%s\" related Wireshark Wiki page in your Web browser.\n"
                     "\n"
@@ -452,7 +451,7 @@ selected_ptree_info_cb(GtkWidget *widget _U_, gpointer data _U_)
                     "\n"
                     "Hint 2: If you want to add a new protocol page, you should use the ProtocolTemplate,\n"
                     "which will save you a lot of editing and will give a consistent look over the pages.",
-                    proto_abbrev, proto_abbrev);
+                    simple_dialog_primary_start(), proto_abbrev, simple_dialog_primary_end(), proto_abbrev);
         simple_dialog_set_cb(dialog, selected_ptree_info_answered_cb, (gpointer) proto_abbrev);
     }
 }
@@ -740,9 +739,10 @@ reftime_frame_cb(GtkWidget *w _U_, gpointer data _U_, REFTIME_ACTION_E action)
     if (cfile.current_frame) {
         if(recent.gui_time_format != TS_RELATIVE && cfile.current_frame->flags.ref_time==0) {
             reftime_dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_YES_NO,
-                PRIMARY_TEXT_START "Switch to the appropriate Time Display Format?" PRIMARY_TEXT_END "\n\n"
+                "%sSwitch to the appropriate Time Display Format?%s\n\n"
                 "Time References don't work well with the currently selected Time Display Format.\n\n"
-                "Do you want to switch to \"Seconds Since Beginning of Capture\" now?");
+                "Do you want to switch to \"Seconds Since Beginning of Capture\" now?",
+                simple_dialog_primary_start(), simple_dialog_primary_end());
             simple_dialog_set_cb(reftime_dialog, reftime_answered_cb, NULL);
         } else {
             /* XXX hum, should better have a "cfile->current_row" here ... */
@@ -1133,8 +1133,9 @@ main_window_delete_event_cb(GtkWidget *widget _U_, GdkEvent *event _U_, gpointer
     gtk_window_present(GTK_WINDOW(top_level));
     /* user didn't saved his current file, ask him */
     dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_SAVE_DONTSAVE_CANCEL,
-                PRIMARY_TEXT_START "Save capture file before program quit?" PRIMARY_TEXT_END "\n\n"
-                "If you quit the program without saving, your capture data will be discarded.");
+                "%sSave capture file before program quit?%s\n\n"
+                "If you quit the program without saving, your capture data will be discarded.",
+                simple_dialog_primary_start(), simple_dialog_primary_end());
     simple_dialog_set_cb(dialog, file_quit_answered_cb, NULL);
     return TRUE;
   } else {
@@ -1235,8 +1236,9 @@ file_quit_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
   if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
     /* user didn't saved his current file, ask him */
     dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_SAVE_DONTSAVE_CANCEL,
-                PRIMARY_TEXT_START "Save capture file before program quit?" PRIMARY_TEXT_END "\n\n"
-                "If you quit the program without saving, your capture data will be discarded.");
+                "%sSave capture file before program quit?%s\n\n"
+                "If you quit the program without saving, your capture data will be discarded.",
+                simple_dialog_primary_start(), simple_dialog_primary_end());
     simple_dialog_set_cb(dialog, file_quit_answered_cb, NULL);
   } else {
     /* unchanged file, just exit */
diff --git a/gtk/menu.c b/gtk/menu.c
index fb63a59207..ae74b02489 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -68,7 +68,6 @@
 #include "keys.h"
 #include <epan/plugins.h>
 #include <epan/epan_dissect.h>
-#include "compat_macros.h"
 #include "stock_icons.h"
 #include "toolbar.h"
 #include "gtkglobals.h"
@@ -1709,8 +1708,9 @@ menu_open_recent_file_cmd_cb(GtkWidget *widget, gpointer data _U_) {
   if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
     /* user didn't saved his current file, ask him */
     dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_YES_NO_CANCEL,
-                PRIMARY_TEXT_START "Save capture file before opening a new one?" PRIMARY_TEXT_END "\n\n"
-                "If you open a new capture file without saving, your current capture data will be discarded.");
+                "%sSave capture file before opening a new one?%s\n\n"
+                "If you open a new capture file without saving, your current capture data will be discarded.",
+                simple_dialog_primary_start(), simple_dialog_primary_end());
     simple_dialog_set_cb(dialog, menu_open_recent_file_answered_cb, widget);
   } else {
     /* unchanged file */
diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c
index 1fe5767b83..df9955d5f4 100644
--- a/gtk/simple_dialog.c
+++ b/gtk/simple_dialog.c
@@ -34,7 +34,6 @@
 #include "simple_dialog.h"
 #include "dlg_utils.h"
 #include "gui_utils.h"
-#include "compat_macros.h"
 #include "stock_icons.h"
 
 #include <epan/strutil.h>
@@ -402,12 +401,12 @@ gboolean simple_dialog_check_get(gpointer dialog) {
 
 char *
 simple_dialog_primary_start(void) {
-    return PRIMARY_TEXT_START;
+    return "<span weight=\"bold\" size=\"larger\">";
 }
 
 char *
 simple_dialog_primary_end(void) {
-    return PRIMARY_TEXT_END;
+    return "</span>";
 }
 
 char *