applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://bugzilla.gnome.org/show_bug.cgi?id=139605 mouse buttons should not

Browse source 
2004-04-15  Jody Goldberg <jody@gnome.org>

	http://bugzilla.gnome.org/show_bug.cgi?id=139605
	* eggcellrendererkeys.c (grab_key_callback) : mouse buttons should not
	  be valid modifiers.

2004-04-15  Jody Goldberg <jody@gnome.org>

	* configure.in : Force libxklavier 1.0.2 so that we can work with
	  x.org and xfree86
This commit is contained in:
Jody Goldberg 2004-04-15 18:32:22 +00:00 • committed by Jody Goldberg
parent 55972182ea
commit 8f34dac57d
8 changed files with 95 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,10 +1,15 @@
2004-04-15 Jody Goldberg <jody@gnome.org>
* configure.in : Force libxklavier 1.0.2 so that we can work with
x.org and xfree86
2004-04-14 Iñaki Larrañaga <dooteo@euskalgnu.org>
* configure.in: Added "eu" (Basque) to ALL_LINGUAS.
2004-04-09 Guntupalli Karunakar <karunakar@freedomink.org>
* configure.in: Added "gu" (Gujarati) to ALL_LINGUAS.
* configure.in: Added "gu" (Gujarati) to ALL_LINGUAS.
2004-04-08 Jody Goldberg <jody@gnome.org>

4
NEWS
View file

@ -11,6 +11,10 @@ Jody:
http://bugzilla.gnome.org/show_bug.cgi?id=139190
* Fix uniqueness test for binding special keys with no name
* Fix theme manager selection when not running metacity
http://bugzilla.gnome.org/show_bug.cgi?id=139605
* Mouse buttons are not valid modifiers for keybindings
* Force libxklavier 1.0.2 so that we can work with x.org and xfree86
* Match nautilus' interpretation of icons in desktop files
Padraig O'Briain:
http://bugzilla.gnome.org/show_bug.cgi?id=131538.

6
capplets/keybindings/ChangeLog
View file

@ -1,3 +1,9 @@
2004-04-15 Jody Goldberg <jody@gnome.org>
http://bugzilla.gnome.org/show_bug.cgi?id=139605
* eggcellrendererkeys.c (grab_key_callback) : mouse buttons should not
be valid modifiers.
2004-04-06 Jody Goldberg <jody@gnome.org>
* gnome-keybinding-properties.c (cb_check_for_uniqueness) : Really fix

8
capplets/keybindings/eggcellrendererkeys.c
View file

@ -424,6 +424,14 @@ grab_key_callback (GtkWidget *widget,
EGG_VIRTUAL_SCROLL_LOCK_MASK,
&ignored_modifiers);
/* http://bugzilla.gnome.org/show_bug.cgi?id=139605
* mouse keys should effect keybindings */
ignored_modifiers |= GDK_BUTTON1_MASK |
GDK_BUTTON2_MASK |
GDK_BUTTON3_MASK |
GDK_BUTTON4_MASK |
GDK_BUTTON5_MASK;
/* filter consumed/ignored modifiers */
if (keys->accel_mode == EGG_CELL_RENDERER_KEYS_MODE_GTK)

2
capplets/network/gnome-network-preferences.c
View file

@ -316,7 +316,7 @@ main (int argc, char **argv)
setup_dialog (dialog);
widget = WID ("network_dialog");
capplet_set_icon (widget, "gnome-globe.png");
capplet_set_icon (widget, "stock_proxy");
gtk_widget_show_all (widget);
gtk_main ();

2
capplets/network/gnome-network-preferences.desktop.in
View file

@ -3,7 +3,7 @@ Encoding=UTF-8
_Name=Network Proxy
_Comment=Network proxy preferences
Exec=gnome-network-preferences
Icon=gnome-globe
Icon=stock_proxy
Terminal=false
Type=Application
StartupNotify=true

2
configure.in
View file

@ -98,7 +98,7 @@ PKG_CHECK_MODULES(VFS_CAPPLET, $COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.
PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
PKG_CHECK_MODULES(SOUND_CAPPLET, esound)
PKG_CHECK_MODULES(METACITY, libmetacity-private)
PKG_CHECK_MODULES(LIBXKLAVIER, libxklavier >= 1.00,,
PKG_CHECK_MODULES(LIBXKLAVIER, libxklavier >= 1.02,,
AC_MSG_ERROR([Upcoming releases of gnome-control-center will depend on libxklavier.
The latest release is available from http://prdownloads.sourceforge.net/gswitchit], 1))

69
control-center/capplet-dir.c
View file

@ -54,6 +54,71 @@ CappletDirView *(*get_view_cb) (CappletDir *dir, CappletDirView *launcher);
/* nice global table for capplet lookup */
GHashTable *capplet_hash = NULL;
/********************************************************************
*
* Stolen from nautilus to keep control center and nautilus in sync
*/
static gboolean
eel_str_has_suffix (const char *haystack, const char *needle)
{
const char *h, *n;
if (needle == NULL) {
return TRUE;
}
if (haystack == NULL) {
return needle[0] == '\0';
}
/* Eat one character at a time. */
h = haystack + strlen(haystack);
n = needle + strlen(needle);
do {
if (n == needle) {
return TRUE;
}
if (h == haystack) {
return FALSE;
}
} while (*--h == *--n);
return FALSE;
}
static char *
eel_str_strip_trailing_str (const char *source, const char *remove_this)
{
const char *end;
if (source == NULL) {
return NULL;
}
if (remove_this == NULL) {
return g_strdup (source);
}
end = source + strlen (source);
if (strcmp (end - strlen (remove_this), remove_this) != 0) {
return g_strdup (source);
}
else {
return g_strndup (source, strlen (source) - strlen(remove_this));
}
}
static char *
nautilus_remove_icon_file_name_suffix (const char *icon_name)
{
guint i;
const char *suffix;
static const char *icon_file_name_suffixes[] = { ".svg", ".svgz", ".png", ".jpg", ".xpm" };
for (i = 0; i < G_N_ELEMENTS (icon_file_name_suffixes); i++) {
suffix = icon_file_name_suffixes[i];
if (eel_str_has_suffix (icon_name, suffix)) {
return eel_str_strip_trailing_str (icon_name, suffix);
}
}
return g_strdup (icon_name);
}
/********************************************************************/
static GdkPixbuf *
find_icon (GnomeDesktopItem *dentry)
{
@ -68,7 +133,9 @@ find_icon (GnomeDesktopItem *dentry)
else if (g_path_is_absolute (icon))
res = gdk_pixbuf_new_from_file (icon, NULL);
else {
res = gtk_icon_theme_load_icon (icon_theme, icon, 48, 0, NULL);
char *no_suffix = nautilus_remove_icon_file_name_suffix (icon);
res = gtk_icon_theme_load_icon (icon_theme, no_suffix, 48, 0, NULL);
g_free (no_suffix);
if (res == NULL) {
char *path = g_build_filename (GNOMECC_ICONS_DIR, icon, NULL);
res = gdk_pixbuf_new_from_file (path, NULL);