aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2010-09-17 13:38:09 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2010-09-17 13:38:09 +0000
commit20cc0d7ce9e5f792f243590963e6f2b15caa7ed0 (patch)
treeb3128e80d1c57f7ecc7d8628ca5f5adecbe5017f
parent0519ad45f3e1cdfe84eaa6c97e242497fbe54068 (diff)
Don't include stock icons that we no longer use.
svn path=/trunk/; revision=34150
-rw-r--r--gtk/simple_dialog.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c
index 49d70e1cb5..ba1aaacd33 100644
--- a/gtk/simple_dialog.c
+++ b/gtk/simple_dialog.c
@@ -40,12 +40,6 @@
#include "main_statusbar.h"
-#include "image/stock_dialog_error_48.xpm"
-#include "image/stock_dialog_info_48.xpm"
-#include "image/stock_dialog_warning_48.xpm"
-#include "image/stock_dialog_stop_48.xpm"
-
-
static void simple_dialog_cancel_cb(GtkWidget *, gpointer);
#define CALLBACK_FCT_KEY "ESD_Callback_Fct"
@@ -232,7 +226,7 @@ display_simple_dialog(gint type, gint btn_mask, char *message)
g_object_set_data(G_OBJECT(dont_save_bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_DONT_SAVE));
g_signal_connect(dont_save_bt, "clicked", G_CALLBACK(simple_dialog_cancel_cb), win);
}
-
+
dont_save_bt = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_QUIT_DONT_SAVE);
if (dont_save_bt) {
g_object_set_data(G_OBJECT(dont_save_bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_QUIT_DONT_SAVE));
@@ -431,11 +425,11 @@ simple_status(const gchar *msg_format, ...)
{
va_list ap;
gchar *msg;
-
+
va_start(ap, msg_format);
msg = g_strdup_vprintf(msg_format, ap);
va_end(ap);
-
+
statusbar_push_temporary_msg(msg);
g_free(msg);
}