summaryrefslogtreecommitdiff
path: root/multiload/src
diff options
context:
space:
mode:
Diffstat (limited to 'multiload/src')
-rw-r--r--multiload/src/Makefile.am30
-rw-r--r--multiload/src/linux-proc.c1
-rw-r--r--multiload/src/load-graph.c3
-rw-r--r--multiload/src/main.c32
-rw-r--r--multiload/src/properties.c8
5 files changed, 49 insertions, 25 deletions
diff --git a/multiload/src/Makefile.am b/multiload/src/Makefile.am
index 670f1c50..6b42871f 100644
--- a/multiload/src/Makefile.am
+++ b/multiload/src/Makefile.am
@@ -8,11 +8,11 @@ AM_CPPFLAGS = \
$(GIO_CFLAGS) \
${WARN_CFLAGS}
-libexec_PROGRAMS = mate-multiload-applet
-
-BUILT_SOURCES = multiload-resources.c multiload-resources.h
-nodist_mate_multiload_applet_SOURCES = $(BUILT_SOURCES)
-mate_multiload_applet_SOURCES = \
+BUILT_SOURCES = \
+ multiload-resources.c \
+ multiload-resources.h \
+ $(NULL)
+APPLET_SOURCES = \
global.h \
linux-proc.h \
load-graph.h \
@@ -22,14 +22,30 @@ mate_multiload_applet_SOURCES = \
properties.c \
netspeed.c netspeed.h \
autoscaler.c \
- autoscaler.h
+ autoscaler.h \
+ $(NULL)
-mate_multiload_applet_LDADD = \
+APPLET_LIBS = \
$(MATE_APPLETS4_LIBS) \
$(GTOP_APPLETS_LIBS) \
$(GIO_LIBS) \
-lm
+if ENABLE_IN_PROCESS
+pkglib_LTLIBRARIES = libmate-multiload-applet.la
+nodist_libmate_multiload_applet_la_SOURCES = $(BUILT_SOURCES)
+libmate_multiload_applet_la_SOURCES = $(APPLET_SOURCES)
+libmate_multiload_applet_la_CFLAGS = $(AM_CFLAGS)
+libmate_multiload_applet_la_LDFLAGS = -module -avoid-version
+libmate_multiload_applet_la_LIBADD = $(APPLET_LIBS)
+else !ENABLE_IN_PROCESS
+libexec_PROGRAMS = mate-multiload-applet
+nodist_mate_multiload_applet_SOURCES = $(BUILT_SOURCES)
+mate_multiload_applet_SOURCES = $(APPLET_SOURCES)
+mate_multiload_applet_CFLAGS = $(AM_CFLAGS)
+mate_multiload_applet_LDADD = $(APPLET_LIBS)
+endif !ENABLE_IN_PROCESS
+
multiload-resources.c: $(srcdir)/../data/multiload-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/multiload-resources.gresource.xml)
$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name multiload $<
diff --git a/multiload/src/linux-proc.c b/multiload/src/linux-proc.c
index 10b3ddd5..f5549f67 100644
--- a/multiload/src/linux-proc.c
+++ b/multiload/src/linux-proc.c
@@ -109,7 +109,6 @@ GetDiskLoad (guint64 Maximum,
multiload = g->multiload;
-
if(first_call)
{
autoscaler_init (&scaler, g->speed, 500);
diff --git a/multiload/src/load-graph.c b/multiload/src/load-graph.c
index 23fbacde..e8ca8bd3 100644
--- a/multiload/src/load-graph.c
+++ b/multiload/src/load-graph.c
@@ -43,7 +43,6 @@ shift_right(LoadGraph *g)
g->data[0] = last_data;
}
-
/* Redraws the backing pixmap for the load graph and updates the window */
static void
load_graph_draw (LoadGraph *g)
@@ -473,7 +472,7 @@ load_graph_new (MultiloadApplet *ma, guint n, const gchar *label,
g_signal_connect (g->disp, "draw",
G_CALLBACK (load_graph_expose), g);
- g_signal_connect (g->disp, "configure_event",
+ g_signal_connect (g->disp, "configure-event",
G_CALLBACK (load_graph_configure), g);
g_signal_connect (g->disp, "destroy",
G_CALLBACK (load_graph_destroy), g);
diff --git a/multiload/src/main.c b/multiload/src/main.c
index 3d88e6b0..9439b320 100644
--- a/multiload/src/main.c
+++ b/multiload/src/main.c
@@ -222,7 +222,6 @@ multiload_destroy_cb(GtkWidget *widget, gpointer data)
return;
}
-
static gboolean
multiload_button_press_event_cb (GtkWidget *widget, GdkEventButton *event, MultiloadApplet *ma)
{
@@ -483,6 +482,7 @@ multiload_applet_new(MatePanelApplet *applet, const gchar *iid, gpointer data)
MultiloadApplet *ma;
GSettings *lockdown_settings;
GtkActionGroup *action_group;
+ AtkObject *atk_obj;
context = gtk_widget_get_style_context (GTK_WIDGET (applet));
gtk_style_context_add_class (context, "multiload-applet");
@@ -495,7 +495,9 @@ multiload_applet_new(MatePanelApplet *applet, const gchar *iid, gpointer data)
ma->prop_dialog = NULL;
ma->last_clicked = 0;
+#ifndef ENABLE_IN_PROCESS
g_set_application_name (_("System Monitor"));
+#endif
gtk_window_set_default_icon_name ("utilities-system-monitor");
@@ -533,17 +535,27 @@ multiload_applet_new(MatePanelApplet *applet, const gchar *iid, gpointer data)
g_object_unref (action_group);
- g_signal_connect (applet, "change_size",
+ g_signal_connect (applet, "change-size",
G_CALLBACK (multiload_change_size_cb), ma);
- g_signal_connect (applet, "change_orient",
+ g_signal_connect (applet, "change-orient",
G_CALLBACK (multiload_change_orient_cb), ma);
g_signal_connect (applet, "destroy",
G_CALLBACK (multiload_destroy_cb), ma);
- g_signal_connect (applet, "button_press_event",
+ g_signal_connect (applet, "button-press-event",
G_CALLBACK (multiload_button_press_event_cb), ma);
- g_signal_connect (applet, "key_press_event",
+ g_signal_connect (applet, "key-press-event",
G_CALLBACK (multiload_key_press_event_cb), ma);
+ atk_obj = gtk_widget_get_accessible (GTK_WIDGET (applet));
+
+ if (GTK_IS_ACCESSIBLE (atk_obj)) {
+ atk_object_set_name (atk_obj, _("System Monitor"));
+ atk_object_set_description (atk_obj,
+ _("A system load monitor capable of displaying graphs "
+ "for CPU, ram, and swap space use, plus network "
+ "traffic."));
+ }
+
multiload_applet_refresh (ma);
gtk_widget_show(GTK_WIDGET(applet));
@@ -565,8 +577,8 @@ multiload_factory (MatePanelApplet *applet,
return retval;
}
-MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("MultiLoadAppletFactory",
- PANEL_TYPE_APPLET,
- "multiload",
- multiload_factory,
- NULL)
+PANEL_APPLET_FACTORY ("MultiLoadAppletFactory",
+ PANEL_TYPE_APPLET,
+ "multiload",
+ multiload_factory,
+ NULL)
diff --git a/multiload/src/properties.c b/multiload/src/properties.c
index 37cc8bf2..e776b7b8 100644
--- a/multiload/src/properties.c
+++ b/multiload/src/properties.c
@@ -32,7 +32,6 @@ hard_set_sensitive (GtkWidget *w, gboolean sensitivity)
GINT_TO_POINTER ( ! sensitivity));
}
-
/* set sensitive, but always insensitive if NEVER_SENSITIVE is set */
static void
soft_set_sensitive (GtkWidget *w, gboolean sensitivity)
@@ -147,7 +146,6 @@ on_net_threshold1_spin_button_value_changed (GtkSpinButton *spin_button,
g_settings_set_uint64 (ma->settings, KEY_NET_THRESHOLD1, ma->net_threshold1);
}
-
static void
on_net_threshold2_spin_button_value_changed (GtkSpinButton *spin_button,
gpointer user_data)
@@ -167,7 +165,6 @@ on_net_threshold2_spin_button_value_changed (GtkSpinButton *spin_button,
g_settings_set_uint64 (ma->settings, KEY_NET_THRESHOLD2, ma->net_threshold2);
}
-
static void
on_net_threshold3_spin_button_value_changed (GtkSpinButton *spin_button,
gpointer user_data)
@@ -526,12 +523,13 @@ read_color_button (GtkWidget *widget,
GdkRGBA color;
gchar *color_string;
- if ((color_string = g_settings_get_string (settings, key)) != NULL) {
+ color_string = g_settings_get_string (settings, key);
+ if (*color_string != '\0') {
gdk_rgba_parse (&color, color_string);
- g_free (color_string);
} else {
gdk_rgba_parse (&color, "#000000");
}
+ g_free (color_string);
gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (widget), &color);
if (!g_settings_is_writable (settings, key))
generated by cgit v1.2.1 (git 2.18.0) at 2025-07-03 01:16:46 +0000