projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update FSF address
[lttv.git]
/
lttv
/
modules
/
gui
/
tracecontrol
/
tracecontrol.c
diff --git
a/lttv/modules/gui/tracecontrol/tracecontrol.c
b/lttv/modules/gui/tracecontrol/tracecontrol.c
index 283674b726650428a6ffc1d66f4db1bd51173617..c95c026e9e9688dbb612fe0697f4825a7e64766b 100644
(file)
--- a/
lttv/modules/gui/tracecontrol/tracecontrol.c
+++ b/
lttv/modules/gui/tracecontrol/tracecontrol.c
@@
-12,8
+12,8
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 5
9 Temple Place - Suite 330
, Boston,
- * MA 0211
1-1307
, USA.
+ * Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston,
+ * MA 0211
0-1301
, USA.
*/
#ifdef HAVE_CONFIG_H
*/
#ifdef HAVE_CONFIG_H
@@
-164,10
+164,6
@@
gui_control(LttvPluginTab *ptab)
Tab *tab = ptab->tab;
g_debug("filter::gui_control()");
Tab *tab = ptab->tab;
g_debug("filter::gui_control()");
- unsigned i;
- GtkCellRenderer *renderer;
- GtkTreeViewColumn *column;
-
ControlData* tcd = g_new(ControlData,1);
tcd->tab = tab;
ControlData* tcd = g_new(ControlData,1);
tcd->tab = tab;
@@
-450,8
+446,6
@@
gui_control(LttvPluginTab *ptab)
void
gui_control_destructor(ControlData *tcd)
{
void
gui_control_destructor(ControlData *tcd)
{
- Tab *tab = tcd->tab;
-
/* May already been done by GTK window closing */
if(GTK_IS_WIDGET(guicontrol_get_widget(tcd))){
g_info("widget still exists");
/* May already been done by GTK window closing */
if(GTK_IS_WIDGET(guicontrol_get_widget(tcd))){
g_info("widget still exists");
@@
-482,9
+476,6
@@
static int execute_command(const gchar *command, const gchar *username,
int status;
ssize_t count;
/* discuss with su */
int status;
ssize_t count;
/* discuss with su */
- struct timeval timeout;
- timeout.tv_sec = 1;
- timeout.tv_usec = 0;
struct pollfd pollfd;
int num_rdy;
struct pollfd pollfd;
int num_rdy;
@@
-850,7
+841,7
@@
void start_clicked (GtkButton *button, gpointer user_data)
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
- msg);
+
"%s",
msg);
gtk_dialog_run(GTK_DIALOG(dialogue));
gtk_widget_destroy(dialogue);
}
gtk_dialog_run(GTK_DIALOG(dialogue));
gtk_widget_destroy(dialogue);
}
@@
-922,7
+913,7
@@
void pause_clicked (GtkButton *button, gpointer user_data)
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
- msg);
+
"%s",
msg);
gtk_dialog_run(GTK_DIALOG(dialogue));
gtk_widget_destroy(dialogue);
}
gtk_dialog_run(GTK_DIALOG(dialogue));
gtk_widget_destroy(dialogue);
}
@@
-993,7
+984,7
@@
void unpause_clicked (GtkButton *button, gpointer user_data)
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
- msg);
+
"%s",
msg);
gtk_dialog_run(GTK_DIALOG(dialogue));
gtk_widget_destroy(dialogue);
}
gtk_dialog_run(GTK_DIALOG(dialogue));
gtk_widget_destroy(dialogue);
}
@@
-1024,10
+1015,10
@@
void stop_clicked (GtkButton *button, gpointer user_data)
const gchar *lttctl_path =
gtk_entry_get_text(GTK_ENTRY(tcd->lttctl_path_entry));
const gchar *lttctl_path =
gtk_entry_get_text(GTK_ENTRY(tcd->lttctl_path_entry));
- gchar *trace_dir = gtk_entry_get_text(GTK_ENTRY(tcd->trace_dir_entry));
+
const
gchar *trace_dir = gtk_entry_get_text(GTK_ENTRY(tcd->trace_dir_entry));
GSList * trace_list = NULL;
GSList * trace_list = NULL;
- trace_list = g_slist_append(trace_list, trace_dir);
+ trace_list = g_slist_append(trace_list,
(gpointer)
trace_dir);
/* Setup arguments to su */
/* child */
/* Setup arguments to su */
/* child */
@@
-1092,7
+1083,7
@@
void stop_clicked (GtkButton *button, gpointer user_data)
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
- msg);
+
"%s",
msg);
gtk_dialog_run(GTK_DIALOG(dialogue));
gtk_widget_destroy(dialogue);
return;
gtk_dialog_run(GTK_DIALOG(dialogue));
gtk_widget_destroy(dialogue);
return;
@@
-1121,7
+1112,8
@@
void stop_clicked (GtkButton *button, gpointer user_data)
switch(id){
case GTK_RESPONSE_ACCEPT:
{
switch(id){
case GTK_RESPONSE_ACCEPT:
{
- create_main_window_with_trace_list(trace_list);
+ /* TODO ybrosseau: 2011-04-20: Add support for live trace */
+ create_main_window_with_trace_list(trace_list, FALSE);
}
break;
case GTK_RESPONSE_REJECT:
}
break;
case GTK_RESPONSE_REJECT:
@@
-1176,7
+1168,7
@@
void arm_clicked (GtkButton *button, gpointer user_data)
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
- msg);
+
"%s",
msg);
gtk_dialog_run(GTK_DIALOG(dialogue));
gtk_widget_destroy(dialogue);
}
gtk_dialog_run(GTK_DIALOG(dialogue));
gtk_widget_destroy(dialogue);
}
@@
-1227,7
+1219,7
@@
void disarm_clicked (GtkButton *button, gpointer user_data)
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
- msg);
+
"%s",
msg);
gtk_dialog_run(GTK_DIALOG(dialogue));
gtk_widget_destroy(dialogue);
}
gtk_dialog_run(GTK_DIALOG(dialogue));
gtk_widget_destroy(dialogue);
}
@@
-1248,10
+1240,11
@@
void disarm_clicked (GtkButton *button, gpointer user_data)
GtkWidget *
h_guicontrol(LttvPlugin *plugin)
{
GtkWidget *
h_guicontrol(LttvPlugin *plugin)
{
- LttvPluginTab *ptab = LTTV_PLUGIN_TAB(plugin);
-
ControlData* f = gui_control(ptab)
;
+
LttvPluginTab *ptab = LTTV_PLUGIN_TAB(plugin);
+
gui_control(ptab)
;
- return NULL;
+ /* TODO ybrosseau 2011-02-04: We should probably return a widget here */
+ return NULL;
}
/**
}
/**
This page took
0.025828 seconds
and
4
git commands to generate.