[Xfce4-commits] r27020 - in xfce4-session/trunk: . settings settings/session settings/splash xfce4-session
Stephan Arts
stephan at xfce.org
Tue Jun 3 19:38:40 CEST 2008
Ok, fixed in revision 27021
-
Stephan
On Tue, Jun 3, 2008 at 7:07 PM, Stephan Arts <stephan at xfce.org> wrote:
> Ok, sorry... I screwed up, I thought the patch was complete.
>
> Going to fix the splash-screen plugin in the next commit.
>
> -
> Stephan
>
>
> ---------- Forwarded message ----------
> From: Stephan Arts <stephan at xfce.org>
> Date: Tue, Jun 3, 2008 at 7:03 PM
> Subject: [Xfce4-commits] r27020 - in xfce4-session/trunk: . settings
> settings/session settings/splash xfce4-session
> To: xfce4-commits at xfce.org
>
>
> Author: stephan
> Date: 2008-06-03 17:03:12 +0000 (Tue, 03 Jun 2008)
> New Revision: 27020
>
> Modified:
> xfce4-session/trunk/configure.in.in
> xfce4-session/trunk/settings/Makefile.am
> xfce4-session/trunk/settings/session/Makefile.am
> xfce4-session/trunk/settings/session/session.c
> xfce4-session/trunk/settings/session/xfce-session-settings.desktop.in
> xfce4-session/trunk/settings/splash/Makefile.am
> xfce4-session/trunk/settings/splash/splash.c
> xfce4-session/trunk/settings/splash/xfce-splash-settings.desktop.in
> xfce4-session/trunk/xfce4-session/Makefile.am
> xfce4-session/trunk/xfce4-session/main.c
> xfce4-session/trunk/xfce4-session/shutdown.c
> Log:
> Remove dependency on xfce-mcs-manager
>
>
>
> Modified: xfce4-session/trunk/configure.in.in
> ===================================================================
> --- xfce4-session/trunk/configure.in.in 2008-06-03 06:53:08 UTC (rev 27019)
> +++ xfce4-session/trunk/configure.in.in 2008-06-03 17:03:12 UTC (rev 27020)
> @@ -71,12 +71,8 @@
>
> dnl Check for required packages
> XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
> -XDT_CHECK_PACKAGE([LIBXFCE4MCS_CLIENT], [libxfce4mcs-client-1.0], [4.4.0])
> XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
>
> -dnl Configure the MCS plugins
> -XDT_XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [4.4.0])
> -
> dnl Check for D-Bus support (for HAL shutdown support)
> XDT_CHECK_OPTIONAL_PACKAGE([DBUS], [dbus-1], [0.34], [dbus],
> [Hal shutdown support], [yes])
>
> Modified: xfce4-session/trunk/settings/Makefile.am
> ===================================================================
> --- xfce4-session/trunk/settings/Makefile.am 2008-06-03 06:53:08
> UTC (rev 27019)
> +++ xfce4-session/trunk/settings/Makefile.am 2008-06-03 17:03:12
> UTC (rev 27020)
> @@ -1,4 +1,4 @@
> SUBDIRS = \
> - session \
> - splash
> + session
> +#splash
>
>
> Modified: xfce4-session/trunk/settings/session/Makefile.am
> ===================================================================
> --- xfce4-session/trunk/settings/session/Makefile.am 2008-06-03
> 06:53:08 UTC (rev 27019)
> +++ xfce4-session/trunk/settings/session/Makefile.am 2008-06-03
> 17:03:12 UTC (rev 27020)
> @@ -1,28 +1,21 @@
> -sessiondir = $(libdir)/xfce4/mcs-plugins
> +bin_PROGRAMS = xfce4-session-settings
> +
>
> -session_LTLIBRARIES = \
> - session_settings.la
> -
> -session_settings_la_LDFLAGS = \
> - -avoid-version \
> - -no-undefined \
> - -module
> -
> -session_settings_la_SOURCES = \
> +xfce4_session_settings_SOURCES =
> \
> session.c
>
> -session_settings_la_CFLAGS = \
> +xfce4_session_settings_CFLAGS =
> \
> -I$(top_srcdir) \
> - @XFCE_MCS_MANAGER_CFLAGS@ \
> - -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
> + $(LIBXFCEGUI4_CFLAGS) \
> + $(LIBXFCE4UTIL_CFLAGS) \
> + -DLOCALEDIR=\"$(localedir)\"
>
> -if HAVE_OS_CYGWIN
> -session_settings_la_LDFLAGS += \
> - -export-symbols $(datadir)/xfce4/devel/mcs-manager.def
> +xfce4_session_settings_LDADD = \
> + $(top_builddir)/libxfsm/libxfsm-4.2.la \
> + $(LIBXFCEGUI4_LIBS) \
> + $(LIBXFCE4UTIL_LIBS) \
> + $(DBUS_LIBS)
>
> -session_settings_la_LIBADD = \
> - @XFCE_MCS_MANAGER_LIBS@
> -endif
>
> desktopdir = $(datadir)/applications
> desktop_in_files = xfce-session-settings.desktop.in
>
> Modified: xfce4-session/trunk/settings/session/session.c
> ===================================================================
> --- xfce4-session/trunk/settings/session/session.c 2008-06-03
> 06:53:08 UTC (rev 27019)
> +++ xfce4-session/trunk/settings/session/session.c 2008-06-03
> 17:03:12 UTC (rev 27020)
> @@ -35,10 +35,8 @@
> #undef XFCE_DISABLE_DEPRECATED
> #endif
>
> -#include <libxfce4mcs/mcs-manager.h>
> #include <libxfce4util/libxfce4util.h>
> #include <libxfcegui4/libxfcegui4.h>
> -#include <xfce-mcs-manager/manager-plugin.h>
>
>
> #define BORDER 6
> @@ -280,31 +278,9 @@
>
>
>
> -/*
> - Dialog
> - */
> -static gboolean
> -dialog_response (void)
> +static GtkWidget *
> +settings_dialog_new()
> {
> - if (dialog != NULL)
> - {
> - gtk_widget_destroy (dialog);
> - dialog = NULL;
> - }
> -
> - if (tooltips != NULL)
> - {
> - gtk_object_destroy (GTK_OBJECT (tooltips));
> - tooltips = NULL;
> - }
> -
> - return TRUE;
> -}
> -
> -
> -static void
> -dialog_run (McsPlugin *plugin)
> -{
> GtkWidget *notebook;
> GtkWidget *label;
> GtkWidget *page;
> @@ -318,8 +294,6 @@
> return;
> }
>
> - xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
> -
> kiosk = xfce_kiosk_new ("xfce4-session");
> kiosk_can_chooser = xfce_kiosk_query (kiosk, "Chooser") ||
> xfce_kiosk_query (kiosk, "CustomizeChooser");
> kiosk_can_logout = xfce_kiosk_query (kiosk, "Logout") ||
> xfce_kiosk_query (kiosk, "CustomizeLogout");
> @@ -337,11 +311,6 @@
> NULL);
> gtk_window_set_icon_name (GTK_WINDOW (dialog), "xfce4-session");
>
> - g_signal_connect (G_OBJECT (dialog), "response",
> - G_CALLBACK (dialog_response), NULL);
> - g_signal_connect (G_OBJECT (dialog), "delete-event",
> - G_CALLBACK (dialog_response), NULL);
> -
> dbox = GTK_DIALOG (dialog)->vbox;
>
> notebook = gtk_notebook_new ();
> @@ -365,28 +334,27 @@
> gtk_widget_show (dialog);
>
> xfce_rc_close (rc);
> +
> + return dialog;
> }
>
> -
> -
> -/*
> - Mcs interface
> - */
> -McsPluginInitResult
> -mcs_plugin_init (McsPlugin *plugin)
> +int
> +main(int argc, char **argv)
> {
> - xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
> + GError *cli_error = NULL;
>
> - plugin->plugin_name = g_strdup ("session");
> - /* the button label in the xfce-mcs-manager dialog */
> - plugin->caption = g_strdup (Q_("Button Label|Sessions and Startup"));
> - plugin->run_dialog = dialog_run;
> - plugin->icon = xfce_themed_icon_load ("xfce4-session", 48);
> - if (G_LIKELY (plugin->icon != NULL))
> - g_object_set_data_full (G_OBJECT (plugin->icon),
> "mcs-plugin-icon-name", g_strdup ("xfce4-session"), g_free);
> + #ifdef ENABLE_NLS
> + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
> + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
> + textdomain (GETTEXT_PACKAGE);
> + #endif
>
> - return MCS_PLUGIN_INIT_OK;
> -}
> + gtk_init(&argc, &argv);
>
> + dialog = settings_dialog_new();
> +
> + gtk_dialog_run(GTK_DIALOG(dialog));
>
> -MCS_PLUGIN_CHECK_INIT;
> + return 0;
> +
> +}
>
> Modified: xfce4-session/trunk/settings/session/xfce-session-settings.desktop.in
> ===================================================================
> --- xfce4-session/trunk/settings/session/xfce-session-settings.desktop.in
> 2008-06-03 06:53:08 UTC (rev 27019)
> +++ xfce4-session/trunk/settings/session/xfce-session-settings.desktop.in
> 2008-06-03 17:03:12 UTC (rev 27020)
> @@ -2,7 +2,7 @@
> Encoding=UTF-8
> _Name=Xfce 4 Sessions and Startup Settings
> _Comment=Session and Startup Settings
> -Exec=xfce-setting-show session
> +Exec=xfce4-session-settings
> Icon=xfce4-session
> Terminal=false
> Type=Application
>
> Modified: xfce4-session/trunk/settings/splash/Makefile.am
> ===================================================================
> --- xfce4-session/trunk/settings/splash/Makefile.am 2008-06-03
> 06:53:08 UTC (rev 27019)
> +++ xfce4-session/trunk/settings/splash/Makefile.am 2008-06-03
> 17:03:12 UTC (rev 27020)
> @@ -1,38 +1,21 @@
> -splashdir = $(libdir)/xfce4/mcs-plugins
> +bin_PROGRAMS = xfce4-splash-settings
> +
>
> -splash_LTLIBRARIES = \
> - splash_settings.la
> -
> -splash_settings_la_LDFLAGS = \
> - -avoid-version \
> - -module \
> - -no-undefined
> -
> -splash_settings_la_SOURCES = \
> +xfce4_splash_settings_SOURCES =
> \
> module.c \
> module.h \
> nopreview.h \
> splash.c
>
> -splash_settings_la_CFLAGS = \
> +xfce4_splash_settings_CFLAGS = \
> -I$(top_srcdir) \
> - @XFCE_MCS_MANAGER_CFLAGS@ \
> -DMODULESDIR=\"$(libdir)/xfce4/splash/engines\" \
> - -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
> + -DLOCALEDIR=\"$(localedir)\"
>
> -splash_settings_la_LIBADD = \
> +xfce4_splash_settings_LDADD = \
> $(top_builddir)/libxfsm/libxfsm-4.2.la
>
> -if HAVE_OS_CYGWIN
> -splash_settings_la_LDFLAGS += \
> - -export-symbols $(datadir)/xfce4/devel/mcs-manager.def
> -
> -splash_settings_la_LIBADD += \
> - @XFCE_MCS_MANAGER_LIBS@ \
> - @LIBX11_LIBS@
> -endif
> -
> -splash_settings_la_DEPENDENCIES = \
> +xfce4_splash_settings_DEPENDENCIES = \
> $(top_builddir)/libxfsm/libxfsm-4.2.la
>
> nopreview.h: $(srcdir)/nopreview.png
>
> Modified: xfce4-session/trunk/settings/splash/splash.c
> ===================================================================
> --- xfce4-session/trunk/settings/splash/splash.c 2008-06-03
> 06:53:08 UTC (rev 27019)
> +++ xfce4-session/trunk/settings/splash/splash.c 2008-06-03
> 17:03:12 UTC (rev 27020)
> @@ -38,9 +38,7 @@
> #include <gmodule.h>
> #include <gtk/gtk.h>
>
> -#include <libxfce4mcs/mcs-manager.h>
> #include <libxfcegui4/libxfcegui4.h>
> -#include <xfce-mcs-manager/manager-plugin.h>
>
> #include <libxfsm/xfsm-util.h>
> #include <libxfsm/xfsm-splash-engine.h>
> @@ -337,7 +335,7 @@
>
>
> static void
> -splash_run (McsPlugin *plugin)
> +settings_splash_new ()
> {
> GtkTreeSelection *selection;
> GtkTreeViewColumn *column;
> @@ -570,25 +568,37 @@
> gtk_widget_show (splash_dialog);
> }
>
> -
> -/*
> - Mcs interface
> - */
> -McsPluginInitResult
> -mcs_plugin_init (McsPlugin *plugin)
> +int
> +main(int argc, char **argv)
> {
> - xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
> + GError *cli_error = NULL;
>
> - plugin->plugin_name = g_strdup ("splash");
> - /* the button label in the xfce-mcs-manager dialog */
> - plugin->caption = g_strdup (Q_ ("Button Label|Splash Screen"));
> - plugin->run_dialog = splash_run;
> - plugin->icon = xfce_themed_icon_load ("xfce4-splash", 48);
> - if (G_LIKELY (plugin->icon != NULL))
> - g_object_set_data_full (G_OBJECT (plugin->icon),
> "mcs-plugin-icon-name", g_strdup ("xfce4-splash"), g_free);
> + #ifdef ENABLE_NLS
> + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
> + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
> + textdomain (GETTEXT_PACKAGE);
> + #endif
>
> - return MCS_PLUGIN_INIT_OK;
> -}
> + if(!gtk_init_with_args(&argc, &argv, _("."), entries, PACKAGE, &cli_error))
> + {
> + if (cli_error != NULL)
> + {
> + g_print (_("%s: %s\nTry %s --help to see a full list of
> available command line options.\n"), PACKAGE, cli_error->message,
> PACKAGE_NAME);
> + g_error_free (cli_error);
> + return 1;
> + }
> + }
>
> + if(version)
> + {
> + g_print("%s\n", PACKAGE_STRING);
> + return 0;
> + }
> +
> + dialog = settings_dialog_new();
> +
> + gtk_dialog_run(GTK_DIALOG(dialog));
>
> -MCS_PLUGIN_CHECK_INIT;
> + return 0;
> +
> +}
>
> Modified: xfce4-session/trunk/settings/splash/xfce-splash-settings.desktop.in
> ===================================================================
> --- xfce4-session/trunk/settings/splash/xfce-splash-settings.desktop.in
> 2008-06-03 06:53:08 UTC (rev 27019)
> +++ xfce4-session/trunk/settings/splash/xfce-splash-settings.desktop.in
> 2008-06-03 17:03:12 UTC (rev 27020)
> @@ -2,7 +2,7 @@
> Encoding=UTF-8
> _Name=Xfce 4 Splash Screen Settings
> _Comment=Splash Screen Settings
> -Exec=xfce-setting-show splash
> +Exec=xfce4-splash-settings
> Icon=xfce4-splash
> Terminal=false
> Type=Application
>
> Modified: xfce4-session/trunk/xfce4-session/Makefile.am
> ===================================================================
> --- xfce4-session/trunk/xfce4-session/Makefile.am 2008-06-03
> 06:53:08 UTC (rev 27019)
> +++ xfce4-session/trunk/xfce4-session/Makefile.am 2008-06-03
> 17:03:12 UTC (rev 27020)
> @@ -48,7 +48,6 @@
> $(GNOME_CFLAGS) \
> $(LIBSM_CFLAGS) \
> $(LIBX11_CFLAGS) \
> - $(LIBXFCE4MCS_CLIENT_CFLAGS) \
> $(LIBXFCEGUI4_CFLAGS) \
> $(DBUS_CFLAGS) \
> -DDBUS_API_SUBJECT_TO_CHANGE \
> @@ -63,7 +62,6 @@
> $(LIBSM_LIBS) \
> $(LIBX11_LDFLAGS) \
> $(LIBX11_LIBS) \
> - $(LIBXFCE4MCS_CLIENT_LIBS) \
> $(LIBXFCEGUI4_LIBS) \
> $(DBUS_LIBS) \
> $(GNOME_LIBS)
>
> Modified: xfce4-session/trunk/xfce4-session/main.c
> ===================================================================
> --- xfce4-session/trunk/xfce4-session/main.c 2008-06-03 06:53:08
> UTC (rev 27019)
> +++ xfce4-session/trunk/xfce4-session/main.c 2008-06-03 17:03:12
> UTC (rev 27020)
> @@ -48,7 +48,6 @@
> #include <gdk/gdkx.h>
> #include <gtk/gtk.h>
>
> -#include <libxfce4mcs/mcs-client.h>
> #include <libxfce4util/libxfce4util.h>
>
> #include <libxfsm/xfsm-util.h>
> @@ -144,13 +143,6 @@
> xfce_rc_set_group (rc, "General");
> sm_init (rc, disable_tcp);
>
> - /* start a MCS manager process per screen (FIXME: parallel to
> loading logo) */
> - for (n = 0; n < gdk_display_get_n_screens (dpy); ++n)
> - {
> - mcs_client_check_manager (gdk_x11_display_get_xdisplay (dpy), n,
> - "xfce-mcs-manager");
> - }
> -
> /* gtk resource files may have changed */
> gtk_rc_reparse_all ();
> }
>
> Modified: xfce4-session/trunk/xfce4-session/shutdown.c
> ===================================================================
> --- xfce4-session/trunk/xfce4-session/shutdown.c 2008-06-03
> 06:53:08 UTC (rev 27019)
> +++ xfce4-session/trunk/xfce4-session/shutdown.c 2008-06-03
> 17:03:12 UTC (rev 27020)
> @@ -325,7 +325,7 @@
> gtk_widget_show (vbox2);
> gtk_container_add (GTK_CONTAINER (logout_button), vbox2);
>
> - icon = xfce_themed_icon_load ("xfsm-logout", 32);
> + icon = xfce_themed_icon_load ("system-log-out", 32);
> image = gtk_image_new_from_pixbuf (icon);
> gtk_widget_show (image);
> gtk_box_pack_start (GTK_BOX (vbox2), image, FALSE, FALSE, 0);
> @@ -348,7 +348,7 @@
> gtk_widget_show (vbox2);
> gtk_container_add (GTK_CONTAINER (reboot_button), vbox2);
>
> - icon = xfce_themed_icon_load ("xfsm-reboot", 32);
> + icon = xfce_themed_icon_load ("system-reboot", 32);
> image = gtk_image_new_from_pixbuf (icon);
> gtk_widget_show (image);
> gtk_box_pack_start (GTK_BOX (vbox2), image, FALSE, FALSE, 0);
> @@ -371,7 +371,7 @@
> gtk_widget_show (vbox2);
> gtk_container_add (GTK_CONTAINER (halt_button), vbox2);
>
> - icon = xfce_themed_icon_load ("xfsm-shutdown", 32);
> + icon = xfce_themed_icon_load ("system-shutdown", 32);
> image = gtk_image_new_from_pixbuf (icon);
> gtk_widget_show (image);
> gtk_box_pack_start (GTK_BOX (vbox2), image, FALSE, FALSE, 0);
>
> _______________________________________________
> Xfce4-commits mailing list
> Xfce4-commits at xfce.org
> http://foo-projects.org/mailman/listinfo/xfce4-commits
>
More information about the Xfce4-dev
mailing list