diff options
Diffstat (limited to 'sysutils/gnome-control-center/files')
7 files changed, 92 insertions, 26 deletions
diff --git a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c new file mode 100644 index 000000000000..7ea6bb0dd359 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c @@ -0,0 +1,16 @@ +--- capplets/about-me/gnome-about-me-password.c.orig Wed Aug 10 05:45:08 2005 ++++ capplets/about-me/gnome-about-me-password.c Wed Aug 10 15:44:57 2005 +@@ -35,7 +35,13 @@ + #include <sys/wait.h> + #include <sys/poll.h> + #include <termios.h> ++#include <signal.h> ++#ifndef __FreeBSD__ + #include <pty.h> ++#else ++#include <sys/types.h> ++#include <libutil.h> ++#endif + + #include "capplet-util.h" + #include "eel-alert-dialog.h" diff --git a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c new file mode 100644 index 000000000000..0d1f85f32c7f --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c @@ -0,0 +1,34 @@ +--- capplets/about-me/gnome-about-me.c.orig Wed Jul 27 13:45:17 2005 ++++ capplets/about-me/gnome-about-me.c Wed Jul 27 13:47:09 2005 +@@ -258,12 +258,10 @@ + static char * + get_user_login (void) + { +- char buf[LINE_MAX * 4]; +- struct passwd pwd, *err; ++ struct passwd *pwd; + +- int i; +- i = getpwuid_r(getuid(), &pwd, buf, sizeof(buf), &err); +- return ((i == 0) && (err == &pwd)) ? g_strdup(pwd.pw_name) : NULL; ++ pwd = getpwuid(getuid()); ++ return (pwd != NULL) ? g_strdup(pwd->pw_name) : NULL; + } + + /* +@@ -664,6 +662,7 @@ + struct passwd *pwent; + char *user = NULL; + gchar *str; ++ gchar **tok; + + me = g_new0 (GnomeAboutMe, 1); + +@@ -733,7 +732,6 @@ + _("Unknown login ID, the user database might be corrupted")); + return ; + } +- gchar **tok; + tok = g_strsplit (pwent->pw_gecos, ",", 0); + + /************************************************/ diff --git a/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c new file mode 100644 index 000000000000..ab7180f75c17 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c @@ -0,0 +1,17 @@ +--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig Wed Jul 27 13:48:58 2005 ++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c Wed Jul 27 13:49:37 2005 +@@ -265,11 +265,12 @@ + GladeXML * dialog) + { + GtkWidget *expander, *align, *vbox; ++ gchar *utfGroupName, *titlemarkup; + + GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP); + +- gchar *utfGroupName = xci_desc_to_utf8 (configItem); +- gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); ++ utfGroupName = xci_desc_to_utf8 (configItem); ++ titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); + + expander = gtk_expander_new (titlemarkup); + g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free); diff --git a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c new file mode 100644 index 000000000000..32c81dfdebba --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c @@ -0,0 +1,21 @@ +--- capplets/mouse/gnome-mouse-properties.c.orig Mon Sep 5 17:05:46 2005 ++++ capplets/mouse/gnome-mouse-properties.c Mon Sep 5 17:06:23 2005 +@@ -658,7 +658,8 @@ + + gchar **iterator = NULL; + gchar **paths = NULL; +- ++ const gchar *xpaths; ++ + GConfClient* client = gconf_client_get_default(); + GtkListStore* store = GTK_LIST_STORE(gtk_tree_model_sort_get_model(model)); + gchar* current_theme = gconf_client_get_string(client, CURSOR_THEME_KEY, NULL); +@@ -666,7 +667,7 @@ + g_object_unref(client); + client = NULL; + +- const gchar *xpaths = g_getenv ("XCURSOR_PATH"); ++ xpaths = g_getenv ("XCURSOR_PATH"); + + if (xpaths != NULL) { + paths = g_strsplit (xpaths, ":", 0); diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in deleted file mode 100644 index 52a627fb20df..000000000000 --- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-settings-daemon/actions/Makefile.in.orig Mon Dec 20 19:19:31 2004 -+++ gnome-settings-daemon/actions/Makefile.in Mon Dec 20 19:20:45 2004 -@@ -296,7 +296,7 @@ - Datadir = $(datadir)/control-center-2.0/interfaces/ - Data_DATA = acme.glade - --pixmapsdir = $(GNOMECC_PIXMAPS_DIR) -+pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps - pixmaps_DATA = acme-brightness.png acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png - - EXTRA_DIST = \ diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c index f66b82c9ffd1..ed30cddab65a 100644 --- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c +++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c @@ -1,6 +1,6 @@ ---- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig Thu Oct 14 15:44:21 2004 -+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c Thu Oct 14 15:44:38 2004 -@@ -813,7 +813,7 @@ +--- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig Wed Jul 27 13:52:13 2005 ++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c Wed Jul 27 13:52:32 2005 +@@ -828,7 +828,7 @@ do_mail_action (acme); break; case SLEEP_KEY: @@ -8,4 +8,4 @@ + do_sleep_action ("zzz", "xset dpms force off"); break; case SCREENSAVER_KEY: - execute ("xscreensaver-command -lock", FALSE); + if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c b/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c deleted file mode 100644 index 149d59a9b0c8..000000000000 --- a/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libwindow-settings/wm-list.c.orig Tue Oct 8 17:43:12 2002 -+++ libwindow-settings/wm-list.c Tue Oct 8 17:43:25 2002 -@@ -251,7 +251,7 @@ - gchar *name; - GConfClient *client; - -- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/"); -+ tempdir = gnome_unconditional_datadir_file ("wm-properties/"); - wm_list_read_dir (tempdir, FALSE); - g_free (tempdir); - |