rpms/gnome-settings-daemon
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix patch

Browse Source
This commit is contained in:
Ray Strode 2008-12-10 16:35:07 +00:00
parent 6aca45b6f7
commit af800ed610
1 changed files with 1 additions and 443 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

444
gnome-settings-daemon-2.24.0-fix-touchpad.patch
View File

@ -1,446 +1,4 @@
============================================================
2008-12-04 Jens Granseuer <jensgr@gmx.net>
* plugins/mouse/gsd-mouse-manager.c: (set_devicepresence_handler):
fix crash with X servers that don't provide XInput (bug #562977)
git-svn-id: svn+ssh://svn.gnome.org/svn/gnome-settings-daemon/trunk@626 a8aa06c0-3341-0410-afb9-f3695256783c
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-04 Jens Granseuer <jensgr@gmx.net>
+
+ * plugins/mouse/gsd-mouse-manager.c: (set_devicepresence_handler):
+ fix crash with X servers that don't provide XInput (bug #562977)
+
2008-12-02 Federico Mena Quintero <federico@novell.com>
Use a DBus interface to tell the XRANDR manager to apply the
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -329,10 +329,15 @@ devicepresence_filter (GdkXEvent *xevent,
static void
set_devicepresence_handler (GsdMouseManager *manager)
{
- Display *display = gdk_x11_get_default_xdisplay ();
+ Display *display;
XEventClass class_presence;
int xi_presence;
+ if (!supports_xinput_devices ())
+ return;
+
+ display = gdk_x11_get_default_xdisplay ();
+
gdk_error_trap_push ();
DevicePresence (display, xi_presence, class_presence);
XSelectExtensionEvent (display,
============================================================
2008-12-07 Behdad Esfahbod <behdad@gnome.org>
* gnome-settings-daemon/main.c (daemon_detach): Don't call umask (bug
#563543)
git-svn-id: svn+ssh://svn.gnome.org/svn/gnome-settings-daemon/trunk@628 a8aa06c0-3341-0410-afb9-f3695256783c
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-07 Behdad Esfahbod <behdad@gnome.org>
+
+ * gnome-settings-daemon/main.c (daemon_detach): Don't call umask (bug
+ #563543)
+
2008-12-04 Jens Granseuer <jensgr@gmx.net>
* plugins/mouse/gsd-mouse-manager.c: (set_devicepresence_handler):
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
--- a/gnome-settings-daemon/main.c
+++ b/gnome-settings-daemon/main.c
@@ -295,7 +295,6 @@ daemon_detach (void)
/* get outta the way */
chdir ("/");
- umask (0117);
}
static void
============================================================
2008-12-08 Jens Granseuer <jensgr@gmx.net>
* plugins/xrandr/gsd-xrandr-manager.c: (error_message): make libnotify
optional again (bug #563226)
(handle_fn_f7): fix memory leak, use g_debug instead of g_print
git-svn-id: svn+ssh://svn.gnome.org/svn/gnome-settings-daemon/trunk@629 a8aa06c0-3341-0410-afb9-f3695256783c
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-08 Jens Granseuer <jensgr@gmx.net>
+
+ * plugins/xrandr/gsd-xrandr-manager.c: (error_message): make libnotify
+ optional again (bug #563226)
+ (handle_fn_f7): fix memory leak, use g_debug instead of g_print
+
2008-12-07 Behdad Esfahbod <behdad@gnome.org>
* gnome-settings-daemon/main.c (daemon_detach): Don't call umask (bug
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -37,7 +37,6 @@
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
#include <gconf/gconf-client.h>
-#include <libnotify/notify.h>
#include <dbus/dbus-glib.h>
#define GNOME_DESKTOP_USE_UNSTABLE_API
@@ -50,6 +49,10 @@
#include <X11/extensions/Xrandr.h>
#endif
+#ifdef HAVE_LIBNOTIFY
+#include <libnotify/notify.h>
+#endif
+
#include "gnome-settings-profile.h"
#include "gsd-xrandr-manager.h"
@@ -189,7 +192,7 @@ print_configuration (GnomeRRConfig *config, const char *header)
g_print (" none\n");
return;
}
-
+
for (i = 0; config->outputs[i] != NULL; ++i)
print_output (config->outputs[i]);
}
@@ -203,7 +206,7 @@ make_clone_setup (GnomeRRScreen *screen)
if (!get_clone_size (screen, &width, &height))
return NULL;
-
+
result = gnome_rr_config_new_current (screen);
for (i = 0; result->outputs[i] != NULL; ++i) {
@@ -216,14 +219,14 @@ make_clone_setup (GnomeRRScreen *screen)
GnomeRRMode **modes = gnome_rr_output_list_modes (output);
int j;
int best_rate = 0;
-
+
for (j = 0; modes[j] != NULL; ++j) {
GnomeRRMode *mode = modes[j];
int w, h;
-
+
w = gnome_rr_mode_get_width (mode);
h = gnome_rr_mode_get_height (mode);
-
+
if (w == width && h == height) {
int r = gnome_rr_mode_get_freq (mode);
if (r > best_rate)
@@ -244,7 +247,7 @@ make_clone_setup (GnomeRRScreen *screen)
}
print_configuration (result, "clone setup");
-
+
return result;
}
@@ -297,12 +300,12 @@ make_laptop_setup (GnomeRRScreen *screen)
}
print_configuration (result, "Laptop setup");
-
+
/* FIXME - Maybe we should return NULL if there is more than
* one connected "laptop" screen?
*/
return result;
-
+
}
static GnomeRRConfig *
@@ -337,7 +340,7 @@ make_xinerama_setup (GnomeRRScreen *screen)
}
print_configuration (result, "xinerama setup");
-
+
return result;
}
@@ -347,7 +350,7 @@ make_other_setup (GnomeRRScreen *screen)
/* Turn off all laptops, and make all external monitors clone
* from (0, 0)
*/
-
+
GnomeRRConfig *result = gnome_rr_config_new_current (screen);
int i;
@@ -365,7 +368,7 @@ make_other_setup (GnomeRRScreen *screen)
}
print_configuration (result, "other setup");
-
+
return result;
}
@@ -382,7 +385,7 @@ sanitize (GPtrArray *array)
print_configuration (array->pdata[i], "before");
}
}
-
+
/* Remove configurations that are duplicates of
* configurations earlier in the cycle
@@ -409,19 +412,19 @@ sanitize (GPtrArray *array)
if (config) {
gboolean all_off = TRUE;
int j;
-
+
for (j = 0; config->outputs[j] != NULL; ++j) {
if (config->outputs[j]->on)
all_off = FALSE;
}
-
+
if (all_off) {
gnome_rr_config_free (array->pdata[i]);
array->pdata[i] = NULL;
}
}
}
-
+
/* Remove NULL configurations */
new = g_ptr_array_new ();
@@ -446,7 +449,7 @@ generate_fn_f7_configs (GsdXrandrManager *mgr)
GnomeRRScreen *screen = mgr->priv->rw_screen;
g_print ("Generating configurations\n");
-
+
/* Free any existing list of configurations */
if (mgr->priv->fn_f7_configs) {
int i;
@@ -468,7 +471,7 @@ generate_fn_f7_configs (GsdXrandrManager *mgr)
g_ptr_array_add (array, NULL);
array = sanitize (array);
-
+
mgr->priv->fn_f7_configs = (GnomeRRConfig **)g_ptr_array_free (array, FALSE);
mgr->priv->current_fn_f7_config = 0;
}
@@ -476,6 +479,7 @@ generate_fn_f7_configs (GsdXrandrManager *mgr)
static void
error_message (GsdXrandrManager *mgr, const char *primary_text, GError *error_to_display, const char *secondary_text)
{
+#ifdef HAVE_LIBNOTIFY
GsdXrandrManagerPrivate *priv = mgr->priv;
NotifyNotification *notification;
@@ -486,6 +490,17 @@ error_message (GsdXrandrManager *mgr, const char *primary_text, GError *error_to
GSD_XRANDR_ICON_NAME,
priv->status_icon);
notify_notification_show (notification, NULL); /* NULL-GError */
+#else
+ GtkWidget *dialog;
+
+ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+ "%s", primary_text);
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s",
+ error_to_display ? error_to_display->message : secondary_text);
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+#endif /* HAVE_LIBNOTIFY */
}
static void
@@ -495,7 +510,7 @@ handle_fn_f7 (GsdXrandrManager *mgr)
GnomeRRScreen *screen = priv->rw_screen;
GnomeRRConfig *current;
GError *error;
-
+
/* Theory of fn-F7 operation
*
* We maintain a datastructure "fn_f7_status", that contains
@@ -508,7 +523,7 @@ handle_fn_f7 (GsdXrandrManager *mgr)
* the current hardware reality, it is regenerated.
*
*/
- g_print ("Handling fn-f7\n");
+ g_debug ("Handling fn-f7");
error = NULL;
if (!gnome_rr_screen_refresh (screen, &error)) {
@@ -518,14 +533,15 @@ handle_fn_f7 (GsdXrandrManager *mgr)
g_error_free (error);
error_message (mgr, str, NULL, _("Trying to switch the monitor configuration anyway."));
+ g_free (str);
}
if (!priv->fn_f7_configs)
generate_fn_f7_configs (mgr);
current = gnome_rr_config_new_current (screen);
-
- if (priv->fn_f7_configs &&
+
+ if (priv->fn_f7_configs &&
(!gnome_rr_config_match (current, priv->fn_f7_configs[0]) ||
!gnome_rr_config_equal (current, priv->fn_f7_configs[mgr->priv->current_fn_f7_config]))) {
/* Our view of the world is incorrect, so regenerate the
@@ -535,18 +551,18 @@ handle_fn_f7 (GsdXrandrManager *mgr)
}
gnome_rr_config_free (current);
-
+
if (priv->fn_f7_configs) {
mgr->priv->current_fn_f7_config++;
if (priv->fn_f7_configs[mgr->priv->current_fn_f7_config] == NULL)
mgr->priv->current_fn_f7_config = 0;
- g_print ("cycling to next configuration (%d)\n", mgr->priv->current_fn_f7_config);
+ g_debug ("cycling to next configuration (%d)", mgr->priv->current_fn_f7_config);
print_configuration (priv->fn_f7_configs[mgr->priv->current_fn_f7_config], "new config");
- g_print ("applying\n");
+ g_debug ("applying");
error = NULL;
if (!gnome_rr_config_apply (priv->fn_f7_configs[mgr->priv->current_fn_f7_config], screen, &error)) {
@@ -555,9 +571,9 @@ handle_fn_f7 (GsdXrandrManager *mgr)
}
}
else {
- g_print ("no configurations generated\n");
+ g_debug ("no configurations generated");
}
- g_print ("done handling fn-f7\n");
+ g_debug ("done handling fn-f7");
}
static GdkFilterReturn
@@ -577,7 +593,7 @@ event_filter (GdkXEvent *xevent,
if (xev->xkey.keycode == manager->priv->keycode && xev->xany.type == KeyPress) {
handle_fn_f7 (manager);
-
+
return GDK_FILTER_CONTINUE;
}
============================================================
2008-12-09 Jens Granseuer <jensgr@gmx.net>
Patch by: Pedro Fragoso <ember@ubuntu.com>
* plugins/a11y-keyboard/gsd-a11y-preferences-dialog.h:
* plugins/common/eggaccelerators.c:
* plugins/common/eggaccelerators.h:
* plugins/mouse/gsd-locate-pointer.h: only use top-level headers for
glib and GTK+ (bug #563796)
git-svn-id: svn+ssh://svn.gnome.org/svn/gnome-settings-daemon/trunk@630 a8aa06c0-3341-0410-afb9-f3695256783c
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-12-09 Jens Granseuer <jensgr@gmx.net>
+
+ Patch by: Pedro Fragoso <ember@ubuntu.com>
+
+ * plugins/a11y-keyboard/gsd-a11y-preferences-dialog.h:
+ * plugins/common/eggaccelerators.c:
+ * plugins/common/eggaccelerators.h:
+ * plugins/mouse/gsd-locate-pointer.h: only use top-level headers for
+ glib and GTK+ (bug #563796)
+
2008-12-08 Jens Granseuer <jensgr@gmx.net>
* plugins/xrandr/gsd-xrandr-manager.c: (error_message): make libnotify
diff --git a/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.h b/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.h
--- a/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.h
+++ b/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.h
@@ -22,7 +22,7 @@
#define __GSD_A11Y_PREFERENCES_DIALOG_H
#include <glib-object.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/plugins/common/eggaccelerators.c b/plugins/common/eggaccelerators.c
--- a/plugins/common/eggaccelerators.c
+++ b/plugins/common/eggaccelerators.c
@@ -24,7 +24,7 @@
#include <string.h>
#include <gdk/gdkx.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkaccelgroup.h>
+#include <gtk/gtk.h>
enum
{
diff --git a/plugins/common/eggaccelerators.h b/plugins/common/eggaccelerators.h
--- a/plugins/common/eggaccelerators.h
+++ b/plugins/common/eggaccelerators.h
@@ -21,7 +21,7 @@
#ifndef __EGG_ACCELERATORS_H__
#define __EGG_ACCELERATORS_H__
-#include <gtk/gtkaccelgroup.h>
+#include <gtk/gtk.h>
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/plugins/mouse/gsd-locate-pointer.h b/plugins/mouse/gsd-locate-pointer.h
--- a/plugins/mouse/gsd-locate-pointer.h
+++ b/plugins/mouse/gsd-locate-pointer.h
@@ -17,7 +17,7 @@
#ifndef LOCATE_POINTER_H
#define LOCATE_POINTER_H
-#include <gdk/gdkscreen.h>
+#include <gdk/gdk.h>
void gsd_locate_pointer (GdkScreen *screen);
============================================================
===========================================================
Ignore touchpads when swapping buttons
We always want clicks on the touchpad