summaryrefslogtreecommitdiff
path: root/netspeed/src
diff options
context:
space:
mode:
Diffstat (limited to 'netspeed/src')
-rw-r--r--netspeed/src/Makefile.am39
-rw-r--r--netspeed/src/backend.c8
-rw-r--r--netspeed/src/netspeed.c108
3 files changed, 90 insertions, 65 deletions
diff --git a/netspeed/src/Makefile.am b/netspeed/src/Makefile.am
index 8358b3c9..ceec7342 100644
--- a/netspeed/src/Makefile.am
+++ b/netspeed/src/Makefile.am
@@ -13,11 +13,11 @@ if HAVE_NL
AM_CPPFLAGS += $(NL_CFLAGS)
endif
-libexec_PROGRAMS = mate-netspeed-applet
-
-BUILT_SOURCES = netspeed-resources.c netspeed-resources.h
-nodist_mate_netspeed_applet_SOURCES = $(BUILT_SOURCES)
-mate_netspeed_applet_SOURCES = \
+BUILT_SOURCES = \
+ netspeed-resources.c \
+ netspeed-resources.h \
+ $(NULL)
+APPLET_SOURCES = \
backend.h \
backend.c \
netspeed.c \
@@ -27,23 +27,40 @@ mate_netspeed_applet_SOURCES = \
$(NULL)
if HAVE_NL
-mate_netspeed_applet_SOURCES += \
+APPLET_SOURCES += \
nl80211.h \
ieee80211.h \
$(NULL)
endif
-mate_netspeed_applet_LDADD = $(GIO_LIBS) $(GTOP_APPLETS_LIBS) \
- $(MATE_APPLETS4_LIBS) \
- $(INTLLIBS) -lm
+APPLET_LIBS = \
+ $(GIO_LIBS) \
+ $(GTOP_APPLETS_LIBS) \
+ $(MATE_APPLETS4_LIBS) \
+ $(INTLLIBS) -lm
if HAVE_IW
-mate_netspeed_applet_LDADD += $(IW_LIBS)
+APPLET_LIBS += $(IW_LIBS)
endif
if HAVE_NL
-mate_netspeed_applet_LDADD += $(NL_LIBS)
+APPLET_LIBS += $(NL_LIBS)
endif
+if ENABLE_IN_PROCESS
+pkglib_LTLIBRARIES = libmate-netspeed-applet.la
+nodist_libmate_netspeed_applet_la_SOURCES = $(BUILT_SOURCES)
+libmate_netspeed_applet_la_SOURCES = $(APPLET_SOURCES)
+libmate_netspeed_applet_la_CFLAGS = $(AM_CFLAGS)
+libmate_netspeed_applet_la_LDFLAGS = -module -avoid-version
+libmate_netspeed_applet_la_LIBADD = $(APPLET_LIBS)
+else !ENABLE_IN_PROCESS
+libexec_PROGRAMS = mate-netspeed-applet
+nodist_mate_netspeed_applet_SOURCES = $(BUILT_SOURCES)
+mate_netspeed_applet_SOURCES = $(APPLET_SOURCES)
+mate_netspeed_applet_CFLAGS = $(AM_CFLAGS)
+mate_netspeed_applet_LDADD = $(APPLET_LIBS)
+endif !ENABLE_IN_PROCESS
+
netspeed-resources.c: $(srcdir)/../data/netspeed-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/netspeed-resources.gresource.xml)
$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name netspeed $<
diff --git a/netspeed/src/backend.c b/netspeed/src/backend.c
index 2888f876..e1321497 100644
--- a/netspeed/src/backend.c
+++ b/netspeed/src/backend.c
@@ -88,7 +88,6 @@ is_dummy_device (const char* device)
return FALSE;
}
-
/* Check for all available devices. This really should be
* portable for at least all plattforms using the gnu c lib
* TODO: drop it, use glibtop_get_netlist directly / gchar**
@@ -505,7 +504,6 @@ out_handle_destroy:
return err;
}
-
static void
nl80211_cleanup (struct nl80211_state *state)
{
@@ -817,7 +815,7 @@ get_wireless_info (DevInfo *devinfo)
ret = nl_recvmsgs_default (nlstate.sock);
nlmsg_free (msg);
if (ret < 0) {
- g_warning ("failed to recive netlink message");
+ g_warning ("failed to receive netlink message");
}
if (!devinfo->running)
@@ -841,7 +839,7 @@ get_wireless_info (DevInfo *devinfo)
ret = nl_recvmsgs_default (nlstate.sock);
nlmsg_free (msg);
if (ret < 0) {
- g_warning ("failed to recive netlink message");
+ g_warning ("failed to receive netlink message");
goto cleanup;
}
@@ -867,7 +865,7 @@ get_wireless_info (DevInfo *devinfo)
ret = nl_recvmsgs_default (nlstate.sock);
nlmsg_free (msg);
if (ret < 0) {
- g_warning ("failed to recive netlink message");
+ g_warning ("failed to receive netlink message");
}
cleanup:
diff --git a/netspeed/src/netspeed.c b/netspeed/src/netspeed.c
index 22e2331b..73185abd 100644
--- a/netspeed/src/netspeed.c
+++ b/netspeed/src/netspeed.c
@@ -1438,7 +1438,6 @@ update_tooltip (NetspeedApplet *netspeed)
g_string_free (tooltip, TRUE);
}
-
static gboolean
netspeed_applet_enter_notify_event (GtkWidget *widget,
GdkEventCrossing *event)
@@ -1568,13 +1567,17 @@ netspeed_applet_factory (MatePanelApplet *applet,
int i;
GtkWidget *spacer, *spacer_box;
GtkActionGroup *action_group;
+ AtkObject *atk_obj;
char *tmp;
if (strcmp (iid, "NetspeedApplet"))
return FALSE;
glibtop_init ();
+
+#ifndef ENABLE_IN_PROCESS
g_set_application_name (_("MATE Netspeed"));
+#endif
netspeed = NETSPEED_APPLET (applet);
netspeed->icon_theme = gtk_icon_theme_get_default ();
@@ -1680,62 +1683,61 @@ netspeed_applet_factory (MatePanelApplet *applet,
netspeed->timeout_id = g_timeout_add (REFRESH_TIME,
(GSourceFunc)timeout_function,
netspeed);
+ g_signal_connect_object (applet, "change-size",
+ G_CALLBACK (applet_change_size_or_orient),
+ netspeed, 0);
- g_signal_connect (applet, "change_size",
- G_CALLBACK (applet_change_size_or_orient),
- netspeed);
-
- g_signal_connect (netspeed->icon_theme, "changed",
- G_CALLBACK (icon_theme_changed_cb),
- netspeed);
+ g_signal_connect_object (netspeed->icon_theme, "changed",
+ G_CALLBACK (icon_theme_changed_cb),
+ netspeed, 0);
- g_signal_connect (applet, "change_orient",
- G_CALLBACK (applet_change_size_or_orient),
- netspeed);
+ g_signal_connect_object (applet, "change-orient",
+ G_CALLBACK (applet_change_size_or_orient),
+ netspeed, 0);
- g_signal_connect (netspeed->in_label, "size_allocate",
- G_CALLBACK (label_size_allocate_cb),
- netspeed);
+ g_signal_connect_object (netspeed->in_label, "size-allocate",
+ G_CALLBACK (label_size_allocate_cb),
+ netspeed, 0);
- g_signal_connect (netspeed->out_label, "size_allocate",
- G_CALLBACK (label_size_allocate_cb),
- netspeed);
+ g_signal_connect_object (netspeed->out_label, "size-allocate",
+ G_CALLBACK (label_size_allocate_cb),
+ netspeed, 0);
- g_signal_connect (netspeed->sum_label, "size_allocate",
- G_CALLBACK (label_size_allocate_cb),
- netspeed);
+ g_signal_connect_object (netspeed->sum_label, "size-allocate",
+ G_CALLBACK (label_size_allocate_cb),
+ netspeed, 0);
- g_signal_connect (netspeed->settings, "changed::auto-change-device",
- G_CALLBACK (auto_change_device_settings_changed),
- netspeed);
+ g_signal_connect_object (netspeed->settings, "changed::auto-change-device",
+ G_CALLBACK (auto_change_device_settings_changed),
+ netspeed, 0);
- g_signal_connect (netspeed->settings, "changed::device",
- G_CALLBACK (device_settings_changed),
- netspeed);
+ g_signal_connect_object (netspeed->settings, "changed::device",
+ G_CALLBACK (device_settings_changed),
+ netspeed, 0);
- g_signal_connect (netspeed->settings, "changed::show-all-addresses",
- G_CALLBACK (showalladdresses_settings_changed),
- netspeed);
+ g_signal_connect_object (netspeed->settings, "changed::show-all-addresses",
+ G_CALLBACK (showalladdresses_settings_changed),
+ netspeed, 0);
- g_signal_connect (netspeed->settings, "changed::show-sum",
- G_CALLBACK (showsum_settings_changed),
- netspeed);
+ g_signal_connect_object (netspeed->settings, "changed::show-sum",
+ G_CALLBACK (showsum_settings_changed),
+ netspeed, 0);
- g_signal_connect (netspeed->settings, "changed::show-bits",
- G_CALLBACK (showbits_settings_changed),
- netspeed);
+ g_signal_connect_object (netspeed->settings, "changed::show-bits",
+ G_CALLBACK (showbits_settings_changed),
+ netspeed, 0);
- g_signal_connect (netspeed->settings, "changed::change-icon",
- G_CALLBACK (changeicon_settings_changed),
- netspeed);
+ g_signal_connect_object (netspeed->settings, "changed::change-icon",
+ G_CALLBACK (changeicon_settings_changed),
+ netspeed, 0);
- g_signal_connect (netspeed->settings, "changed::show-icon",
- G_CALLBACK (showicon_settings_changed),
- netspeed);
+ g_signal_connect_object (netspeed->settings, "changed::show-icon",
+ G_CALLBACK (showicon_settings_changed),
+ netspeed, 0);
- g_signal_connect (netspeed->settings, "changed::show-quality-icon",
- G_CALLBACK (showqualityicon_settings_changed),
- netspeed);
+ g_signal_connect_object (netspeed->settings, "changed::show-quality-icon",
+ G_CALLBACK (showqualityicon_settings_changed),
+ netspeed, 0);
action_group = gtk_action_group_new ("Netspeed Applet Actions");
gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
@@ -1748,13 +1750,21 @@ netspeed_applet_factory (MatePanelApplet *applet,
NETSPEED_RESOURCE_PATH "netspeed-menu.xml",
action_group);
+ atk_obj = gtk_widget_get_accessible (GTK_WIDGET (applet));
+
+ if (GTK_IS_ACCESSIBLE (atk_obj)) {
+ atk_object_set_name (atk_obj, _("MATE Netspeed"));
+ atk_object_set_description (atk_obj,
+ _("A little applet that displays some information on the traffic on the specified network device"));
+ }
+
g_object_unref (action_group);
return TRUE;
}
-MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("NetspeedAppletFactory",
- NETSPEED_TYPE_APPLET,
- "NetspeedApplet",
- netspeed_applet_factory,
- NULL)
+PANEL_APPLET_FACTORY ("NetspeedAppletFactory",
+ NETSPEED_TYPE_APPLET,
+ "NetspeedApplet",
+ netspeed_applet_factory,
+ NULL)
generated by cgit v1.2.1 (git 2.18.0) at 2025-07-01 14:25:48 +0000