Author: kelnos
Date: 2008-11-13 04:56:33 +0000 (Thu, 13 Nov 2008)
New Revision: 28786
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/NEWS
xfce4-session/trunk/settings/main.c
xfce4-session/trunk/settings/xfce-session-settings.desktop.in
xfce4-session/trunk/settings/xfce4-session-settings.glade
Log:
* settings/main.c: Hook up Help button.
* settings/xfce4-session-settings.glade: Fix Help button response
and button order.
* settings/xfce-session-settings.desktop.in: Mark dialog as
supporting startup notification.
Modified: xfce4-session/trunk/ChangeLog
===================================================================
--- xfce4-session/trunk/ChangeLog 2008-11-13 04:34:58 UTC (rev 28785)
+++ xfce4-session/trunk/ChangeLog 2008-11-13 04:56:33 UTC (rev 28786)
@@ -1,3 +1,11 @@
+2008-11-12 Brian Tarricone <[EMAIL PROTECTED]>
+
+ * settings/main.c: Hook up Help button.
+ * settings/xfce4-session-settings.glade: Fix Help button response
+ and button order.
+ * settings/xfce-session-settings.desktop.in: Mark dialog as
+ supporting startup notification.
+
2008-11-06 Brian Tarricone <[EMAIL PROTECTED]>
* settings/xfce4-session.xml: Add xfce4-settings-helper to the
Modified: xfce4-session/trunk/NEWS
===================================================================
--- xfce4-session/trunk/NEWS 2008-11-13 04:34:58 UTC (rev 28785)
+++ xfce4-session/trunk/NEWS 2008-11-13 04:56:33 UTC (rev 28786)
@@ -1,3 +1,8 @@
+4.5.90.0
+=======
+
+- Hook up Help button in settings dialog.
+
4.5.92
======
- Implement support for the RestartImmediately restart style hint.
Modified: xfce4-session/trunk/settings/main.c
===================================================================
--- xfce4-session/trunk/settings/main.c 2008-11-13 04:34:58 UTC (rev 28785)
+++ xfce4-session/trunk/settings/main.c 2008-11-13 04:56:33 UTC (rev 28786)
@@ -120,11 +120,10 @@
GtkWidget *dialog = glade_xml_get_widget(gxml,
"xfce4_session_settings_dialog");
g_object_unref(gxml);
- while(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_HELP) {
- /* FIXME: load help */
- }
+ while(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_HELP)
+ xfce_exec("xfhelp4 xfce4-session.html", FALSE, FALSE, NULL);
- gtk_widget_destroy (dialog);
+ gtk_widget_destroy(dialog);
} else {
GtkWidget *plug, *plug_child;
@@ -140,7 +139,7 @@
g_object_unref(gxml);
/* Stop startup notification */
- gdk_notify_startup_complete ();
+ gdk_notify_startup_complete();
gtk_main();
}
Modified: xfce4-session/trunk/settings/xfce-session-settings.desktop.in
===================================================================
--- xfce4-session/trunk/settings/xfce-session-settings.desktop.in
2008-11-13 04:34:58 UTC (rev 28785)
+++ xfce4-session/trunk/settings/xfce-session-settings.desktop.in
2008-11-13 04:56:33 UTC (rev 28786)
@@ -5,6 +5,7 @@
Exec=xfce4-session-settings
Icon=xfce4-session
Terminal=false
+StartupNotify=true
Type=Application
Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
OnlyShowIn=XFCE;
Modified: xfce4-session/trunk/settings/xfce4-session-settings.glade
===================================================================
--- xfce4-session/trunk/settings/xfce4-session-settings.glade 2008-11-13
04:34:58 UTC (rev 28785)
+++ xfce4-session/trunk/settings/xfce4-session-settings.glade 2008-11-13
04:56:33 UTC (rev 28786)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Fri Oct 31 16:32:14 2008 -->
+<!--Generated with glade3 3.4.5 on Wed Nov 12 20:45:14 2008 -->
<glade-interface>
<requires lib="xfce4"/>
<widget class="XfceTitledDialog" id="xfce4_session_settings_dialog">
@@ -727,7 +727,6 @@
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
<child>
<widget class="GtkButton" id="button1">
<property name="visible">True</property>
@@ -735,7 +734,7 @@
<property name="receives_default">True</property>
<property name="label" translatable="yes">gtk-help</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
+ <property name="response_id">-11</property>
</widget>
</child>
<child>
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
