varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2026-02-09 14:40:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

menu-button: sync menu button settings when attaching profiler

Browse Source 
We were failing to launch a program a second or third time, due to the
settings not beeing sync'd to the profiler instance.
This commit is contained in:
Christian Hergert
2016-04-15 18:19:20 -07:00
parent 36008c4ab4
commit 8291e05da3
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/sp-profiler-menu-button.c
View File

@ -68,6 +68,13 @@ enum {
N_PROPS N_PROPS
}; };
static void sp_profiler_menu_button_env_row_changed (SpProfilerMenuButton *self,
GtkTreePath *tree_path,
GtkTreeIter *tree_iter,
gpointer user_data);
static void sp_profiler_menu_button_validate_spawn (SpProfilerMenuButton *self,
GtkEntry *entry);
static GParamSpec *properties [N_PROPS]; static GParamSpec *properties [N_PROPS];
GtkWidget * GtkWidget *
@ -212,6 +219,9 @@ sp_profiler_menu_button_connect (SpProfilerMenuButton *self)
G_CONNECT_SWAPPED); G_CONNECT_SWAPPED);
sp_profiler_menu_button_update_label (self); sp_profiler_menu_button_update_label (self);
sp_profiler_menu_button_validate_spawn (self, priv->spawn_entry);
sp_profiler_menu_button_env_row_changed (self, NULL, NULL, NULL);
} }
static void static void
@ -604,16 +614,15 @@ sp_profiler_menu_button_class_init (SpProfilerMenuButtonClass *klass)
static void static void
sp_profiler_menu_button_env_row_changed (SpProfilerMenuButton *self, sp_profiler_menu_button_env_row_changed (SpProfilerMenuButton *self,
GtkTreePath *tree_path, GtkTreePath *tree_path,
GtkTreeIter *iter, GtkTreeIter *tree_iter,
gpointer user_data) gpointer user_data)
{ {
SpProfilerMenuButtonPrivate *priv = sp_profiler_menu_button_get_instance_private (self); SpProfilerMenuButtonPrivate *priv = sp_profiler_menu_button_get_instance_private (self);
g_autoptr(GPtrArray) env = NULL; g_autoptr(GPtrArray) env = NULL;
GtkTreeModel *model; GtkTreeModel *model;
GtkTreeIter iter;
g_assert (SP_IS_PROFILER_MENU_BUTTON (self)); g_assert (SP_IS_PROFILER_MENU_BUTTON (self));
g_assert (tree_path != NULL);
g_assert (iter != NULL);
/* queue saving settings to gsettings */ /* queue saving settings to gsettings */
if (priv->save_env_source) if (priv->save_env_source)
@ -623,14 +632,14 @@ sp_profiler_menu_button_env_row_changed (SpProfilerMenuButton *self,
/* sync the environ to the profiler */ /* sync the environ to the profiler */
env = g_ptr_array_new_with_free_func (g_free); env = g_ptr_array_new_with_free_func (g_free);
model = gtk_tree_view_get_model (priv->env_tree_view); model = gtk_tree_view_get_model (priv->env_tree_view);
if (gtk_tree_model_get_iter_first (model, iter)) if (gtk_tree_model_get_iter_first (model, &iter))
{ {
do do
{ {
g_autofree gchar *key = NULL; g_autofree gchar *key = NULL;
g_autofree gchar *value = NULL; g_autofree gchar *value = NULL;
gtk_tree_model_get (model, iter, gtk_tree_model_get (model, &iter,
0, &key, 0, &key,
1, &value, 1, &value,
-1); -1);
@ -638,7 +647,7 @@ sp_profiler_menu_button_env_row_changed (SpProfilerMenuButton *self,
if (key && *key) if (key && *key)
g_ptr_array_add (env, g_strdup_printf ("%s=%s", key, value)); g_ptr_array_add (env, g_strdup_printf ("%s=%s", key, value));
} }
while (gtk_tree_model_iter_next (model, iter)); while (gtk_tree_model_iter_next (model, &iter));
} }
g_ptr_array_add (env, NULL); g_ptr_array_add (env, NULL);
sp_profiler_set_spawn_env (priv->profiler, (const gchar * const *)env->pdata); sp_profiler_set_spawn_env (priv->profiler, (const gchar * const *)env->pdata);