osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8531 : 

Fix compilation when building with HAVE_GTKOSXAPPLICATION

svn path=/trunk/; revision=48585
This commit is contained in:
Pascal Quantin 2013-03-27 12:29:44 +00:00
parent 7959275717
commit 5a877ea9fe
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/gtk/main.c
View File

@ -1883,7 +1883,7 @@ main_capture_callback(gint event, capture_options *capture_opts, gpointer user_d
main_capture_cb_capture_update_started(capture_opts);
#ifdef HAVE_GTKOSXAPPLICATION
theApp = (GtkosxApplication *)g_object_new(GTKOSX_TYPE_APPLICATION, NULL);
gtkosx_application_set_dock_icon_pixbuf(theApp, gdk_pixbuf_new_from_inline(-1, wsiconcap_48_pb_data, FALSE, NULL);
gtkosx_application_set_dock_icon_pixbuf(theApp, gdk_pixbuf_new_from_inline(-1, wsiconcap_48_pb_data, FALSE, NULL));
#endif
break;
case(capture_cb_capture_update_continue):
@ -1910,7 +1910,7 @@ main_capture_callback(gint event, capture_options *capture_opts, gpointer user_d
* closes the capturing on its own! */
#ifdef HAVE_GTKOSXAPPLICATION
theApp = (GtkosxApplication *)g_object_new(GTKOSX_TYPE_APPLICATION, NULL);
gtkosx_application_set_dock_icon_pixbuf(theApp, gdk_pixbuf_new_from_inline(-1, wsicon_64_pb_data, FALSE, NULL);
gtkosx_application_set_dock_icon_pixbuf(theApp, gdk_pixbuf_new_from_inline(-1, wsicon_64_pb_data, FALSE, NULL));
#endif
main_capture_cb_capture_stopping(capture_opts);
break;
@ -3203,7 +3203,7 @@ main(int argc, char *argv[])
#ifdef HAVE_GTKOSXAPPLICATION
theApp = (GtkosxApplication *)g_object_new(GTKOSX_TYPE_APPLICATION, NULL);
gtkosx_application_set_dock_icon_pixbuf(theApp, gdk_pixbuf_new_from_inline(-1, wsicon_64_pb_data, FALSE, NULL);
gtkosx_application_set_dock_icon_pixbuf(theApp, gdk_pixbuf_new_from_inline(-1, wsicon_64_pb_data, FALSE, NULL));
gtkosx_application_ready(theApp);
#endif