diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2008-01-24 17:06:22 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2008-01-24 17:06:22 +0000 |
| commit | 6a31f43f8bdf87d21b1de26ee36851182c59f10c (patch) | |
| tree | 9548ada21e31162631a84edec9b42867845beac9 /gtk | |
| parent | dc0b8a0727bd2ccedea3ec55aefa2c82889d027f (diff) | |
Always return a valid profile name from get_profile_name().
svn path=/trunk/; revision=24175
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/main.c | 7 | ||||
| -rw-r--r-- | gtk/main.h | 3 | ||||
| -rw-r--r-- | gtk/profile_dlg.c | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/gtk/main.c b/gtk/main.c index 18c12956ce..bbf3b971f4 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1042,7 +1042,6 @@ void packets_bar_update(void) */ void profile_bar_update(void) { - const char *profile_name; if (profile_bar) { /* remove old status */ if(profile_str) { @@ -1050,11 +1049,7 @@ void profile_bar_update(void) gtk_statusbar_pop(GTK_STATUSBAR(profile_bar), profile_ctx); } - profile_name = get_profile_name (); - if (!profile_name) { - profile_name = DEFAULT_PROFILE; - } - profile_str = g_strdup_printf (" Profile: %s", profile_name); + profile_str = g_strdup_printf (" Profile: %s", get_profile_name ()); gtk_statusbar_push(GTK_STATUSBAR(profile_bar), profile_ctx, profile_str); } diff --git a/gtk/main.h b/gtk/main.h index acb6ca1bd1..180b4e8c18 100644 --- a/gtk/main.h +++ b/gtk/main.h @@ -347,9 +347,6 @@ extern void prefs_to_capture_opts(void); /** Change configuration profile */ extern void change_configuration_profile(const gchar *profile_name); -#define DEFAULT_PROFILE "Default" - - extern GtkWidget *pkt_scrollw; #endif /* __MAIN_H__ */ diff --git a/gtk/profile_dlg.c b/gtk/profile_dlg.c index a84a53dbe8..811343e225 100644 --- a/gtk/profile_dlg.c +++ b/gtk/profile_dlg.c @@ -172,7 +172,7 @@ fill_list(GtkWidget *main_w) fl_entry = add_to_profile_list(DEFAULT_PROFILE, DEFAULT_PROFILE, PROF_STAT_DEFAULT); gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, 0, DEFAULT_PROFILE, 1, fl_entry, -1); - if (profile_name == NULL || strlen(profile_name) == 0) { + if (strcmp (profile_name, DEFAULT_PROFILE)==0) { l_select = g_memdup(&iter, sizeof(iter)); } @@ -189,7 +189,7 @@ fill_list(GtkWidget *main_w) gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, 0, profile->name, 1, fl_entry, -1); - if (profile_name && profile->name) { + if (profile->name) { if (strcmp(profile_name, profile->name) == 0) { /* * XXX - We're assuming that we can just copy a GtkTreeIter |