From 4bf8bee986d6e058b85c1eee17caa36c22a51c0b Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Tue, 1 Feb 2005 22:34:53 +0000 Subject: [PATCH] *** empty log message *** (Old svn revision: 534) --- src/functions.c | 4 ++-- src/functions.h | 3 ++- src/gui.c | 16 ++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/functions.c b/src/functions.c index 92a6a05..0e2a206 100644 --- a/src/functions.c +++ b/src/functions.c @@ -20,7 +20,7 @@ #include "functions.h" -task_count = 0; +gint task_count = 0; /* function to kill the current task */ void send_signal_to_task(gchar *task_id, gchar *signal) @@ -64,7 +64,7 @@ void refresh_task_list() gchar buffer[256]; gint line_count = 0; struct task task; - struct passwd *passwdp; + struct passwd *passwdp; if((task_file = fopen(task_file_name,"r")) != NULL) { diff --git a/src/functions.h b/src/functions.h index 04a2459..7e17b8a 100644 --- a/src/functions.h +++ b/src/functions.h @@ -22,13 +22,14 @@ #include #include #include +#include #include "types.h" struct task all_tasks[512]; -gint task_count; struct task task_list; void refresh_task_list(void); void send_signal_to_task(gchar *task_id, gchar *signal); +void remove_task_from_array(gint count); diff --git a/src/gui.c b/src/gui.c index a155467..499738e 100644 --- a/src/gui.c +++ b/src/gui.c @@ -39,7 +39,7 @@ void create_gui(void) /* eventbox */ eventbox = gtk_event_box_new(); gtk_event_box_set_visible_window(GTK_EVENT_BOX(eventbox), FALSE); - gtk_widget_add_events(GTK_WIDGET(eventbox), "BUTTON_PRESS"); + gtk_widget_add_events(GTK_WIDGET(eventbox), GDK_BUTTON_PRESS); g_signal_connect_swapped(G_OBJECT(eventbox), "button-press-event", G_CALLBACK(handle_mouse_events), G_OBJECT(main_popup_menu)); gtk_container_set_border_width(GTK_CONTAINER(eventbox), 0); @@ -60,13 +60,13 @@ void create_gui(void) tree_view = gtk_tree_view_new(); g_signal_connect_swapped(G_OBJECT(tree_view), "button-press-event", G_CALLBACK(handle_mouse_events), G_OBJECT(task_popup_menu)); - gtk_container_add(GTK_CONTAINER(scrolled_window), tree_view); + gtk_container_add(GTK_CONTAINER(scrolled_window), GTK_WIDGET(tree_view)); gtk_widget_show(tree_view); - selection = gtk_tree_view_get_selection(tree_view); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)); list_store = gtk_list_store_new(4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); - gtk_tree_view_set_model(GTK_TREE_VIEW(tree_view), list_store); + gtk_tree_view_set_model(GTK_TREE_VIEW(tree_view), GTK_TREE_MODEL(list_store)); cell_renderer = gtk_cell_renderer_text_new(); @@ -127,22 +127,22 @@ void remove_list_item(struct task task) gboolean valid; GtkTreeIter iter; - valid = gtk_tree_model_get_iter_first(list_store, &iter); + valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list_store), &iter); while(valid) { gchar *str_data; - gtk_tree_model_get(list_store, &iter, 1, &str_data, -1); + gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, 1, &str_data, -1); if(strcmp(task.pid,str_data) == 0) { - gtk_list_store_remove(list_store, &iter); + gtk_list_store_remove(GTK_LIST_STORE(list_store), &iter); g_free(str_data); break; } g_free(str_data); - valid = gtk_tree_model_iter_next(list_store, &iter); + valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(list_store), &iter); } }