diff options
| author | Gerasimos Dimitriadis <dimeg@intracom.gr> | 2010-01-25 18:14:01 +0000 |
|---|---|---|
| committer | Gerasimos Dimitriadis <dimeg@intracom.gr> | 2010-01-25 18:14:01 +0000 |
| commit | 065546cdcb5b8e7a78ad93f011c3ad50ae2500e2 (patch) | |
| tree | 6ebeb42a699efcb948a394bfaba245aa963934c7 /gtk | |
| parent | f1f528deeb799ede12c04297454858531b39432c (diff) | |
Change the prefix of the underscore escaping/unescaping
functions from g_ to ws_; Insert function names in
libwireshark.def
svn path=/trunk/; revision=31662
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/new_packet_list.c | 4 | ||||
| -rw-r--r-- | gtk/prefs_column.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c index 3805529f8e..ec9441fe2d 100644 --- a/gtk/new_packet_list.c +++ b/gtk/new_packet_list.c @@ -178,7 +178,7 @@ col_title_change_ok (GtkWidget *w, gpointer parent_w) gint col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(col), E_MPACKET_LIST_COL_KEY)); GtkWidget *entry = g_object_get_data (G_OBJECT(w), "entry"); const gchar *title = gtk_entry_get_text(GTK_ENTRY(entry)); - gchar *escaped_title = g_strdup_escape_underscore(title); + gchar *escaped_title = ws_strdup_escape_underscore(title); gint col_width; gtk_tree_view_column_set_title(col, escaped_title); @@ -206,7 +206,7 @@ static void col_title_edit_dlg (GtkTreeViewColumn *col) { const gchar *value = gtk_tree_view_column_get_title(col); - gchar *unescaped_value = g_strdup_unescape_underscore(value); + gchar *unescaped_value = ws_strdup_unescape_underscore(value); GtkWidget *win, *main_tb, *main_vb, *bbox, *cancel_bt, *ok_bt; GtkWidget *entry, *label; diff --git a/gtk/prefs_column.c b/gtk/prefs_column.c index aee8def7c1..4bd9366d52 100644 --- a/gtk/prefs_column.c +++ b/gtk/prefs_column.c @@ -152,7 +152,7 @@ column_prefs_show(GtkWidget *prefs_window) { fmt = g_strdup_printf("%s", col_format_desc(cur_fmt)); } gtk_list_store_append(store, &iter); - unescaped_title = g_strdup_unescape_underscore(cfmt->title); + unescaped_title = ws_strdup_unescape_underscore(cfmt->title); gtk_list_store_set(store, &iter, 0, unescaped_title, 1, fmt, 2, clp, -1); g_free(unescaped_title); if (first_row) { @@ -276,7 +276,7 @@ column_prefs_add_custom(gint fmt, const gchar *title, const gchar *custom_field) * is going to be marked as accelerator for this header (i.e. is going to be * shown underlined), escape it be inserting a second consecutive underscore. */ - cfmt->title = g_strdup_escape_underscore(title); + cfmt->title = ws_strdup_escape_underscore(title); cfmt->fmt = g_strdup(col_format_to_string(fmt)); cfmt->custom_field = g_strdup(custom_field); @@ -439,7 +439,7 @@ column_title_changed_cb(GtkCellRendererText *cell _U_, const gchar *str_path, co if (clp) { cfmt = (fmt_data *) clp->data; g_free(cfmt->title); - cfmt->title = g_strdup_escape_underscore(new_title); + cfmt->title = ws_strdup_escape_underscore(new_title); } gtk_tree_path_free (path); |