Author: stephan
Date: 2008-06-03 17:37:37 +0000 (Tue, 03 Jun 2008)
New Revision: 27021
Modified:
xfce4-session/trunk/settings/Makefile.am
xfce4-session/trunk/settings/splash/Makefile.am
xfce4-session/trunk/settings/splash/splash.c
Log:
Fix splash-settings dialog
Modified: xfce4-session/trunk/settings/Makefile.am
===================================================================
--- xfce4-session/trunk/settings/Makefile.am 2008-06-03 17:03:12 UTC (rev
27020)
+++ xfce4-session/trunk/settings/Makefile.am 2008-06-03 17:37:37 UTC (rev
27021)
@@ -1,4 +1,4 @@
SUBDIRS = \
- session
-#splash
+ session \
+ splash
Modified: xfce4-session/trunk/settings/splash/Makefile.am
===================================================================
--- xfce4-session/trunk/settings/splash/Makefile.am 2008-06-03 17:03:12 UTC
(rev 27020)
+++ xfce4-session/trunk/settings/splash/Makefile.am 2008-06-03 17:37:37 UTC
(rev 27021)
@@ -9,11 +9,16 @@
xfce4_splash_settings_CFLAGS = \
-I$(top_srcdir) \
+ $(LIBXFCEGUI4_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
-DMODULESDIR=\"$(libdir)/xfce4/splash/engines\" \
-DLOCALEDIR=\"$(localedir)\"
xfce4_splash_settings_LDADD = \
- $(top_builddir)/libxfsm/libxfsm-4.2.la
+ $(top_builddir)/libxfsm/libxfsm-4.2.la \
+ $(LIBXFCEGUI4_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
+ $(DBUS_LIBS)
xfce4_splash_settings_DEPENDENCIES = \
$(top_builddir)/libxfsm/libxfsm-4.2.la
Modified: xfce4-session/trunk/settings/splash/splash.c
===================================================================
--- xfce4-session/trunk/settings/splash/splash.c 2008-06-03 17:03:12 UTC
(rev 27020)
+++ xfce4-session/trunk/settings/splash/splash.c 2008-06-03 17:37:37 UTC
(rev 27021)
@@ -335,7 +335,7 @@
static void
-settings_splash_new ()
+settings_dialog_new ()
{
GtkTreeSelection *selection;
GtkTreeViewColumn *column;
@@ -359,7 +359,7 @@
return;
}
- xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+ xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
tooltips = gtk_tooltips_new ();
@@ -564,41 +564,24 @@
gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (splash_treeview), path, NULL,
TRUE, 0.5, 0.0);
gtk_tree_path_free (path);
-
- gtk_widget_show (splash_dialog);
}
int
main(int argc, char **argv)
{
- GError *cli_error = NULL;
-
#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
#endif
- 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;
- }
- }
+ gtk_init(&argc, &argv);
- if(version)
- {
- g_print("%s\n", PACKAGE_STRING);
- return 0;
- }
+ settings_dialog_new ();
- dialog = settings_dialog_new();
-
- gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_dialog_run(GTK_DIALOG(splash_dialog));
+
return 0;
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
