Commit cdd5293a authored by Dmitry Shachnev's avatar Dmitry Shachnev

modem-lights: remove

This applet is not working, modern distros do not ship network-conf,
and percent of modem users should be very low now.
parent d2a61fa7
Pipeline #44540 canceled with stage
in 40 seconds
......@@ -11,12 +11,6 @@ if BUILD_LIBGWEATHER_APPLETS
libgweather_SUBDIRS = $(libgweather_applets)
endif
modemlights_applets = \
modem-lights
if APPLET_MODEMLIGHTS
modemlights_SUBDIRS = $(modemlights_applets)
endif
if BUILD_BATTSTAT_APPLET
battstat_SUBDIR = battstat
endif
......@@ -58,7 +52,6 @@ always_built_SUBDIRS = \
SUBDIRS = \
po \
$(always_built_SUBDIRS) \
$(modemlights_SUBDIRS) \
$(gtop_SUBDIRS) \
$(libgweather_SUBDIRS) \
$(vfs_SUBDIRS) \
......@@ -72,7 +65,6 @@ SUBDIRS = \
DIST_SUBDIRS = \
po \
modem-lights \
drivemount \
charpick \
geyes \
......
......@@ -139,17 +139,6 @@ AC_SUBST(GTOP_APPLETS_CFLAGS)
AC_SUBST(GTOP_APPLETS_LIBS)
AM_CONDITIONAL(BUILD_GTOP_APPLETS, $build_gtop_applets)
dnl -- check for gnome-settings-daemon (optional) -----------------------------
PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON, gnome-settings-daemon,
HAVE_GNOME_SETTINGS_DAEMON=yes, HAVE_GNOME_SETTINGS_DAEMON=no)
if test "x$HAVE_GNOME_SETTINGS_DAEMON" = "xno"; then
AC_MSG_WARN([gnome-settings-daemon DBUS API is required to build modem-applet.])
fi
AC_SUBST(GNOME_SETTINGS_DAEMON_CFLAGS)
AC_SUBST(GNOME_SETTINGS_DAEMON_LIBS)
dnl -- check for libwnck (required) -------------------------------------------
PKG_CHECK_MODULES(LIBWNCK, libwnck-3.0 >= $LIBWNCK_REQUIRED,,
AC_MSG_ERROR([libwnck is required to build gnome-applets.], 1))
......@@ -392,29 +381,6 @@ if test "x$APPLET_ACCESSX" = "xtrue"; then
fi
CPPFLAGS=$savecppflags
dnl ***************************************************************************
dnl *** modemlights applet check ***
dnl ***************************************************************************
SU_TOOL=
HAVE_LIBUTIL=
AC_PATH_PROG(SU_TOOL, su)
AC_CHECK_LIB(util, forkpty, HAVE_LIBUTIL=true, HAVE_LIBUTIL=false)
if test "x$HAVE_LIBUTIL" = "xtrue" -a "x$HAVE_GNOME_SETTINGS_DAEMON" = "xyes"; then
MODEMLIGHTS_LIBS=" -lutil"
AC_SUBST(MODEMLIGHTS_LIBS)
AC_DEFINE_UNQUOTED(STB_SCRIPTS_DIR, "$STB_SCRIPTS_DIR", [System tools backends])
AC_DEFINE_UNQUOTED(SU_PATH, "${SU_TOOL}", [su executable path])
BUILD_MODEM_LIGHTS=yes
else
AC_MSG_WARN([*** modemlights applet will not be built ***])
BUILD_MODEM_LIGHTS=no
fi
AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes")
dnl ***************************************************************************
dnl *** cpufreq applet check ***
dnl ***************************************************************************
......@@ -661,9 +627,6 @@ AC_CONFIG_FILES([
mini-commander/Makefile
mini-commander/src/Makefile
modem-lights/Makefile
modem-lights/src/Makefile
multiload/Makefile
multiload/help/Makefile
multiload/src/Makefile
......@@ -752,7 +715,6 @@ echo " geyes .........................: always"
echo " gweather ......................: $build_libgweather_applets"
echo " inhibit .......................: always"
echo " mini-commander ................: $enable_mini_commander"
echo " modem-lights ..................: $BUILD_MODEM_LIGHTS"
echo " multiload .....................: $build_gtop_applets"
echo " netspeed ......................: $build_gtop_applets"
echo " sticky-notes ..................: $enable_stickynotes"
......
Carlos Garnacho <carlosg@gnome.org>
The Old Applet:
John Ellis <johne@bellatlantic.net>
NULL =
SUBDIRS = src
uidir = $(pkgdatadir)/ui
ui_DATA = modem-applet-menu.xml
APPLET_LOCATION=$(pkglibdir)/libmodem-lights-applet.so
appletdir = $(LIBPANEL_APPLET_DIR)
applet_in_files = org.gnome.applets.ModemApplet.panel-applet.in
applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
$(applet_in_files): $(applet_in_files).in Makefile
$(AM_V_GEN)sed \
-e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
$< > $@
%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
builderdir = $(pkgdatadir)/builder
builder_DATA = modemlights.ui
icons = \
gnome-modem-monitor-applet.svg \
gnome-modem-monitor-applet.16.png \
gnome-modem-monitor-applet.32.png \
gnome-modem-monitor-applet.22.png \
gnome-modem-monitor-applet.24.png
EXTRA_DIST = \
org.gnome.applets.ModemApplet.panel-applet.in.in \
$(service_in_files) \
$(icons) \
$(builder_DATA) \
$(ui_DATA)
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
uninstall-local:
for icon in $(icons); do \
SIZE=`echo $$icon | cut -d. -f2`; \
FILE=`echo $$icon | cut -d. -f1,3`; \
if [ "$$SIZE" = "svg" ]; then \
SIZE="scalable"; \
FILE="$$FILE.svg"; \
else \
SIZE="$${SIZE}x$${SIZE}"; \
fi; \
rm -f $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
done
@-if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
$(gtk_update_icon_cache); \
else \
echo "*** Icon cache not updated. After install, run this:"; \
echo "*** $(gtk_update_icon_cache)"; \
fi
install-data-local:
for icon in $(icons); do \
SIZE=`echo $$icon | cut -d. -f2`; \
FILE=`echo $$icon | cut -d. -f1,3`; \
if [ "$$SIZE" = "svg" ]; then \
SIZE="scalable"; \
FILE="$$FILE.svg"; \
else \
SIZE="$${SIZE}x$${SIZE}"; \
fi; \
mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/; \
$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
done
@-if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
$(gtk_update_icon_cache); \
else \
echo "*** Icon cache not updated. After install, run this:"; \
echo "*** $(gtk_update_icon_cache)"; \
fi
-include $(top_srcdir)/git.mk
This diff is collapsed.
<section>
<item>
<attribute name="label" translatable="yes">_Activate</attribute>
<attribute name="action">modem.activate</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_Deactivate</attribute>
<attribute name="action">modem.deactivate</attribute>
</item>
</section>
<section>
<item>
<attribute name="label" translatable="yes">_Properties</attribute>
<attribute name="action">modem.preferences</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_About</attribute>
<attribute name="action">modem.about</attribute>
</item>
</section>
<?xml version="1.0" encoding="UTF-8" ?>
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="auth_dialog">
<property name="title" translatable="yes">Enter password</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">center</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="border_width">7</property>
<property name="orientation">horizontal</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="stock">gnome-stock-authentication</property>
<property name="icon-size">6</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Root password required</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="scale" value="1.300000"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="auth_dialog_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="wrap">True</property>
<property name="selectable">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox2">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="label" translatable="yes">Password:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="auth_dialog_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
<property name="activates_default">True</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton1">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="okbutton1">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="-6">cancelbutton1</action-widget>
<action-widget response="-5">okbutton1</action-widget>
</action-widgets>
</object>
<object class="GtkWindow" id="report_window">
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">center</property>
<child>
<object class="GtkBox" id="hbox3">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="orientation">horizontal</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="report_window_image">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="spacing">12</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="label" translatable="yes">Connecting with Internet Service Provider</property>
<property name="wrap">True</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="scale" value="1.250000"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkProgressBar" id="report_window_progress">
<property name="visible">True</property>
<property name="pulse_step">0.10000000149</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</interface>
[Applet Factory]
Id=ModemAppletFactory
InProcess=true
Location=@APPLET_LOCATION@
Name=Modem Factory
Description=Modem Applet Factory
[ModemLightsApplet]
_Name=Modem Monitor
_Description=Activate and monitor a dial-up network connection
Icon=gnome-modem-monitor-applet
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-applets
X-GNOME-Bugzilla-Component=modemlights
X-GNOME-Bugzilla-Version=@VERSION@
NULL =
uidir = $(pkgdatadir)/ui
modem_lights_appletlibdir = $(pkglibdir)
modem_lights_appletlib_LTLIBRARIES = libmodem-lights-applet.la
libmodem_lights_applet_la_CPPFLAGS = \
-I. \
-I$(srcdir) \
-DG_LOG_DOMAIN=\"org.gnome.gnome-applets.modem-lights\" \
-DG_LOG_USE_STRUCTURED=1 \
-DMODEM_MENU_UI_DIR=\""$(uidir)"\" \
-DGNOMELOCALEDIR=\""$(localedir)"\" \
-DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \
$(NULL)
libmodem_lights_applet_la_CFLAGS = \
$(GNOME_APPLETS_CFLAGS) \
$(XML2_CFLAGS) \
$(WARN_CFLAGS) \
$(AM_CFLAGS) \
$(NULL)
libmodem_lights_applet_la_SOURCES = \
modem-applet.c \
modem-applet.h \
$(NULL)
libmodem_lights_applet_la_LDFLAGS = \
-avoid-version \
$(WARN_LDFLAGS) \
$(AM_LDFLAGS) \
$(NULL)
libmodem_lights_applet_la_LIBADD = \
$(GNOME_APPLETS_LIBS) \
$(MODEMLIGHTS_LIBS) \
$(XML2_LIBS) \
$(NULL)
-include $(top_srcdir)/git.mk
This diff is collapsed.
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */
/* Copyright (C) 2004 Carlos Garnacho
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors: Carlos Garnacho Parro <carlosg@gnome.org>
*/
#ifndef __MODEM_APPLET_H
#define __MODEM_APPLET_H
G_BEGIN_DECLS
#include <panel-applet.h>
#define TYPE_MODEM_APPLET (modem_applet_get_type ())
#define MODEM_APPLET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MODEM_APPLET, ModemApplet))
#define MODEM_APPLET_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TYPE_MODEM_APPLET, ModemAppletClass))
#define IS_MODEM_APPLET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MODEM_APPLET))
#define IS_MODEM_APPLET_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_MODEM_APPLET))
#define MODEM_APPLET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MODEM_APPLET, ModemAppletClass))
typedef struct _ModemApplet ModemApplet;
typedef struct _ModemAppletClass ModemAppletClass;
typedef struct _ModemAppletPrivate ModemAppletPrivate;
struct _ModemApplet {
PanelApplet parent;
ModemAppletPrivate *priv;
};
struct _ModemAppletClass {
PanelAppletClass parent_class;
};
GType modem_applet_get_type (void);
G_END_DECLS
#endif /* __MODEM_APPLET_H */
......@@ -63,10 +63,6 @@ mini-commander/src/mini-commander_applet.c
[type: gettext/ini]mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in
mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in
mini-commander/src/preferences.c
[type: gettext/glade]modem-lights/modem-applet-menu.xml
[type: gettext/glade]modem-lights/modemlights.ui
[type: gettext/ini]modem-lights/org.gnome.applets.ModemApplet.panel-applet.in.in
modem-lights/src/modem-applet.c
[type: gettext/glade]multiload/multiload-applet-menu.xml
[type: gettext/ini]multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in
multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in
......
......@@ -22,7 +22,6 @@ gweather/org.gnome.gnome-applets.gweather.gschema.xml.in
inhibit/org.gnome.InhibitApplet.panel-applet.in
mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in
mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in
modem-lights/org.gnome.applets.ModemApplet.panel-applet.in
multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in
multiload/org.gnome.gnome-applets.multiload.gschema.xml.in
netspeed/data/org.gnome.gnome-applets.netspeed.gschema.xml.in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment