Commit 841ffd5d authored by Mark McLoughlin's avatar Mark McLoughlin Committed by Mark McLoughlin
Browse files

remove the pager, tasklist and showdesktop oaf_servers.

2003-01-10  Mark McLoughlin  <mark@skynet.ie>

        * GNOME_GenUtilApplet_Factory.server.in.in: remove
        the pager, tasklist and showdesktop oaf_servers.

        * Makefile.am: remove all the pager, tasklist and
        showdesktop files.

        * main.c: (genutil_factory): upd.

        * GNOME_PagerApplet.xml, GNOME_ShowDesktopApplet.xml,
          GNOME_TasklistApplet.xml, gnome-show-desktop.png,
          pager.[ch], pager.glade, pager.schemas.in, print.xpm
          printer.[ch] showdesktop.[ch], tasklist.[ch], tasklist.glade,
          tasklist.schemas.in: remove these files.
parent f99aa55c
Makefile.in
Makefile
.deps
_libs
.libs
gen_util_applet
.exrc
dummy.cc
*.lo
*.la
GNOME_GenUtilApplet_Factory.server
GNOME_GenUtilApplet_Factory.server.in
mailcheck.soundlist
clock.schemas
mailcheck.schemas
pager.schemas
tasklist.schemas
clock.schemas
*.gladep
2003-01-10 Mark McLoughlin <mark@skynet.ie>
* GNOME_GenUtilApplet_Factory.server.in.in: remove
the pager, tasklist and showdesktop oaf_servers.
* Makefile.am: remove all the pager, tasklist and
showdesktop files.
* main.c: (genutil_factory): upd.
* GNOME_PagerApplet.xml, GNOME_ShowDesktopApplet.xml,
GNOME_TasklistApplet.xml, gnome-show-desktop.png,
pager.[ch], pager.glade, pager.schemas.in, print.xpm
printer.[ch] showdesktop.[ch], tasklist.[ch], tasklist.glade,
tasklist.schemas.in: remove these files.
2003-01-08 Mark McLoughlin <mark@skynet.ie>
* mailcheck.schemas.in: s/Remove/Remote/
......
......@@ -28,38 +28,6 @@
<oaf_attribute name="panel:category" type="string" _value="Accessories"/>
</oaf_server>
<oaf_server iid="OAFIID:GNOME_PagerApplet"
type="factory"
location="OAFIID:GNOME_GenUtilApplet_Factory">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" _value="Workspace Switcher"/>
<oaf_attribute name="description" type="string" _value="Switch between workspaces"/>
<oaf_attribute name="panel:icon" type="string" value="gnome-workspace.png"/>
<oaf_attribute name="panel:category" type="string" _value="Utility"/>
</oaf_server>
<oaf_server iid="OAFIID:GNOME_TasklistApplet"
type="factory"
location="OAFIID:GNOME_GenUtilApplet_Factory">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" _value="Window List"/>
<oaf_attribute name="description" type="string" _value="Switch between open windows"/>
<oaf_attribute name="panel:icon" type="string" value="gnome-windows.png"/>
<oaf_attribute name="panel:category" type="string" _value="Utility"/>
</oaf_server>
<oaf_server iid="OAFIID:GNOME_MailcheckApplet"
type="factory"
location="OAFIID:GNOME_GenUtilApplet_Factory">
......@@ -76,20 +44,4 @@
</oaf_server>
<oaf_server iid="OAFIID:GNOME_ShowDesktopApplet"
type="factory"
location="OAFIID:GNOME_GenUtilApplet_Factory">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" _value="Show Desktop Button"/>
<oaf_attribute name="description" type="string" _value="Button to hide application windows and show the desktop"/>
<oaf_attribute name="panel:icon" type="string" value="gnome-show-desktop.png"/>
<oaf_attribute name="panel:category" type="string" _value="Utility"/>
</oaf_server>
</oaf_info>
......@@ -4,9 +4,7 @@ INCLUDES = \
$(DISABLE_DEPRECATED_CFLAGS) \
$(GNOME_INCLUDEDIR) \
$(WARN_CFLAGS) \
$(WNCKLET_CFLAGS) \
-DPAGER_GLADEDIR=\""$(gladedir)"\" \
-DTASKLIST_GLADEDIR=\""$(gladedir)"\" \
$(GEN_UTIL_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
......@@ -21,13 +19,6 @@ DISABLE_DEPRECATED_CFLAGS = \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED
gladedir = $(datadir)/gen_util
glade_DATA = pager.glade tasklist.glade
pixmapdir = $(datadir)/pixmaps
pixmap_DATA = \
gnome-show-desktop.png
EGGFILES = \
egg-screen-exec.h \
egg-screen-exec.c \
......@@ -40,12 +31,6 @@ libgen_util_applet_2_la_SOURCES = \
main.c \
clock.c \
clock.h \
pager.c \
pager.h \
showdesktop.c \
showdesktop.h \
tasklist.c \
tasklist.h \
mailcheck.c \
mailcheck.h \
popcheck.c \
......@@ -57,7 +42,7 @@ libgen_util_applet_2_la_SOURCES = \
libgen_util_applet_2_la_LDFLAGS = -module -avoid-version
libgen_util_applet_2_la_LIBADD = \
../../libpanel-applet/libpanel-applet-2.la \
$(WNCKLET_LIBS)
$(GEN_UTIL_LIBS)
appletdir = $(libdir)
applet_LTLIBRARIES = libgen_util_applet-2.la
......@@ -65,7 +50,6 @@ applet_LTLIBRARIES = libgen_util_applet-2.la
GNOME_GenUtilApplet_Factory.server.in: GNOME_GenUtilApplet_Factory.server.in.in
sed -e "s|\@APPLET_LIBDIR\@|$(appletdir)|" $< > $@
PRINTER_BITMAPS = print.xpm
MAILCHECK_BITMAPS = email.png email-e.png tux-anim.png email-eclouds.png \
email-tiny.png eclouds.png
......@@ -81,10 +65,7 @@ soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
uidir = $(datadir)/gnome-2.0/ui
ui_DATA = \
GNOME_ClockApplet.xml \
GNOME_MailCheckApplet.xml \
GNOME_PagerApplet.xml \
GNOME_ShowDesktopApplet.xml \
GNOME_TasklistApplet.xml
GNOME_MailCheckApplet.xml
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_GenUtilApplet_Factory.server.in
......@@ -94,8 +75,6 @@ server_DATA = $(server_in_files:.server.in=.server)
schemasdir = $(sysconfdir)/gconf/schemas
schemas_in_files = mailcheck.schemas.in \
pager.schemas.in \
tasklist.schemas.in \
clock.schemas.in
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
......@@ -110,12 +89,9 @@ install-data-local:
fi
EXTRA_DIST = GNOME_GenUtilApplet_Factory.server.in.in \
$(PRINTER_BITMAPS) \
$(MAILCHECK_BITMAPS) \
$(soundlist_in_files) \
$(schemas_in_files) \
$(glade_DATA) \
$(pixmap_DATA) \
$(ui_DATA)
CLEANFILES = $(server_in_files) $(server_DATA)
......
Makefile.in
Makefile
.deps
_libs
.libs
gen_util_applet
.exrc
dummy.cc
*.lo
*.la
GNOME_GenUtilApplet_Factory.server
GNOME_GenUtilApplet_Factory.server.in
mailcheck.soundlist
clock.schemas
mailcheck.schemas
pager.schemas
tasklist.schemas
clock.schemas
*.gladep
2003-01-10 Mark McLoughlin <mark@skynet.ie>
* GNOME_GenUtilApplet_Factory.server.in.in: remove
the pager, tasklist and showdesktop oaf_servers.
* Makefile.am: remove all the pager, tasklist and
showdesktop files.
* main.c: (genutil_factory): upd.
* GNOME_PagerApplet.xml, GNOME_ShowDesktopApplet.xml,
GNOME_TasklistApplet.xml, gnome-show-desktop.png,
pager.[ch], pager.glade, pager.schemas.in, print.xpm
printer.[ch] showdesktop.[ch], tasklist.[ch], tasklist.glade,
tasklist.schemas.in: remove these files.
2003-01-08 Mark McLoughlin <mark@skynet.ie>
* mailcheck.schemas.in: s/Remove/Remote/
......
......@@ -28,38 +28,6 @@
<oaf_attribute name="panel:category" type="string" _value="Accessories"/>
</oaf_server>
<oaf_server iid="OAFIID:GNOME_PagerApplet"
type="factory"
location="OAFIID:GNOME_GenUtilApplet_Factory">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" _value="Workspace Switcher"/>
<oaf_attribute name="description" type="string" _value="Switch between workspaces"/>
<oaf_attribute name="panel:icon" type="string" value="gnome-workspace.png"/>
<oaf_attribute name="panel:category" type="string" _value="Utility"/>
</oaf_server>
<oaf_server iid="OAFIID:GNOME_TasklistApplet"
type="factory"
location="OAFIID:GNOME_GenUtilApplet_Factory">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" _value="Window List"/>
<oaf_attribute name="description" type="string" _value="Switch between open windows"/>
<oaf_attribute name="panel:icon" type="string" value="gnome-windows.png"/>
<oaf_attribute name="panel:category" type="string" _value="Utility"/>
</oaf_server>
<oaf_server iid="OAFIID:GNOME_MailcheckApplet"
type="factory"
location="OAFIID:GNOME_GenUtilApplet_Factory">
......@@ -76,20 +44,4 @@
</oaf_server>
<oaf_server iid="OAFIID:GNOME_ShowDesktopApplet"
type="factory"
location="OAFIID:GNOME_GenUtilApplet_Factory">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" _value="Show Desktop Button"/>
<oaf_attribute name="description" type="string" _value="Button to hide application windows and show the desktop"/>
<oaf_attribute name="panel:icon" type="string" value="gnome-show-desktop.png"/>
<oaf_attribute name="panel:category" type="string" _value="Utility"/>
</oaf_server>
</oaf_info>
<Root>
<popups>
<popup name="button3">
<menuitem name="Pager Preferences Item" verb="PagerPreferences" _label="_Preferences..."
pixtype="stock" pixname="gtk-properties"/>
<menuitem name="Pager Help Item" verb="PagerHelp" _label="_Help"
pixtype="stock" pixname="gtk-help"/>
<menuitem name="Pager About Item" verb="PagerAbout" _label="_About..."
pixtype="stock" pixname="gnome-stock-about"/>
</popup>
</popups>
</Root>
<Root>
<popups>
<popup name="button3">
<menuitem name="Show Desktop Help Item" verb="ShowDesktopHelp" _label="_Help"
pixtype="stock" pixname="gtk-help"/>
<menuitem name="Show Desktop About Item" verb="ShowDesktopAbout" _label="_About..."
pixtype="stock" pixname="gnome-stock-about"/>
</popup>
</popups>
</Root>
<Root>
<popups>
<popup name="button3">
<menuitem name="Tasklist Preferences Item" verb="TasklistPreferences" _label="_Preferences..."
pixtype="stock" pixname="gtk-properties"/>
<menuitem name="Tasklist Help Item" verb="TasklistHelp" _label="_Help"
pixtype="stock" pixname="gtk-help"/>
<menuitem name="Tasklist About Item" verb="TasklistAbout" _label="_About..."
pixtype="stock" pixname="gnome-stock-about"/>
</popup>
</popups>
</Root>
......@@ -4,9 +4,7 @@ INCLUDES = \
$(DISABLE_DEPRECATED_CFLAGS) \
$(GNOME_INCLUDEDIR) \
$(WARN_CFLAGS) \
$(WNCKLET_CFLAGS) \
-DPAGER_GLADEDIR=\""$(gladedir)"\" \
-DTASKLIST_GLADEDIR=\""$(gladedir)"\" \
$(GEN_UTIL_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
......@@ -21,13 +19,6 @@ DISABLE_DEPRECATED_CFLAGS = \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED
gladedir = $(datadir)/gen_util
glade_DATA = pager.glade tasklist.glade
pixmapdir = $(datadir)/pixmaps
pixmap_DATA = \
gnome-show-desktop.png
EGGFILES = \
egg-screen-exec.h \
egg-screen-exec.c \
......@@ -40,12 +31,6 @@ libgen_util_applet_2_la_SOURCES = \
main.c \
clock.c \
clock.h \
pager.c \
pager.h \
showdesktop.c \
showdesktop.h \
tasklist.c \
tasklist.h \
mailcheck.c \
mailcheck.h \
popcheck.c \
......@@ -57,7 +42,7 @@ libgen_util_applet_2_la_SOURCES = \
libgen_util_applet_2_la_LDFLAGS = -module -avoid-version
libgen_util_applet_2_la_LIBADD = \
../../libpanel-applet/libpanel-applet-2.la \
$(WNCKLET_LIBS)
$(GEN_UTIL_LIBS)
appletdir = $(libdir)
applet_LTLIBRARIES = libgen_util_applet-2.la
......@@ -65,7 +50,6 @@ applet_LTLIBRARIES = libgen_util_applet-2.la
GNOME_GenUtilApplet_Factory.server.in: GNOME_GenUtilApplet_Factory.server.in.in
sed -e "s|\@APPLET_LIBDIR\@|$(appletdir)|" $< > $@
PRINTER_BITMAPS = print.xpm
MAILCHECK_BITMAPS = email.png email-e.png tux-anim.png email-eclouds.png \
email-tiny.png eclouds.png
......@@ -81,10 +65,7 @@ soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
uidir = $(datadir)/gnome-2.0/ui
ui_DATA = \
GNOME_ClockApplet.xml \
GNOME_MailCheckApplet.xml \
GNOME_PagerApplet.xml \
GNOME_ShowDesktopApplet.xml \
GNOME_TasklistApplet.xml
GNOME_MailCheckApplet.xml
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_GenUtilApplet_Factory.server.in
......@@ -94,8 +75,6 @@ server_DATA = $(server_in_files:.server.in=.server)
schemasdir = $(sysconfdir)/gconf/schemas
schemas_in_files = mailcheck.schemas.in \
pager.schemas.in \
tasklist.schemas.in \
clock.schemas.in
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
......@@ -110,12 +89,9 @@ install-data-local:
fi
EXTRA_DIST = GNOME_GenUtilApplet_Factory.server.in.in \
$(PRINTER_BITMAPS) \
$(MAILCHECK_BITMAPS) \
$(soundlist_in_files) \
$(schemas_in_files) \
$(glade_DATA) \
$(pixmap_DATA) \
$(ui_DATA)
CLEANFILES = $(server_in_files) $(server_DATA)
......
......@@ -27,9 +27,6 @@
#include "mailcheck.h"
#include "clock.h"
#include "pager.h"
#include "showdesktop.h"
#include "tasklist.h"
static gboolean
genutil_factory (PanelApplet *applet,
......@@ -41,18 +38,9 @@ genutil_factory (PanelApplet *applet,
if (!strcmp (iid, "OAFIID:GNOME_ClockApplet"))
retval = fill_clock_applet(applet);
if (!strcmp (iid, "OAFIID:GNOME_PagerApplet"))
retval = fill_pager_applet(applet);
if (!strcmp (iid, "OAFIID:GNOME_TasklistApplet"))
retval = fill_tasklist_applet(applet);
if (!strcmp (iid, "OAFIID:GNOME_MailcheckApplet"))
retval = fill_mailcheck_applet(applet);
if (!strcmp (iid, "OAFIID:GNOME_ShowDesktopApplet"))
retval = fill_show_desktop_applet(applet);
return retval;
}
......
This diff is collapsed.
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<glade-interface>
<widget class="GtkDialog" id="pager_properties_dialog">
<property name="title" translatable="yes">Workspace Switcher Preferences</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
<property name="border_width">2</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">8</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
<property name="border_width">5</property>
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<property name="spacing">10</property>
<child>
<widget class="GtkButton" id="help_button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-help</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="response_id">-11</property>
</widget>
</child>
<child>
<widget class="GtkButton" id="done_button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="response_id">0</property>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox1">
<property name="border_width">8</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">8</property>
<child>
<widget class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
<widget class="GtkTable" id="table1">
<property name="border_width">8</property>
<property name="visible">True</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">8</property>
<property name="column_spacing">8</property>
<child>
<widget class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">4</property>
<child>
<widget class="GtkSpinButton" id="num_rows_spin">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">0</property>
<property name="numeric">False</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">1 1 16 1 10 10</property>
<accessibility>
<atkproperty name="AtkObject::accessible-description">
Number of Rows
</atkproperty>
<atkrelation target="label2" type="labelled-by"/>
</accessibility>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label_row_col">
<property name="visible">True</property>
<property name="label" translatable="yes">Rows</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">num_rows_spin</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="hseparator1">
<property name="visible">True</property>
</widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="all_workspaces_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Show _all workspaces</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="left_attach">0</property>
<property name=