Updating branch refs/heads/master
to d212ce6b437e954c3157f41305016117cbf9ea63 (commit)
from 97d2f77ee66160ec47f99dda187d3a92b143e8f8 (commit)
commit d212ce6b437e954c3157f41305016117cbf9ea63
Author: Mike Massonnet <mmasson...@xfce.org>
Date: Fri May 21 15:14:32 2010 +0200
Fix compiler warnings from --enable-debug=yes
Fixed old-style function definitions, dropped unused variables, renamed
signal to xtm_signal (it shadowed a previous global declaration from
signal.h,) dropped the G_UN/LIKELY calls, missing includes and casted
here and there.
The task-manager-*.c files /would/ have to be individually fixed.
src/main.c | 5 +--
src/process-statusbar.c | 2 +-
src/process-tree-view.c | 15 ++++++-------
src/process-window.c | 52 +++++++++-------------------------------------
src/settings.c | 24 ++++++++++++++-------
src/task-manager.c | 22 +++++++++----------
6 files changed, 46 insertions(+), 74 deletions(-)
diff --git a/src/main.c b/src/main.c
index 27c105b..cb1d8b9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,11 +23,10 @@ static XtmTaskManager *task_manager;
static gboolean timeout = 0;
static gboolean
-init_timeout ()
+init_timeout (void)
{
guint num_processes;
gfloat cpu, memory, swap;
- const GArray *task_list;
xtm_task_manager_get_system_info (task_manager, &num_processes, &cpu,
&memory, &swap);
xtm_process_window_set_system_info (XTM_PROCESS_WINDOW (window),
num_processes, cpu, memory, swap);
@@ -35,7 +34,7 @@ init_timeout ()
xtm_task_manager_update_model (task_manager);
if (timeout == 0)
- timeout = g_timeout_add (1000, init_timeout, NULL);
+ timeout = g_timeout_add (1000, (GSourceFunc)init_timeout, NULL);
return TRUE;
}
diff --git a/src/process-statusbar.c b/src/process-statusbar.c
index 48d191b..aecac8f 100644
--- a/src/process-statusbar.c
+++ b/src/process-statusbar.c
@@ -153,7 +153,7 @@ xtm_process_statusbar_set_property (GObject *object, guint
property_id, const GV
GtkWidget *
-xtm_process_statusbar_new ()
+xtm_process_statusbar_new (void)
{
return g_object_new (XTM_TYPE_PROCESS_STATUSBAR, NULL);
}
diff --git a/src/process-tree-view.c b/src/process-tree-view.c
index afb59b4..bb99512 100644
--- a/src/process-tree-view.c
+++ b/src/process-tree-view.c
@@ -203,13 +203,13 @@ cb_send_signal (GtkMenuItem *mi, gpointer user_data)
{
GtkWidget *dialog;
guint pid = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (mi), "pid"));
- gint signal = GPOINTER_TO_INT (user_data);
+ gint xtm_signal = GPOINTER_TO_INT (user_data);
- if (signal == XTM_SIGNAL_TERMINATE || signal == XTM_SIGNAL_KILL)
+ if (xtm_signal == XTM_SIGNAL_TERMINATE || xtm_signal == XTM_SIGNAL_KILL)
{
gint res;
dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
- (signal == XTM_SIGNAL_TERMINATE) ? _("Terminate task")
: _("Kill task"));
+ (xtm_signal == XTM_SIGNAL_TERMINATE) ? _("Terminate
task") : _("Kill task"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG
(dialog),
_("Are you sure you want to send a signal to the PID
%d?"), pid);
gtk_window_set_title (GTK_WINDOW (dialog), _("Task Manager"));
@@ -219,7 +219,7 @@ cb_send_signal (GtkMenuItem *mi, gpointer user_data)
return;
}
- if (!send_signal_to_pid (pid, signal))
+ if (!send_signal_to_pid (pid, xtm_signal))
{
dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
_("Error sending signal"));
@@ -411,9 +411,8 @@ settings_changed (GObject *object, GParamSpec *pspec,
XtmProcessTreeView *treevi
gboolean visible;
gushort column_id;
- if (!g_strcmp0 (pspec->name, "column-uid"))
- column_id = COLUMN_UID;
- else if (!g_strcmp0 (pspec->name, "column-pid"))
+ column_id = COLUMN_UID;
+ if (!g_strcmp0 (pspec->name, "column-pid"))
column_id = COLUMN_PID;
else if (!g_strcmp0 (pspec->name, "column-ppid"))
column_id = COLUMN_PPID;
@@ -441,7 +440,7 @@ settings_changed (GObject *object, GParamSpec *pspec,
XtmProcessTreeView *treevi
GtkWidget *
-xtm_process_tree_view_new ()
+xtm_process_tree_view_new (void)
{
return g_object_new (XTM_TYPE_PROCESS_TREE_VIEW, NULL);
}
diff --git a/src/process-window.c b/src/process-window.c
index 307a135..1d0bdce 100644
--- a/src/process-window.c
+++ b/src/process-window.c
@@ -49,8 +49,6 @@ struct _XtmProcessWindowPriv
G_DEFINE_TYPE (XtmProcessWindow, xtm_process_window, GTK_TYPE_WIDGET)
static void xtm_process_window_finalize (GObject
*object);
-static void xtm_process_window_get_property (GObject
*object, guint property_id, GValue *value, GParamSpec *pspec);
-static void xtm_process_window_set_property (GObject
*object, guint property_id, const GValue *value, GParamSpec *pspec);
static void xtm_process_window_show (GtkWidget
*widget);
static void xtm_process_window_hide (GtkWidget
*widget);
@@ -74,9 +72,6 @@ xtm_process_window_class_init (XtmProcessWindowClass *klass)
widget_class = GTK_WIDGET_CLASS (klass);
widget_class->show = xtm_process_window_show;
widget_class->hide = xtm_process_window_hide;
-
- class->get_property = xtm_process_window_get_property;
- class->set_property = xtm_process_window_set_property;
}
static void
@@ -137,7 +132,7 @@ xtm_process_window_finalize (GObject *object)
GtkSortType sort_type;
gtk_window_get_size (GTK_WINDOW (priv->window), &width,
&height);
- xtm_process_tree_view_get_sort_column_id (XTM_PROCESS_TREE_VIEW
(priv->treeview), &sort_column_id, &sort_type);
+ xtm_process_tree_view_get_sort_column_id (XTM_PROCESS_TREE_VIEW
(priv->treeview), (gint*)&sort_column_id, &sort_type);
g_object_set (priv->settings, "window-width", width,
"window-height", height,
"sort-column-id", sort_column_id, "sort-type",
sort_type, NULL);
@@ -149,32 +144,6 @@ xtm_process_window_finalize (GObject *object)
}
}
-static void
-xtm_process_window_get_property (GObject *object, guint property_id, GValue
*value, GParamSpec *pspec)
-{
- XtmProcessWindowPriv *priv = XTM_PROCESS_WINDOW (object)->priv;
-
- switch (property_id)
- {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
- break;
- }
-}
-
-static void
-xtm_process_window_set_property (GObject *object, guint property_id, const
GValue *value, GParamSpec *pspec)
-{
- XtmProcessWindowPriv *priv = XTM_PROCESS_WINDOW (object)->priv;
-
- switch (property_id)
- {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
- break;
- }
-}
-
/**
* Helper functions
*/
@@ -218,7 +187,6 @@ show_menu_execute_task (XtmProcessWindow *window)
{
// TODO check if xfrun4, xfce4-appfinder, etc are installed and pull
them in the menu
static GtkWidget *menu = NULL;
- GtkWidget *mi;
if (menu == NULL)
{
@@ -339,7 +307,7 @@ show_about_dialog (XtmProcessWindow *window)
*/
GtkWidget *
-xtm_process_window_new ()
+xtm_process_window_new (void)
{
return g_object_new (XTM_TYPE_PROCESS_WINDOW, NULL);
}
@@ -347,32 +315,32 @@ xtm_process_window_new ()
static void
xtm_process_window_show (GtkWidget *widget)
{
- g_return_if_fail (G_LIKELY (GTK_IS_WIDGET (widget)));
- g_return_if_fail (G_LIKELY (GTK_IS_WIDGET (XTM_PROCESS_WINDOW
(widget)->priv->window)));
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+ g_return_if_fail (GTK_IS_WIDGET (XTM_PROCESS_WINDOW
(widget)->priv->window));
gtk_widget_show (XTM_PROCESS_WINDOW (widget)->priv->window);
}
static void
xtm_process_window_hide (GtkWidget *widget)
{
- g_return_if_fail (G_LIKELY (GTK_IS_WIDGET (widget)));
- g_return_if_fail (G_LIKELY (GTK_IS_WIDGET (XTM_PROCESS_WINDOW
(widget)->priv->window)));
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+ g_return_if_fail (GTK_IS_WIDGET (XTM_PROCESS_WINDOW
(widget)->priv->window));
gtk_widget_hide (XTM_PROCESS_WINDOW (widget)->priv->window);
}
GtkTreeModel *
xtm_process_window_get_model (XtmProcessWindow *window)
{
- g_return_val_if_fail (G_LIKELY (XTM_IS_PROCESS_WINDOW (window)), NULL);
- g_return_val_if_fail (G_LIKELY (GTK_IS_TREE_VIEW
(window->priv->treeview)), NULL);
+ g_return_val_if_fail (XTM_IS_PROCESS_WINDOW (window), NULL);
+ g_return_val_if_fail (GTK_IS_TREE_VIEW (window->priv->treeview), NULL);
return gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER
(gtk_tree_view_get_model (GTK_TREE_VIEW (window->priv->treeview))));
}
void
xtm_process_window_set_system_info (XtmProcessWindow *window, guint
num_processes, gfloat cpu, gfloat memory, gfloat swap)
{
- g_return_if_fail (G_LIKELY (XTM_IS_PROCESS_WINDOW (window)));
- g_return_if_fail (G_LIKELY (GTK_IS_STATUSBAR
(window->priv->statusbar)));
+ g_return_if_fail (XTM_IS_PROCESS_WINDOW (window));
+ g_return_if_fail (GTK_IS_STATUSBAR (window->priv->statusbar));
g_object_set (window->priv->statusbar, "num-processes", num_processes,
"cpu", cpu, "memory", memory, "swap", swap, NULL);
// TODO update cpu/memory monitors
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR
(window->priv->memory_monitor), memory / 100.0);
diff --git a/src/settings.c b/src/settings.c
index 0a0aa8f..854b1cf 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -14,6 +14,14 @@
#include <config.h>
#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
#include <glib-object.h>
#include <glib.h>
@@ -105,7 +113,7 @@ static void
xtm_settings_get_property (GObject *object, guint property_id, GValue *value,
GParamSpec *pspec)
{
GValue *src = XTM_SETTINGS (object)->values + property_id;
- if (G_LIKELY (G_IS_VALUE (src)))
+ if (G_IS_VALUE (src))
g_value_copy (src, value);
else
g_param_value_set_default (pspec, value);
@@ -115,12 +123,12 @@ static void
xtm_settings_set_property (GObject *object, guint property_id, const GValue
*value, GParamSpec *pspec)
{
GValue *dest = XTM_SETTINGS (object)->values + property_id;
- if (G_UNLIKELY (!G_IS_VALUE(dest)))
+ if (!G_IS_VALUE(dest))
{
g_value_init (dest, pspec->value_type);
g_param_value_set_default (pspec, dest);
}
- if (G_LIKELY (g_param_values_cmp (pspec, value, dest) != 0))
+ if (g_param_values_cmp (pspec, value, dest) != 0)
{
g_value_copy (value, dest);
xtm_settings_save_settings (XTM_SETTINGS (object));
@@ -148,7 +156,7 @@ transform_string_to_uint (const GValue *src, GValue *dst)
}
static void
-register_transformable ()
+register_transformable (void)
{
if (!g_value_type_transformable (G_TYPE_STRING, G_TYPE_BOOLEAN))
g_value_register_transform_func (G_TYPE_STRING, G_TYPE_BOOLEAN,
transform_string_to_boolean);
@@ -188,7 +196,7 @@ xtm_settings_load_settings (XtmSettings *settings)
{
spec = specs[n];
string = g_key_file_get_string (rc, "Settings",
g_param_spec_get_nick (spec), NULL);
- if (G_UNLIKELY (string == NULL))
+ if (string == NULL)
continue;
g_value_init (&src, G_TYPE_STRING);
@@ -257,7 +265,7 @@ xtm_settings_save_settings (XtmSettings *settings)
}
string = g_value_get_string (&dst);
- if (G_LIKELY (string != NULL))
+ if (string != NULL)
g_key_file_set_string (rc, "Settings",
g_param_spec_get_nick (spec), string);
g_value_unset (&dst);
@@ -294,10 +302,10 @@ xtm_settings_save_settings (XtmSettings *settings)
XtmSettings *
-xtm_settings_get_default ()
+xtm_settings_get_default (void)
{
static XtmSettings *settings = NULL;
- if (G_UNLIKELY (settings == NULL))
+ if (settings == NULL)
{
settings = g_object_new (XTM_TYPE_SETTINGS, NULL);
g_object_add_weak_pointer (G_OBJECT (settings),
(gpointer)&settings);
diff --git a/src/task-manager.c b/src/task-manager.c
index c1cd55c..2f3ca5e 100644
--- a/src/task-manager.c
+++ b/src/task-manager.c
@@ -89,8 +89,8 @@ xtm_task_manager_finalize (GObject *object)
static void
_xtm_task_manager_set_model (XtmTaskManager *manager, GtkTreeModel *model)
{
- g_return_if_fail (G_LIKELY (XTM_IS_TASK_MANAGER (manager)));
- g_return_if_fail (G_LIKELY (GTK_IS_TREE_MODEL (model)));
+ g_return_if_fail (XTM_IS_TASK_MANAGER (manager));
+ g_return_if_fail (GTK_IS_TREE_MODEL (model));
manager->model = model;
}
@@ -117,18 +117,18 @@ memory_human_size (guint64 mem, gchar *mem_str)
mem_tmp = mem / 1024 / 1024;
if (mem_tmp > 3)
{
- g_snprintf (mem_str, 64, _("%lu MiB"), mem_tmp);
+ g_snprintf (mem_str, 64, _("%lu MiB"), (gulong)mem_tmp);
return;
}
mem_tmp = mem / 1024;
if (mem_tmp > 8)
{
- g_snprintf (mem_str, 64, _("%lu KiB"), mem_tmp);
+ g_snprintf (mem_str, 64, _("%lu KiB"), (gulong)mem_tmp);
return;
}
- g_snprintf (mem_str, 64, _("%lu B"), mem);
+ g_snprintf (mem_str, 64, _("%lu B"), (gulong)mem);
}
static void
@@ -199,14 +199,14 @@ xtm_task_manager_new (GtkTreeModel *model)
const gchar *
xtm_task_manager_get_username (XtmTaskManager *manager)
{
- g_return_val_if_fail (G_LIKELY (XTM_IS_TASK_MANAGER (manager)), NULL);
+ g_return_val_if_fail (XTM_IS_TASK_MANAGER (manager), NULL);
return manager->owner_uid_name;
}
const gchar *
xtm_task_manager_get_hostname (XtmTaskManager *manager)
{
- g_return_val_if_fail (G_LIKELY (XTM_IS_TASK_MANAGER (manager)), NULL);
+ g_return_val_if_fail (XTM_IS_TASK_MANAGER (manager), NULL);
return manager->hostname;
}
@@ -244,8 +244,6 @@ void
xtm_task_manager_update_model (XtmTaskManager *manager)
{
GArray *array;
- GtkTreeIter iter;
- gboolean valid;
guint i;
/* Retrieve initial task list and return */
@@ -365,7 +363,7 @@ get_owner_uid (guint *owner_uid, gchar **owner_uid_name)
}
gchar *
-get_hostname ()
+get_hostname (void)
{
#ifndef HOST_NAME_MAX
#define HOST_NAME_MAX 255
@@ -377,11 +375,11 @@ get_hostname ()
}
gboolean
-send_signal_to_pid (guint pid, gint signal)
+send_signal_to_pid (guint pid, gint xtm_signal)
{
gint sig;
gint res;
- switch (signal)
+ switch (xtm_signal)
{
case XTM_SIGNAL_TERMINATE:
sig = SIGTERM;
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
