GNOME.org
 

[gnome-panel/wip/gnome-3.10+: 56/75] build applets as in-process applets

commit 3591ca5d94a1525ef3df34f97b5b9c97df7b5bbb
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Sep 2 21:29:20 2014 +0300

    build applets as in-process applets

 applets/clock/Makefile.am                          |   29 +---------
 applets/clock/clock.c                              |   10 ---
 .../org.gnome.panel.ClockApplet.panel-applet.in.in |    4 +-
 ...nome.panel.applet.ClockAppletFactory.service.in |    3 -
 applets/fish/Makefile.am                           |   26 +--------
 applets/fish/fish.c                                |   11 ----
 .../org.gnome.panel.FishApplet.panel-applet.in.in  |    3 +-
 ...gnome.panel.applet.FishAppletFactory.service.in |    3 -
 applets/notification_area/Makefile.am              |   29 +---------
 applets/notification_area/main.c                   |   11 ----
 ...panel.NotificationAreaApplet.panel-applet.in.in |    3 +-
 ...applet.NotificationAreaAppletFactory.service.in |    3 -
 applets/wncklet/Makefile.am                        |   27 +--------
 .../org.gnome.panel.Wncklet.panel-applet.in.in     |    6 +--
 ...rg.gnome.panel.applet.WnckletFactory.service.in |    3 -
 applets/wncklet/wncklet.c                          |    8 ---
 configure.ac                                       |   61 --------------------
 17 files changed, 9 insertions(+), 231 deletions(-)
---
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index d99375a..2112004 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -69,8 +69,6 @@ test_system_timezone_SOURCES =        \
        test-system-timezone.c
 test_system_timezone_LDADD = libsystem-timezone.la
 
-if CLOCK_INPROCESS
-APPLET_IN_PROCESS = true
 APPLET_LOCATION   = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libclock-applet.so
 
 clock_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
@@ -81,17 +79,6 @@ libclock_applet_la_LIBADD = $(CLOCK_LDADD)
 libclock_applet_la_LDFLAGS = -module -avoid-version
 libclock_applet_la_CFLAGS = $(AM_CFLAGS)
 $(libclock_applet_la_OBJECTS): $(BUILT_SOURCES)
-else
-APPLET_IN_PROCESS = false
-APPLET_LOCATION = $(libexecdir)/clock-applet
-
-libexec_PROGRAMS = clock-applet
-clock_applet_SOURCES = $(CLOCK_SOURCES)
-clock_applet_CPPFLAGS = $(CLOCK_CPPFLAGS)
-clock_applet_LDADD = $(CLOCK_LDADD)
-clock_applet_CFLAGS = $(AM_CFLAGS)
-$(clock_applet_OBJECTS): $(BUILT_SOURCES)
-endif
 
 clock-marshallers.c: clock-marshallers.list
        $(AM_V_GEN)glib-genmarshal --prefix _clock_marshal --header --body --internal $< > $@
@@ -145,23 +132,11 @@ applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 $(applet_in_files): $(applet_in_files).in Makefile
        $(AM_V_GEN)sed \
                -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
-               -e "s|\ IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
                -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
                $< > $@
 
 @PANEL_INTLTOOL_PANEL_APPLET_RULE@
 
-if !CLOCK_INPROCESS
-servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.gnome.panel.applet.ClockAppletFactory.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-org.gnome.panel.applet.ClockAppletFactory.service: $(service_in_files)
-       $(AM_V_GEN)sed \
-               -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
-               $< > $@
-endif
-
 ui_FILES =             \
        clock.ui        \
        clock-menu.xml
@@ -176,14 +151,12 @@ EXTRA_DIST =                                              \
        org.gnome.panel.ClockApplet.panel-applet.in.in  \
        $(ui_FILES)                                     \
        clock.gresource.xml                             \
-       clock-marshallers.list                          \
-       $(service_in_files)
+       clock-marshallers.list
 
 CLEANFILES =                   \
        $(BUILT_SOURCES)        \
        $(applet_DATA)          \
        $(applet_DATA).in       \
-       $(service_DATA)         \
        $(polkit_DATA)          \
        $(dbus_services_DATA)
 
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index 54b0f3d..01706f6 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -1333,9 +1333,6 @@ fill_clock_applet (PanelApplet *applet)
 
        create_clock_widget (cd);
 
-#ifndef CLOCK_INPROCESS
-       gtk_window_set_default_icon_name (CLOCK_ICON);
-#endif
        gtk_widget_show (cd->applet);
 
        /* FIXME: Update this comment. */
@@ -2100,14 +2097,7 @@ clock_factory (PanelApplet *applet,
        return retval;
 }
 
-#ifdef CLOCK_INPROCESS
 PANEL_APPLET_IN_PROCESS_FACTORY ("ClockAppletFactory",
                                  PANEL_TYPE_APPLET,
                                  clock_factory,
                                  NULL)
-#else
-PANEL_APPLET_OUT_PROCESS_FACTORY ("ClockAppletFactory",
-                                  PANEL_TYPE_APPLET,
-                                  clock_factory,
-                                  NULL)
-#endif
diff --git a/applets/clock/org.gnome.panel.ClockApplet.panel-applet.in.in 
b/applets/clock/org.gnome.panel.ClockApplet.panel-applet.in.in
index a63fb12..32dfa55 100644
--- a/applets/clock/org.gnome.panel.ClockApplet.panel-applet.in.in
+++ b/applets/clock/org.gnome.panel.ClockApplet.panel-applet.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=ClockAppletFactory
-InProcess= IN_PROCESS@
+InProcess=true
 Location= LOCATION@
 _Name=Clock Applet Factory
 _Description=Factory for clock applet
@@ -9,10 +9,8 @@ _Description=Factory for clock applet
 _Name=Clock
 _Description=Get the current time and date
 Icon=gnome-panel-clock
-BonoboId=OAFIID:GNOME_ClockApplet;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-panel
 X-GNOME-Bugzilla-Component=clock
 X-GNOME-Bugzilla-Version= VERSION@
 X-GNOME-Bugzilla-OtherBinaries=clock-applet
-
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index a08e675..038a4c4 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -19,8 +19,6 @@ FISH_LDADD =                                          \
        $(FISH_LIBS)                                    \
        $(LIBPANEL_APPLET_LIBS)
 
-if FISH_INPROCESS
-APPLET_IN_PROCESS = true
 APPLET_LOCATION   = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libfish-applet.so
 
 fish_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
@@ -29,15 +27,6 @@ libfish_applet_la_SOURCES = $(FISH_SOURCES)
 libfish_applet_la_LIBADD = $(FISH_LDADD)
 libfish_applet_la_LDFLAGS = -module -avoid-version
 libfish_applet_la_CFLAGS = $(AM_CFLAGS)
-else
-APPLET_IN_PROCESS = false
-APPLET_LOCATION = $(libexecdir)/fish-applet
-
-libexec_PROGRAMS = fish-applet
-fish_applet_SOURCES = $(FISH_SOURCES)
-fish_applet_LDADD = $(FISH_LDADD)
-fish_applet_CFLAGS = $(AM_CFLAGS)
-endif
 
 appletdir       = $(appletsdir)
 applet_in_files = org.gnome.panel.FishApplet.panel-applet.in
@@ -46,23 +35,11 @@ applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 $(applet_in_files): $(applet_in_files).in Makefile
        $(AM_V_GEN)sed \
                -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
-               -e "s|\ IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
                -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
                $< > $@
 
 @PANEL_INTLTOOL_PANEL_APPLET_RULE@
 
-if !FISH_INPROCESS
-servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.gnome.panel.applet.FishAppletFactory.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-org.gnome.panel.applet.FishAppletFactory.service: $(service_in_files)
-       $(AM_V_GEN)sed \
-               -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
-               $< > $@
-endif
-
 fishbitmapsdir = $(datadir)/gnome-panel/fish
 fishbitmaps_DATA =     \
        wanda.fish      \
@@ -94,10 +71,9 @@ EXTRA_DIST =                                         \
        wanda.svg                                       \
        $(fishbitmaps_DATA)                             \
        org.gnome.panel.FishApplet.panel-applet.in.in   \
-       $(service_in_files)                             \
        $(ui_FILES)                                     \
        fish.gresource.xml
 
-CLEANFILES = $(BUILT_SOURCES) $(applet_DATA) $(applet_DATA).in $(service_DATA)
+CLEANFILES = $(BUILT_SOURCES) $(applet_DATA) $(applet_DATA).in
 
 -include $(top_srcdir)/git.mk
diff --git a/applets/fish/fish.c b/applets/fish/fish.c
index 043ec94..c9fb506 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -1461,9 +1461,6 @@ fish_applet_fill (FishApplet *fish)
 
        g_object_unref (action_group);
 
-#ifndef FISH_INPROCESS
-       gtk_window_set_default_icon_name (FISH_ICON);
-#endif
        setup_fish_widget (fish);
 
        return TRUE;
@@ -1628,15 +1625,7 @@ fish_applet_get_type (void)
        return type;
 }
 
-#ifdef FISH_INPROCESS
 PANEL_APPLET_IN_PROCESS_FACTORY ("FishAppletFactory",
                                 fish_applet_get_type (),
                                 fishy_factory,
                                 NULL)
-
-#else
-PANEL_APPLET_OUT_PROCESS_FACTORY ("FishAppletFactory",
-                                 fish_applet_get_type (),
-                                 fishy_factory,
-                                 NULL)
-#endif
diff --git a/applets/fish/org.gnome.panel.FishApplet.panel-applet.in.in 
b/applets/fish/org.gnome.panel.FishApplet.panel-applet.in.in
index 18d24dd..48e664a 100644
--- a/applets/fish/org.gnome.panel.FishApplet.panel-applet.in.in
+++ b/applets/fish/org.gnome.panel.FishApplet.panel-applet.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=FishAppletFactory
-InProcess= IN_PROCESS@
+InProcess=true
 Location= LOCATION@
 _Name=Wanda Factory
 _Description=From Whence That Stupid Fish Came
@@ -9,7 +9,6 @@ _Description=From Whence That Stupid Fish Came
 _Name=Fish
 _Description=Display a swimming fish or another animated creature
 Icon=gnome-panel-fish
-BonoboId=OAFIID:GNOME_FishApplet;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-panel
 X-GNOME-Bugzilla-Component=fish
diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index 355737e..6dd3c49 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -39,8 +39,6 @@ testtray_LDADD =                      \
        $(X_LIBS)                       \
        $(NOTIFICATION_AREA_LIBS)
 
-if NOTIFICATION_AREA_INPROCESS
-APPLET_IN_PROCESS = true
 APPLET_LOCATION   = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libnotification-area-applet.so
 
 notification_area_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
@@ -49,15 +47,6 @@ libnotification_area_applet_la_SOURCES = $(NOTIFICATION_AREA_SOURCES)
 libnotification_area_applet_la_LIBADD = $(NOTIFICATION_AREA_LDADD)
 libnotification_area_applet_la_LDFLAGS = -module -avoid-version
 libnotification_area_applet_la_CFLAGS = $(AM_CFLAGS)
-else
-APPLET_IN_PROCESS = false
-APPLET_LOCATION   = $(libexecdir)/notification-area-applet
-
-libexec_PROGRAMS = notification-area-applet
-notification_area_applet_SOURCES = $(NOTIFICATION_AREA_SOURCES)
-notification_area_applet_LDADD = $(NOTIFICATION_AREA_LDADD)
-notification_area_applet_CFLAGS = $(AM_CFLAGS)
-endif
 
 appletdir       = $(appletsdir)
 applet_in_files = org.gnome.panel.NotificationAreaApplet.panel-applet.in
@@ -66,31 +55,17 @@ applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 $(applet_in_files): $(applet_in_files).in Makefile
        $(AM_V_GEN)sed \
                -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
-               -e "s|\ IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
                -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
                $< > $@
 
 @PANEL_INTLTOOL_PANEL_APPLET_RULE@
 
-if !NOTIFICATION_AREA_INPROCESS
-servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.gnome.panel.applet.NotificationAreaAppletFactory.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-org.gnome.panel.applet.NotificationAreaAppletFactory.service: $(service_in_files)
-       $(AM_V_GEN)sed \
-               -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
-               $< > $@
-endif
-
 EXTRA_DIST =                                                           \
        org.gnome.panel.NotificationAreaApplet.panel-applet.in.in       \
-       $(ui_DATA)                                                      \
-       $(service_in_files)
+       $(ui_DATA)
 
 CLEANFILES =                   \
        $(applet_DATA)          \
-       $(applet_DATA).in       \
-       $(service_DATA)
+       $(applet_DATA).in
 
 -include $(top_srcdir)/git.mk
diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
index 36d75d5..d871a2c 100644
--- a/applets/notification_area/main.c
+++ b/applets/notification_area/main.c
@@ -259,23 +259,12 @@ applet_factory (PanelApplet *applet,
         strcmp (iid, "SystemTrayApplet") == 0))
     return FALSE;
 
-#ifndef NOTIFICATION_AREA_INPROCESS
-  gtk_window_set_default_icon_name (NOTIFICATION_AREA_ICON);
-#endif
-
   gtk_widget_show_all (GTK_WIDGET (applet));
 
   return TRUE;
 }
 
-#ifdef NOTIFICATION_AREA_INPROCESS
 PANEL_APPLET_IN_PROCESS_FACTORY ("NotificationAreaAppletFactory",
                                 NA_TYPE_TRAY_APPLET,
                                 applet_factory,
                                 NULL)
-#else
-PANEL_APPLET_OUT_PROCESS_FACTORY ("NotificationAreaAppletFactory",
-                                 NA_TYPE_TRAY_APPLET,
-                                 applet_factory,
-                                 NULL)
-#endif
diff --git a/applets/notification_area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in 
b/applets/notification_area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
index fac8476..b6a1927 100644
--- a/applets/notification_area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
+++ b/applets/notification_area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=NotificationAreaAppletFactory
-InProcess= IN_PROCESS@
+InProcess=true
 Location= LOCATION@
 _Name=Notification Area Factory
 _Description=Factory for notification area
@@ -9,7 +9,6 @@ _Description=Factory for notification area
 _Name=Notification Area
 _Description=Area where notification icons appear
 Icon=gnome-panel-notification-area
-BonoboId=OAFIID:GNOME_NotificationAreaApplet;OAFIID:GNOME_SystemTrayApplet;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-panel
 X-GNOME-Bugzilla-Component=notification area
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index edd87b0..b75bb4c 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -29,8 +29,6 @@ WNCKLET_LDADD =                                               \
        $(WNCKLET_LIBS)                                 \
        $(LIBPANEL_APPLET_LIBS)
 
-if WNCKLET_INPROCESS
-APPLET_IN_PROCESS = true
 APPLET_LOCATION   = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libwnck-applet.so
 
 wnck_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
@@ -39,15 +37,6 @@ libwnck_applet_la_SOURCES = $(WNCKLET_SOURCES)
 libwnck_applet_la_LIBADD = $(WNCKLET_LDADD)
 libwnck_applet_la_LDFLAGS = -module -avoid-version
 libwnck_applet_la_CFLAGS = $(AM_CFLAGS)
-else
-APPLET_IN_PROCESS = false
-APPLET_LOCATION   = $(libexecdir)/wnck-applet
-
-libexec_PROGRAMS = wnck-applet
-wnck_applet_SOURCES = $(WNCKLET_SOURCES)
-wnck_applet_LDADD = $(WNCKLET_LDADD)
-wnck_applet_CFLAGS = $(AM_CFLAGS)
-endif
 
 appletdir       = $(appletsdir)
 applet_in_files = org.gnome.panel.Wncklet.panel-applet.in
@@ -56,30 +45,17 @@ applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 $(applet_in_files): $(applet_in_files).in Makefile
        $(AM_V_GEN)sed \
                -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
-               -e "s|\ IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
                -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
                $< > $@
 
 @PANEL_INTLTOOL_PANEL_APPLET_RULE@
 
-if !WNCKLET_INPROCESS
-servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.gnome.panel.applet.WnckletFactory.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-org.gnome.panel.applet.WnckletFactory.service: $(service_in_files)
-       $(AM_V_GEN)sed \
-               -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
-               $< > $@
-endif
-
 ui_FILES =                             \
        window-list-menu.xml            \
        window-list.ui                  \
        workspace-switcher-menu.xml     \
        workspace-switcher.ui
 
-
 wncklet-resources.c: wncklet.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(srcdir)/wncklet.gresource.xml)
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name wncklet $<
 
@@ -92,10 +68,9 @@ BUILT_SOURCES =              \
 
 EXTRA_DIST = \
        org.gnome.panel.Wncklet.panel-applet.in.in \
-       $(service_in_files) \
        $(ui_FILES) \
        wncklet.gresource.xml
 
-CLEANFILES = $(BUILT_SOURCES) $(applet_DATA) $(applet_DATA).in $(service_DATA)
+CLEANFILES = $(BUILT_SOURCES) $(applet_DATA) $(applet_DATA).in
 
 -include $(top_srcdir)/git.mk
diff --git a/applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.in 
b/applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.in
index b2ab215..f35d084 100644
--- a/applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.in
+++ b/applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=WnckletFactory
-InProcess= IN_PROCESS@
+InProcess=true
 Location= LOCATION@
 _Name=Window Navigation Applet Factory
 _Description=Factory for the window navigation related applets
@@ -9,7 +9,6 @@ _Description=Factory for the window navigation related applets
 _Name=Window Selector
 _Description=Switch between open windows using a menu
 Icon=gnome-panel-window-menu
-BonoboId=OAFIID:GNOME_WindowMenuApplet;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-panel
 X-GNOME-Bugzilla-Component=window selector
@@ -20,7 +19,6 @@ X-GNOME-Bugzilla-OtherBinaries=wnck-applet
 _Name=Workspace Switcher
 _Description=Switch between workspaces
 Icon=gnome-panel-workspace-switcher
-BonoboId=OAFIID:GNOME_WorkspaceSwitcherApplet;OAFIID:GNOME_PagerApplet;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-panel
 X-GNOME-Bugzilla-Component=workspace switcher
@@ -31,7 +29,6 @@ X-GNOME-Bugzilla-OtherBinaries=wnck-applet
 _Name=Window List
 _Description=Switch between open windows using buttons
 Icon=gnome-panel-window-list
-BonoboId=OAFIID:GNOME_TasklistApplet;OAFIID:GNOME_WindowListApplet;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-panel
 X-GNOME-Bugzilla-Component=window list
@@ -42,7 +39,6 @@ X-GNOME-Bugzilla-OtherBinaries=wnck-applet
 _Name=Show Desktop
 _Description=Hide application windows and show the desktop
 Icon=user-desktop
-BonoboId=OAFIID:GNOME_ShowDesktopApplet;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-panel
 X-GNOME-Bugzilla-Component=Show Desktop Button
diff --git a/applets/wncklet/wncklet.c b/applets/wncklet/wncklet.c
index 4cf5cbb..a5f35d6 100644
--- a/applets/wncklet/wncklet.c
+++ b/applets/wncklet/wncklet.c
@@ -97,15 +97,7 @@ wncklet_factory (PanelApplet *applet,
        return retval;
 }
 
-
-#ifdef WNCKLET_INPROCESS
 PANEL_APPLET_IN_PROCESS_FACTORY ("WnckletFactory",
                                 PANEL_TYPE_APPLET,
                                 wncklet_factory,
                                 NULL)
-#else
-PANEL_APPLET_OUT_PROCESS_FACTORY ("WnckletFactory",
-                                 PANEL_TYPE_APPLET,
-                                 wncklet_factory,
-                                 NULL)
-#endif
diff --git a/configure.ac b/configure.ac
index 1648f5e..77de32d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,66 +173,6 @@ if test "x$HAVE_NETWORK_MANAGER" = "xyes" ; then
     AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Defined if NetworkManager support is enabled])
 fi
 
-# Make it possible to compile the applets in-process
-PANEL_INPROCESS_NONE=
-PANEL_INPROCESS_ALL=
-PANEL_INPROCESS_APPLETS=
-AC_ARG_WITH(in-process-applets,
-       AC_HELP_STRING([--with-in-process-applets=APPLETS],
-               [comma-separated list of applets to compile in-process (possible values: none, clock, fish, 
notification-area, wncklet, all) @<:@default=none@:>@]),
-       [for i in `echo $withval | tr , ' '`; do
-               if test $i = "none"; then
-                       PANEL_INPROCESS_NONE=1
-               else if test $i = "all"; then
-                       PANEL_INPROCESS_ALL=1
-               else if test $i = "clock"; then
-                       PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
-               else if test $i = "fish"; then
-                       PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
-               else if test $i = "notification-area"; then
-                       PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
-               else if test $i = "wncklet"; then
-                       PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
-               else
-                       echo "applet $i not recognized, ignoring..."
-               fi; fi; fi; fi; fi; fi
-       done],
-       [])
-
-if test -n "$PANEL_INPROCESS_ALL"; then
-       PANEL_INPROCESS_APPLETS="clock fish notification-area wncklet"
-fi
-if test -n "$PANEL_INPROCESS_NONE"; then
-       PANEL_INPROCESS_APPLETS=""
-fi
-for i in $PANEL_INPROCESS_APPLETS; do
-       if test $i = "clock"; then
-               CLOCK_COMPILE_INPROCESS=1
-               AC_DEFINE([CLOCK_INPROCESS], 1,
-               [Defined when compiling the clock applet in-process])
-       else if test $i = "fish"; then
-               FISH_COMPILE_INPROCESS=1
-               AC_DEFINE([FISH_INPROCESS], 1,
-               [Defined when compiling the fish applet in-process])
-       else if test $i = "notification-area"; then
-               NOTIFICATION_AREA_COMPILE_INPROCESS=1
-               AC_DEFINE([NOTIFICATION_AREA_INPROCESS], 1,
-               [Defined when compiling the notification-area applet in-process])
-       else if test $i = "wncklet"; then
-               WNCKLET_COMPILE_INPROCESS=1
-               AC_DEFINE([WNCKLET_INPROCESS], 1,
-               [Defined when compiling the wncklet applet in-process])
-       fi; fi; fi; fi
-done
-if test "x$PANEL_INPROCESS_APPLETS" = "x"; then
-       PANEL_INPROCESS_APPLETS="(none)"
-fi
-
-AM_CONDITIONAL(CLOCK_INPROCESS, test -n "$CLOCK_COMPILE_INPROCESS")
-AM_CONDITIONAL(FISH_INPROCESS, test -n "$FISH_COMPILE_INPROCESS")
-AM_CONDITIONAL(NOTIFICATION_AREA_INPROCESS, test -n "$NOTIFICATION_AREA_COMPILE_INPROCESS")
-AM_CONDITIONAL(WNCKLET_INPROCESS, test -n "$WNCKLET_COMPILE_INPROCESS")
-
 # For the run dialog
 gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE
 
@@ -366,7 +306,6 @@ echo "
         Maintainer mode:               ${USE_MAINTAINER_MODE}
         Use *_DISABLE_DEPRECATED:      ${enable_deprecation_flags}
 
-        Applets to build in-process:   ${PANEL_INPROCESS_APPLETS}
         Evolution-Data-Server support: ${enable_eds}
         Telepathy-Glib support:        ${HAVE_TELEPATHY_GLIB}
         NetworkManager support:        ${HAVE_NETWORK_MANAGER}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]