head 1.4; access; symbols pkgsrc-2021Q2:1.3.0.124 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.122 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.120 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.118 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.114 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.94 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.116 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.112 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.110 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.108 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.106 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.104 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.102 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.100 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.98 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.96 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.92 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.90 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.88 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.86 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.84 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.82 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.80 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.78 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.76 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.74 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.72 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.70 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.68 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.66 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.64 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.62 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.60 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.58 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.56 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.54 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.52 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.50 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.48 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.46 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.44 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.42 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.40 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.38 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.36 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.34 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.32 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.30 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.28 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.26 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.24 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.22 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.20 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.18 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.16 pkgsrc-2008Q1:1.3.0.14 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.12 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.10 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.8 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.6 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.4 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.2 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.2.0.8 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.6 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.4 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.2 pkgsrc-2005Q3-base:1.2; locks; strict; comment @# @; 1.4 date 2021.07.04.07.13.46; author nia; state dead; branches; next 1.3; commitid X8WL8TsjTEleIDZC; 1.3 date 2006.09.22.19.57.00; author drochner; state Exp; branches; next 1.2; 1.2 date 2005.08.21.11.30.55; author jmmv; state dead; branches; next 1.1; 1.1 date 2005.07.17.22.53.06; author kristerw; state Exp; branches; next ; desc @@ 1.4 log @gdm: remove GNOME 2 version, unlikely to work with modern GNOME. x11/slim is a good replacement. PR pkg/56294 @ text @$NetBSD: patch-al,v 1.3 2006/09/22 19:57:00 drochner Exp $ --- daemon/fstype.c.orig 2006-01-20 19:42:08.000000000 +0100 +++ daemon/fstype.c @@@@ -89,8 +89,10 @@@@ static int xatoi P_((char *cp)); #ifdef FSTYPE_STATVFS /* SVR4. */ #include +#ifndef __NetBSD__ #include #endif +#endif #ifdef FSTYPE_STATFS /* 4.4BSD. */ #include /* NetBSD needs this. */ @@@@ -352,8 +354,12 @@@@ filesystem_type_uncached (char *path, ch fstype_internal_error (1, errno, "%s", path); } else +#ifdef __NetBSD__ + type = fss.f_fstypename; +#else type = fss.f_basetype; #endif +#endif #ifdef FSTYPE_STATFS /* 4.4BSD. */ struct statfs fss; @ 1.3 log @make user's login photo display work again: the code checks whether the file (~/.face) is on a local filesystem which didn't work because it didn't recognize NetBSD's way to use statvfs() (I had to make the check for statvfs a bit weaker, hope that doesn't break on another platform.) @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update to 2.8.0.1: - This release fixes a nasty bug which was causing the /etc/gdm/Xsession file to always use /bin/ksh. This caused problems on Linux, where it should be /bin/sh. It now is only /bin/ksh on Solaris builds. (Brian Cameron) - seteuid/setegid logic in the GDM slave logic has been made more sane. This was causing problems running GDM2 on NetBSD (refer to bug #301821). (Julio M. Merino Vidal) - Minor correction to Solaris audit logic. (Gary Winiger) - Updated autogen.sh so it now works with automake > 1.4. - No longer use C99 features that do not work with gcc 2.95, specifically do not declare variables except at the beginning of a block. (Jens Granseuer) - Corrected configure script so it works with pkgconfig 0.17.2. The new pkgconfig broke the build on Solaris since it no longer allows the linker to pull in libraries that are implicitely included. Now all libraries are explicit. - References to libgnome removed from vicious-extensions, so it no longer depends on libgnome. It now depends directly on i18n libraries. (Andrew Case) - The gesture listeners now log debug messages to syslog instead of stdout, and debug can now be turned on by setting the GDM_DEBUG_GESTURES environment variable rather than needing to recompile with debug. This makes it much easier to debug issues. (Brian Cameron) - Leaks fixed (Kjartan Maraas) - Corrections to docs (Andrew Case, Martin Petersen) @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.1 2005/07/17 22:53:06 kristerw Exp $ d3 15 a17 179 --- gui/gdmsetup.c.orig Sun Jul 17 23:50:28 2005 +++ gui/gdmsetup.c Mon Jul 18 00:06:08 2005 @@@@ -334,13 +334,13 @@@@ for (li = list; li != NULL; li = li->next) { char *key = li->data; + GtkTreeIter iter; int vt = atoi(key); key = g_strconcat(GDM_KEY_SERVERS, "/", key, NULL); cpy = ve_config_get_string (cfg, key); server = ve_first_word (cpy); options = ve_rest (cpy); - GtkTreeIter iter; gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, XSERVER_COLUMN_VT, vt, @@@@ -2075,16 +2075,19 @@@@ const char *nosound_button; const char *soundtest_button; char *sound_key, *val, *config_val; + GtkWidget *acc_no_sound_file; + GtkWidget *acc_sound_test; + VeConfig *config; nosound_button = g_strconcat ("acc_nosound_", key, "_button", NULL); soundtest_button = g_strconcat ("acc_soundtest_", key, "_button", NULL); - GtkWidget *acc_no_sound_file = glade_helper_get (xml, nosound_button, + acc_no_sound_file = glade_helper_get (xml, nosound_button, GTK_TYPE_BUTTON); - GtkWidget *acc_sound_test = glade_helper_get (xml, soundtest_button, + acc_sound_test = glade_helper_get (xml, soundtest_button, GTK_TYPE_BUTTON); - VeConfig *config = ve_config_get (GDM_CONFIG_FILE); + config = ve_config_get (GDM_CONFIG_FILE); gtk_label_set_text (GTK_LABEL (acc_sound_file_label), _("None")); gtk_widget_set_sensitive (acc_no_sound_file, FALSE); gtk_widget_set_sensitive (acc_sound_test, FALSE); @@@@ -2120,17 +2123,20 @@@@ const char *nosound_button; const char *soundtest_button; + GtkWidget *acc_no_sound_file; + GtkWidget *acc_sound_test; nosound_button = g_strconcat("acc_nosound_",key,"_button",NULL); soundtest_button = g_strconcat("acc_soundtest_",key,"_button",NULL); - GtkWidget *acc_no_sound_file = glade_helper_get (xml, nosound_button, + acc_no_sound_file = glade_helper_get (xml, nosound_button, GTK_TYPE_BUTTON); - GtkWidget *acc_sound_test = glade_helper_get (xml, soundtest_button, + acc_sound_test = glade_helper_get (xml, soundtest_button, GTK_TYPE_BUTTON); if (response == GTK_RESPONSE_ACCEPT) { VeConfig *config = ve_config_get (GDM_CONFIG_FILE); char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_dialog)); char *val; + char* sound_key; gtk_label_set_text (GTK_LABEL (acc_sound_file_label), filename); @@@@ -2138,7 +2144,6 @@@@ gtk_widget_set_sensitive (acc_sound_test, TRUE); - char* sound_key; if (strcmp (key, "ready") == 0 ) { have_sound_ready_file = TRUE; sound_key = g_strdup(GDM_KEY_SOUND_ON_LOGIN_READY_FILE); @@@@ -2270,6 +2275,9 @@@@ gchar *success_key = g_strdup("success"); gchar *failure_key = g_strdup("failure"); VeConfig *config = ve_config_get (GDM_CONFIG_FILE); + gboolean add_gtk_modules; + char *modules_list; + char *val; g_object_set_data (G_OBJECT (acc_sound_ready_file_label), "key", ready_key); @@@@ -2278,11 +2286,10 @@@@ g_object_set_data (G_OBJECT (acc_sound_failure_file_label), "key", failure_key); - gboolean add_gtk_modules = ve_config_get_bool (config, + add_gtk_modules = ve_config_get_bool (config, GDM_KEY_ADD_GTK_MODULES); - char *modules_list = ve_config_get_string (config, + modules_list = ve_config_get_string (config, GDM_KEY_GTK_MODULES_LIST); - char *val; if (add_gtk_modules && modules_list_contains (modules_list, "gail") && @@@@ -2749,6 +2756,7 @@@@ /* Loop through all checkboxes */ while (gtk_tree_model_get_iter (model, &iter, path)) { + gboolean selected; /* If this checkbox was just toggled */ if (gtk_tree_path_compare (path, sel_path) == 0) { @@@@ -2766,7 +2774,7 @@@@ } } - gboolean selected = FALSE; + selected = FALSE; gtk_tree_model_get (model, &iter, THEME_COLUMN_SELECTED_LIST, &selected, THEME_COLUMN_DIR, &theme_name, -1); @@@@ -3435,12 +3443,15 @@@@ static gboolean xserver_entry_timeout (GtkWidget *entry) { + const char *key; + VeConfig *cfg; + const char *text; /* Get xserver section to update */ GtkWidget *combobox = glade_helper_get (xml, "xserver_mod_combobox", GTK_TYPE_COMBO_BOX); gchar *section = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combobox)); section = g_strconcat(GDM_KEY_SERVER_PREFIX, section, "/", NULL); - const char *key = g_object_get_data (G_OBJECT (entry), "key"); + key = g_object_get_data (G_OBJECT (entry), "key"); if (strcmp (key, GDM_KEY_SERVER_NAME) == 0) section = g_strconcat(section, GDM_KEY_SERVER_NAME, NULL); @@@@ -3448,10 +3459,10 @@@@ section = g_strconcat(section, GDM_KEY_SERVER_COMMAND, NULL); /* Locate this server's section */ - VeConfig *cfg = ve_config_get (GDM_CONFIG_FILE); + cfg = ve_config_get (GDM_CONFIG_FILE); /* Update this servers configuration */ - const char *text = gtk_entry_get_text (GTK_ENTRY (entry)); + text = gtk_entry_get_text (GTK_ENTRY (entry)); ve_config_set_string (cfg, section, ve_sure_string (text)); ve_config_save (cfg, FALSE /* force */); g_free(section); @@@@ -3462,12 +3473,15 @@@@ static gboolean xserver_toggle_timeout (GtkWidget *toggle) { + const char *key; + VeConfig *cfg; + gboolean val; /* Get xserver section to update */ GtkWidget *combobox = glade_helper_get (xml, "xserver_mod_combobox", GTK_TYPE_COMBO_BOX); gchar *section = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combobox)); section = g_strconcat(GDM_KEY_SERVER_PREFIX, section, "/", NULL); - const char *key = g_object_get_data (G_OBJECT (toggle), "key"); + key = g_object_get_data (G_OBJECT (toggle), "key"); if (strcmp (key, GDM_KEY_SERVER_HANDLED) == 0) section = g_strconcat(section, GDM_KEY_SERVER_HANDLED, NULL); @@@@ -3477,8 +3491,8 @@@@ section = g_strconcat(section, GDM_KEY_SERVER_CHOOSER, NULL); /* Locate this server's section */ - VeConfig *cfg = ve_config_get (GDM_CONFIG_FILE); - gboolean val = ve_config_get_bool (cfg, section); + cfg = ve_config_get (GDM_CONFIG_FILE); + val = ve_config_get_bool (cfg, section); /* Update this servers configuration */ if ( ! ve_bool_equal (val, GTK_TOGGLE_BUTTON (toggle)->active)) { @@@@ -3513,6 +3527,7 @@@@ xserver_populate_combobox(GtkComboBox* combobox) { gint i,j; + GSList *xservers; /* Get number of items in combobox */ i = gtk_tree_model_iter_n_children( @@@@ -3524,7 +3539,7 @@@@ d19 7 d27 2 a28 83 /* Populate combobox with list of current servers */ - GSList *xservers = xservers_get_server_definitions(); + xservers = xservers_get_server_definitions(); g_slist_foreach(xservers, (GFunc) xserver_append_combobox, combobox); } @@@@ -3608,13 +3623,14 @@@@ if (gtk_tree_selection_get_selected (selection, &model, &iter)) { + char *key; /* Update config */ cfg = ve_config_get (GDM_CONFIG_FILE); gtk_tree_model_get (model, &iter, XSERVER_COLUMN_VT, &vt, -1); g_snprintf (vt_value, sizeof (vt_value), "%d", vt); - char *key = g_object_get_data (G_OBJECT (combo), "key"); + key = g_object_get_data (G_OBJECT (combo), "key"); key = g_strconcat (key, "/", vt_value, "=", NULL); ve_config_delete_key (cfg, key); ve_config_save (cfg, FALSE /* force */); @@@@ -3634,6 +3650,8 @@@@ GtkWidget *spinner, *combo, *entry, *button; gchar *string; char spinner_value[3]; + char *key; + VeConfig *cfg; /* Get Widgets from glade */ spinner = glade_helper_get (xml, "xserver_spin_button", @@@@ -3646,7 +3664,7 @@@@ GTK_TYPE_BUTTON); /* Section in config to modify */ - char *key = g_object_get_data (G_OBJECT (combo), "key"); + key = g_object_get_data (G_OBJECT (combo), "key"); /* String to add to config */ g_snprintf (spinner_value, sizeof (spinner_value), "%d", @@@@ -3658,7 +3676,7 @@@@ NULL); /* Add to config */ - VeConfig *cfg = ve_config_get (GDM_CONFIG_FILE); + cfg = ve_config_get (GDM_CONFIG_FILE); ve_config_set_string (cfg, key, ve_sure_string(string)); ve_config_save (cfg, FALSE /* force */); @@@@ -3684,6 +3702,8 @@@@ GtkWidget *handled_check, *flexible_check; GtkWidget *greeter_radio, *chooser_radio; GtkWidget *create_button, *delete_button; + VeConfig *cfg; + gboolean success; /* Get Widgets from glade */ frame = glade_helper_get (xml, "xserver_modify_frame", @@@@ -3712,12 +3732,13 @@@@ /* TODO: Create a new section for this server */ /* TODO: Write this value to the config and update xservers list */ - VeConfig *cfg = ve_config_get (GDM_CONFIG_FILE); - gboolean success = FALSE; + cfg = ve_config_get (GDM_CONFIG_FILE); + success = FALSE; /* success = ve_config_add_section (cfg, SECTION_NAME); */ if (success) { + gint i; /* Update settings for new server */ gtk_widget_set_sensitive (frame, TRUE); gtk_widget_set_sensitive (delete_button, TRUE); @@@@ -3735,7 +3756,7 @@@@ FALSE); /* Select the new server in the combobox */ - gint i = gtk_tree_model_iter_n_children ( + i = gtk_tree_model_iter_n_children ( gtk_combo_box_get_model (GTK_COMBO_BOX (modify_combobox)), NULL) - 1; gtk_combo_box_set_active (GTK_COMBO_BOX (modify_combobox), i); } @ 1.1 log @Fix C99 variable declarations to make this pkg compile with gcc 2.95. @ text @d1 1 a1 1 $NetBSD$ @