diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:29:09 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:29:09 +0000 |
| commit | 8112ecc321d5d2025e7b780db21f88a31d0ee472 (patch) | |
| tree | 885dc3989020530f2fcf4b82ec39284d36d43bd4 /ui/gtk/main_titlebar.c | |
| parent | da1bdffa1bbd6a9574afe2e834e1ac501653f3a4 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10404
Note: The following parts of the patch had been previously done:
asn1/snmp/packet-snmp-template.c
epan/dissectors/packet-snmp.c
epan/dissectors/packet-x11.c
Also; hostlist_table.c: code under '#ifdef HAVE_GEOIP'
didn't compile and needed a few additional patches.
svn path=/trunk/; revision=48447
Diffstat (limited to 'ui/gtk/main_titlebar.c')
| -rw-r--r-- | ui/gtk/main_titlebar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/main_titlebar.c b/ui/gtk/main_titlebar.c index a269fe49bc..0b75a5bb0f 100644 --- a/ui/gtk/main_titlebar.c +++ b/ui/gtk/main_titlebar.c @@ -49,7 +49,7 @@ main_set_window_name(const gchar *window_name) gchar *old_window_name; /* Attach the new un-decorated window name to the window. */ - old_window_name = g_object_get_data(G_OBJECT(top_level), MAIN_WINDOW_NAME_KEY); + old_window_name = (gchar *)g_object_get_data(G_OBJECT(top_level), MAIN_WINDOW_NAME_KEY); g_free(old_window_name); g_object_set_data(G_OBJECT(top_level), MAIN_WINDOW_NAME_KEY, g_strdup(window_name)); @@ -66,7 +66,7 @@ main_titlebar_update(void) gchar *title; /* Get the current filename or other title set in main_set_window_name */ - window_name = g_object_get_data(G_OBJECT(top_level), MAIN_WINDOW_NAME_KEY); + window_name = (gchar *)g_object_get_data(G_OBJECT(top_level), MAIN_WINDOW_NAME_KEY); if (window_name != NULL) { /* Optionally append the user-defined window title */ title = create_user_window_title(window_name); |