diff options
Diffstat (limited to 'netspeed/src')
| -rw-r--r-- | netspeed/src/Makefile.am | 41 | ||||
| -rw-r--r-- | netspeed/src/netspeed.c | 70 |
2 files changed, 66 insertions, 45 deletions
diff --git a/netspeed/src/Makefile.am b/netspeed/src/Makefile.am index e91c1b34..ceec7342 100644 --- a/netspeed/src/Makefile.am +++ b/netspeed/src/Makefile.am @@ -1,8 +1,5 @@ NULL = -mate_netspeed_applet_libdir= $(pkglibdir) -mate_netspeed_applet_lib_LTLIBRARIES=libmate-netspeed-applet.la - AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(includedir) \ @@ -16,35 +13,54 @@ if HAVE_NL AM_CPPFLAGS += $(NL_CFLAGS) endif -libmate_netspeed_applet_la_SOURCES = \ +BUILT_SOURCES = \ + netspeed-resources.c \ + netspeed-resources.h \ + $(NULL) +APPLET_SOURCES = \ backend.h \ backend.c \ netspeed.c \ netspeed.h \ netspeed-preferences.c \ netspeed-preferences.h \ - netspeed-resources.c \ - netspeed-resources.h \ $(NULL) if HAVE_NL -libmate_netspeed_applet_la_SOURCES += \ +APPLET_SOURCES += \ nl80211.h \ ieee80211.h \ $(NULL) endif -libmate_netspeed_applet_la_LIBADD = $(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 -libmate_netspeed_applet_la_LIBADD += $(IW_LIBS) +APPLET_LIBS += $(IW_LIBS) endif if HAVE_NL -libmate_netspeed_applet_la_LIBADD += $(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 $< @@ -52,6 +68,7 @@ netspeed-resources.h: $(srcdir)/../data/netspeed-resources.gresource.xml $(shell $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name netspeed $< CLEANFILES = \ + $(BUILT_SOURCES) \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/netspeed/src/netspeed.c b/netspeed/src/netspeed.c index 441f314f..73185abd 100644 --- a/netspeed/src/netspeed.c +++ b/netspeed/src/netspeed.c @@ -1575,6 +1575,10 @@ netspeed_applet_factory (MatePanelApplet *applet, 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,60 +1684,60 @@ netspeed_applet_factory (MatePanelApplet *applet, (GSourceFunc)timeout_function, netspeed); g_signal_connect_object (applet, "change-size", - G_CALLBACK (applet_change_size_or_orient), - netspeed, 0); + G_CALLBACK (applet_change_size_or_orient), + netspeed, 0); g_signal_connect_object (netspeed->icon_theme, "changed", - G_CALLBACK (icon_theme_changed_cb), - netspeed, 0); + G_CALLBACK (icon_theme_changed_cb), + netspeed, 0); g_signal_connect_object (applet, "change-orient", - G_CALLBACK (applet_change_size_or_orient), - netspeed, 0); + G_CALLBACK (applet_change_size_or_orient), + netspeed, 0); g_signal_connect_object (netspeed->in_label, "size-allocate", - G_CALLBACK (label_size_allocate_cb), - netspeed, 0); + G_CALLBACK (label_size_allocate_cb), + netspeed, 0); g_signal_connect_object (netspeed->out_label, "size-allocate", - G_CALLBACK (label_size_allocate_cb), - netspeed, 0); + G_CALLBACK (label_size_allocate_cb), + netspeed, 0); g_signal_connect_object (netspeed->sum_label, "size-allocate", - G_CALLBACK (label_size_allocate_cb), - netspeed, 0); + G_CALLBACK (label_size_allocate_cb), + netspeed, 0); g_signal_connect_object (netspeed->settings, "changed::auto-change-device", - G_CALLBACK (auto_change_device_settings_changed), - netspeed, 0); + G_CALLBACK (auto_change_device_settings_changed), + netspeed, 0); g_signal_connect_object (netspeed->settings, "changed::device", - G_CALLBACK (device_settings_changed), - netspeed, 0); + G_CALLBACK (device_settings_changed), + netspeed, 0); g_signal_connect_object (netspeed->settings, "changed::show-all-addresses", - G_CALLBACK (showalladdresses_settings_changed), - netspeed, 0); + G_CALLBACK (showalladdresses_settings_changed), + netspeed, 0); g_signal_connect_object (netspeed->settings, "changed::show-sum", - G_CALLBACK (showsum_settings_changed), - netspeed, 0); + G_CALLBACK (showsum_settings_changed), + netspeed, 0); g_signal_connect_object (netspeed->settings, "changed::show-bits", - G_CALLBACK (showbits_settings_changed), - netspeed, 0); + G_CALLBACK (showbits_settings_changed), + netspeed, 0); g_signal_connect_object (netspeed->settings, "changed::change-icon", - G_CALLBACK (changeicon_settings_changed), - netspeed, 0); + G_CALLBACK (changeicon_settings_changed), + netspeed, 0); g_signal_connect_object (netspeed->settings, "changed::show-icon", - G_CALLBACK (showicon_settings_changed), - netspeed, 0); + G_CALLBACK (showicon_settings_changed), + netspeed, 0); g_signal_connect_object (netspeed->settings, "changed::show-quality-icon", - G_CALLBACK (showqualityicon_settings_changed), - netspeed, 0); + 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); @@ -1759,8 +1763,8 @@ netspeed_applet_factory (MatePanelApplet *applet, return TRUE; } -MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("NetspeedAppletFactory", - NETSPEED_TYPE_APPLET, - "NetspeedApplet", - netspeed_applet_factory, - NULL) +PANEL_APPLET_FACTORY ("NetspeedAppletFactory", + NETSPEED_TYPE_APPLET, + "NetspeedApplet", + netspeed_applet_factory, + NULL) |