Commit e279a217 authored by Stephan Arts's avatar Stephan Arts

re-tag the alpha



(Old svn revision: 27812)
parents e956a653 53611e20
2008-09-09 jannis
* dialogs/appearance-settings/main.c: Don't multiply the DPI value with
1024. That should only be done for the XChangeProperty call (but why?).
The current behaviour breaks xrdb badly (and thereby all Qt apps).
2008-09-09 jannis
* dialogs/keyboard-settings/main.c,
xfce4-settings-helper/keyboard-shortcuts.c: Fix the checks for invalid
values when a property was removed (use G_VALUE_TYPE (value) !=
G_TYPE_INVALID instead of value != NULL).
2008-09-08 jannis
* ChangeLog, dialogs/keyboard-settings/frap-shortcuts-dialog.c,
......
......@@ -41,9 +41,9 @@ if [ -d .git/svn ]; then
git svn find-rev master 2>/dev/null)
elif [ -d .svn ]; then
revision=$(LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}')
else
revision=UNKNOWN
fi
[ "$revision" ] || revision=UNKNOWN
sed -e "s/@LINGUAS@/${linguas}/g" \
-e "s/@REVISION@/${revision}/g" \
< "configure.ac.in" >> "configure.ac"
......
......@@ -182,7 +182,7 @@ cb_custom_dpi_spin_value_changed (GtkSpinButton *custom_dpi_spin,
if (gtk_toggle_button_get_active (custom_dpi_toggle))
{
dpi = gtk_spin_button_get_value (custom_dpi_spin) * 1024;
dpi = gtk_spin_button_get_value (custom_dpi_spin);
xfconf_channel_set_int (xsettings_channel, "/Xft/DPI", dpi);
}
}
......@@ -700,11 +700,11 @@ appearance_settings_dialog_new_from_xml (GladeXML *gxml)
switch (antialias)
{
case 1:
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (antialias_check_button), TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (antialias_check_button), TRUE);
break;
case 0:
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (antialias_check_button), FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (antialias_check_button), FALSE);
break;
default: /* -1 */
......@@ -721,15 +721,15 @@ appearance_settings_dialog_new_from_xml (GladeXML *gxml)
if (dpi == -1)
{
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (custom_dpi_check), FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (custom_dpi_check), FALSE);
gtk_widget_set_sensitive (custom_dpi_spin, FALSE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (custom_dpi_spin), 96);
}
else
{
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (custom_dpi_check), TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (custom_dpi_check), TRUE);
gtk_widget_set_sensitive (custom_dpi_spin, TRUE);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (custom_dpi_spin), (gdouble) dpi / 1024);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (custom_dpi_spin), (gdouble) dpi);
}
g_signal_connect (G_OBJECT (custom_dpi_check), "toggled", G_CALLBACK (cb_custom_dpi_check_button_toggled), custom_dpi_spin);
......
......@@ -438,7 +438,7 @@ keyboard_settings_update_shortcut (GtkTreeModel *model,
{
if (G_UNLIKELY (g_utf8_collate (shortcut, context->shortcut) == 0))
{
if (G_LIKELY (context->value != NULL))
if (G_LIKELY (G_VALUE_TYPE (context->value) != G_TYPE_INVALID))
{
if (G_LIKELY (frap_shortcuts_parse_value (context->value, &type, &action)))
{
......@@ -458,7 +458,7 @@ keyboard_settings_update_shortcut (GtkTreeModel *model,
}
else
{
if (G_LIKELY (context->value != NULL))
if (G_LIKELY (G_VALUE_TYPE (context->value) != G_TYPE_INVALID))
{
if (G_LIKELY (frap_shortcuts_parse_value (context->value, &type, &action)))
{
......@@ -498,7 +498,7 @@ keyboard_settings_property_changed (XfconfChannel *channel,
gtk_tree_model_foreach (GTK_TREE_MODEL (store), (GtkTreeModelForeachFunc) keyboard_settings_update_shortcut, &context);
if (G_UNLIKELY (context.counter == 0 && value != NULL))
if (G_UNLIKELY (G_VALUE_TYPE (value) != G_TYPE_INVALID && context.counter == 0))
if (G_LIKELY (frap_shortcuts_parse_value (value, &type, &action)))
{
if (G_LIKELY (type == FRAP_SHORTCUTS_EXECUTE))
......
2008-09-09 Maximilian Schleiss <maximilian@xfce.org>
* fr.po,LINGUAS: French translation added
2008-09-08 Jannis Pohlmann <jannis@xfce.org>
* *.po, xfce4-settings.pot: Merge strings.
......
# set of available languages (in alphabetic order)
fi nl pt_BR
fi fr nl pt_BR
This diff is collapsed.
......@@ -305,7 +305,7 @@ xfce_keyboard_shortcuts_helper_property_changed (XfconfChannel *ch
g_return_if_fail (XFCONF_IS_CHANNEL (channel));
/* Check whether the property was removed */
if (!G_IS_VALUE (value) || G_VALUE_TYPE (value) == G_TYPE_INVALID)
if (G_VALUE_TYPE (value) == G_TYPE_INVALID)
{
/* Remove shortcut and ungrab keys if we're monitoring it already */
if (G_LIKELY (g_hash_table_lookup (helper->shortcuts, property + 1)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment