diff -crN ./libgnomeui/libgnomeui/gnome-about.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeui/libgnomeui/gnome-about.c *** ./libgnomeui/libgnomeui/gnome-about.c Mon May 19 15:40:04 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeui/libgnomeui/gnome-about.c Mon Feb 24 18:37:26 2003 *************** *** 27,37 **** #include "gnome-about.h" - #include "gnome-stock-icons.h" - - #include #include - #include #include #include #include --- 27,33 ---- *************** *** 74,80 **** PROP_AUTHORS, PROP_DOCUMENTERS, PROP_TRANSLATOR_CREDITS, ! PROP_LOGO, }; #define GNOME_RESPONSE_CREDITS 1 --- 70,76 ---- PROP_AUTHORS, PROP_DOCUMENTERS, PROP_TRANSLATOR_CREDITS, ! PROP_LOGO }; #define GNOME_RESPONSE_CREDITS 1 *************** *** 101,114 **** gtk_widget_show (label); } ! string = g_string_new (NULL); for (list = about->_priv->authors; list; list = list->next) { tmp = g_markup_escape_text (list->data, -1); g_string_append (string, tmp); if (list->next) ! g_string_append_c (string, '\n'); g_free (tmp); } --- 97,110 ---- gtk_widget_show (label); } ! string = g_string_new (""); for (list = about->_priv->authors; list; list = list->next) { tmp = g_markup_escape_text (list->data, -1); g_string_append (string, tmp); if (list->next) ! g_string_append (string, "\n"); g_free (tmp); } *************** *** 131,137 **** gtk_widget_show (label); } ! string = g_string_new (NULL); for (list = about->_priv->documenters; list; list = list->next) { tmp = g_markup_escape_text (list->data, -1); --- 127,133 ---- gtk_widget_show (label); } ! string = g_string_new (""); for (list = about->_priv->documenters; list; list = list->next) { tmp = g_markup_escape_text (list->data, -1); *************** *** 160,166 **** gtk_widget_show (label); } ! string = g_string_new (NULL); tmp = g_markup_escape_text (about->_priv->translator_credits, -1); g_string_append (string, tmp); --- 156,162 ---- gtk_widget_show (label); } ! string = g_string_new (""); tmp = g_markup_escape_text (about->_priv->translator_credits, -1); g_string_append (string, tmp); *************** *** 198,211 **** dialog = gtk_dialog_new_with_buttons (_("Credits"), GTK_WINDOW (about), GTK_DIALOG_DESTROY_WITH_PARENT, ! GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); about->_priv->credits_dialog = dialog; gtk_window_set_default_size (GTK_WINDOW (dialog), 360, 260); ! gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); ! gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); ! gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); ! gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2); g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog); g_signal_connect (dialog, "destroy", --- 194,204 ---- dialog = gtk_dialog_new_with_buttons (_("Credits"), GTK_WINDOW (about), GTK_DIALOG_DESTROY_WITH_PARENT, ! GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); about->_priv->credits_dialog = dialog; gtk_window_set_default_size (GTK_WINDOW (dialog), 360, 260); ! gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog); g_signal_connect (dialog, "destroy", *************** *** 213,219 **** &(about->_priv->credits_dialog)); notebook = gtk_notebook_new (); ! gtk_container_set_border_width (GTK_CONTAINER (notebook), 5); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), notebook, TRUE, TRUE, 0); if (about->_priv->authors != NULL) { --- 206,212 ---- &(about->_priv->credits_dialog)); notebook = gtk_notebook_new (); ! gtk_container_set_border_width (GTK_CONTAINER (notebook), 8); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), notebook, TRUE, TRUE, 0); if (about->_priv->authors != NULL) { *************** *** 227,233 **** gtk_viewport_set_shadow_type (GTK_VIEWPORT (GTK_BIN (sw)->child), GTK_SHADOW_NONE); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sw, ! gtk_label_new (_("Written by"))); gnome_about_update_authors_label (about, label); } --- 220,226 ---- gtk_viewport_set_shadow_type (GTK_VIEWPORT (GTK_BIN (sw)->child), GTK_SHADOW_NONE); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sw, ! gtk_label_new_with_mnemonic (_("Written by"))); gnome_about_update_authors_label (about, label); } *************** *** 242,248 **** gtk_viewport_set_shadow_type (GTK_VIEWPORT (GTK_BIN (sw)->child), GTK_SHADOW_NONE); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sw, ! gtk_label_new (_("Documented by"))); gnome_about_update_documenters_label (about, label); } --- 235,241 ---- gtk_viewport_set_shadow_type (GTK_VIEWPORT (GTK_BIN (sw)->child), GTK_SHADOW_NONE); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sw, ! gtk_label_new_with_mnemonic (_("Documented by"))); gnome_about_update_documenters_label (about, label); } *************** *** 257,263 **** gtk_viewport_set_shadow_type (GTK_VIEWPORT (GTK_BIN (sw)->child), GTK_SHADOW_NONE); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sw, ! gtk_label_new (_("Translated by"))); gnome_about_update_translation_information_label (about, label); } --- 250,256 ---- gtk_viewport_set_shadow_type (GTK_VIEWPORT (GTK_BIN (sw)->child), GTK_SHADOW_NONE); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sw, ! gtk_label_new_with_mnemonic (_("Translated by"))); gnome_about_update_translation_information_label (about, label); } *************** *** 268,274 **** gnome_about_instance_init (GnomeAbout *about) { GnomeAboutPrivate *priv; ! GtkWidget *vbox, *hbox, *image, *label, *alignment, *button; /* Data */ --- 261,267 ---- gnome_about_instance_init (GnomeAbout *about) { GnomeAboutPrivate *priv; ! GtkWidget *vbox, *button; /* Data */ *************** *** 283,295 **** priv->authors = NULL; priv->documenters = NULL; - gtk_dialog_set_has_separator (GTK_DIALOG (about), FALSE); - gtk_container_set_border_width (GTK_CONTAINER (about), 5); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (about)->vbox), 5); - /* Widgets */ vbox = gtk_vbox_new (FALSE, 8); ! gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (about)->vbox), vbox, TRUE, TRUE, 0); --- 276,284 ---- priv->authors = NULL; priv->documenters = NULL; /* Widgets */ vbox = gtk_vbox_new (FALSE, 8); ! gtk_container_set_border_width (GTK_CONTAINER (vbox), 8); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (about)->vbox), vbox, TRUE, TRUE, 0); *************** *** 313,339 **** gtk_widget_show_all (vbox); ! /* Add the close button */ ! gtk_dialog_add_button (GTK_DIALOG (about), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); ! gtk_dialog_set_default_response (GTK_DIALOG (about), GTK_RESPONSE_CLOSE); /* Add the credits button */ ! image = gtk_image_new_from_stock (GNOME_STOCK_ABOUT, GTK_ICON_SIZE_BUTTON); ! ! label = gtk_label_new_with_mnemonic (_("C_redits")); ! ! hbox = gtk_hbox_new (FALSE, 2); ! gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); ! gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0); ! ! alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); ! gtk_container_add (GTK_CONTAINER (alignment), hbox); ! ! button = gtk_button_new (); ! gtk_container_add (GTK_CONTAINER (button), alignment); ! gtk_widget_show_all (button); ! ! gtk_dialog_add_action_widget (GTK_DIALOG (about), button, GNOME_RESPONSE_CREDITS); gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (GTK_DIALOG (about)->action_area), button, TRUE); gtk_window_set_resizable (GTK_WINDOW (about), FALSE); --- 302,313 ---- gtk_widget_show_all (vbox); ! /* Add the OK button */ ! gtk_dialog_add_button (GTK_DIALOG (about), GTK_STOCK_OK, GTK_RESPONSE_OK); ! gtk_dialog_set_default_response (GTK_DIALOG (about), GTK_RESPONSE_OK); /* Add the credits button */ ! button = gtk_dialog_add_button (GTK_DIALOG (about), _("_Credits"), GNOME_RESPONSE_CREDITS); gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (GTK_DIALOG (about)->action_area), button, TRUE); gtk_window_set_resizable (GTK_WINDOW (about), FALSE); diff -crN ./libgnomeui/libgnomeui/gnome-client.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeui/libgnomeui/gnome-client.h *** ./libgnomeui/libgnomeui/gnome-client.h Fri May 31 02:40:30 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeui/libgnomeui/gnome-client.h Fri Jun 28 18:44:06 2002 *************** *** 147,157 **** gint input_id; /* values sent with the last SaveYourself message */ ! GnomeSaveStyle save_style : 2; ! GnomeInteractStyle interact_style : 2; /* other internal state information */ ! GnomeClientState state : 3; guint shutdown : 1; guint fast : 1; --- 147,157 ---- gint input_id; /* values sent with the last SaveYourself message */ ! unsigned int save_style : 2; /* GnomeSaveStyle */ ! unsigned int interact_style : 2; /* GnomeInteractStyle */ /* other internal state information */ ! unsigned int state : 3; /* GnomeClientState */ guint shutdown : 1; guint fast : 1; diff -crN ./libgnomeui/libgnomeui/gnome-druid-page-edge.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeui/libgnomeui/gnome-druid-page-edge.h *** ./libgnomeui/libgnomeui/gnome-druid-page-edge.h Mon Jun 10 10:32:13 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeui/libgnomeui/gnome-druid-page-edge.h Fri Jun 28 18:44:10 2002 *************** *** 100,106 **** GdkColor title_color; GdkColor text_color; ! GnomeEdgePosition position : 2; /*< private >*/ GnomeDruidPageEdgePrivate *_priv; --- 100,106 ---- GdkColor title_color; GdkColor text_color; ! unsigned int position : 2; /* GnomeEdgePosition */ /*< private >*/ GnomeDruidPageEdgePrivate *_priv; diff -crN ./libgnomeui/libgnomeui/gnome-druid-page-standard.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeui/libgnomeui/gnome-druid-page-standard.c *** ./libgnomeui/libgnomeui/gnome-druid-page-standard.c Mon Jun 10 10:32:13 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeui/libgnomeui/gnome-druid-page-standard.c Fri Jun 28 18:44:13 2002 *************** *** 88,94 **** PROP_LOGO_BACKGROUND_SET, PROP_CONTENTS_BACKGROUND, PROP_CONTENTS_BACKGROUND_GDK, ! PROP_CONTENTS_BACKGROUND_SET, }; GNOME_CLASS_BOILERPLATE (GnomeDruidPageStandard, gnome_druid_page_standard, --- 88,94 ---- PROP_LOGO_BACKGROUND_SET, PROP_CONTENTS_BACKGROUND, PROP_CONTENTS_BACKGROUND_GDK, ! PROP_CONTENTS_BACKGROUND_SET }; GNOME_CLASS_BOILERPLATE (GnomeDruidPageStandard, gnome_druid_page_standard, diff -crN ./libgnomeui/libgnomeui/gnome-druid.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeui/libgnomeui/gnome-druid.c *** ./libgnomeui/libgnomeui/gnome-druid.c Thu Oct 10 18:54:22 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeui/libgnomeui/gnome-druid.c Mon Feb 24 18:38:29 2003 *************** *** 50,56 **** enum { PROP_0, PROP_SHOW_FINISH, ! PROP_SHOW_HELP, }; --- 50,56 ---- enum { PROP_0, PROP_SHOW_FINISH, ! PROP_SHOW_HELP }; diff -crN ./libgnomeui/libgnomeui/gnome-font-picker.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeui/libgnomeui/gnome-font-picker.c *** ./libgnomeui/libgnomeui/gnome-font-picker.c Thu Feb 13 01:34:48 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeui/libgnomeui/gnome-font-picker.c Mon Feb 24 18:39:50 2003 *************** *** 51,57 **** int use_font_in_label_size; ! GnomeFontPickerMode mode : 2; /* Only for GNOME_FONT_PICKER_MODE_FONT_INFO */ gboolean use_font_in_label : 1; --- 51,57 ---- int use_font_in_label_size; ! unsigned int mode : 2; /* GnomeFontPickerMode */ /* Only for GNOME_FONT_PICKER_MODE_FONT_INFO */ gboolean use_font_in_label : 1; *************** *** 1016,1023 **** /* Modify font style */ gtk_widget_modify_font (gfp->_priv->font_label, desc); - pango_font_description_free (desc); - } /* gnome_font_picker_set_label_font */ static void --- 1016,1021 ---- diff -crN ./libgnomeui/libgnomeui/gnome-icon-theme.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeui/libgnomeui/gnome-icon-theme.c *** ./libgnomeui/libgnomeui/gnome-icon-theme.c Sun Jun 15 17:20:26 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeui/libgnomeui/gnome-icon-theme.c Wed Apr 9 12:48:47 2003 *************** *** 33,39 **** { ICON_THEME_DIR_FIXED, ICON_THEME_DIR_SCALABLE, ! ICON_THEME_DIR_THRESHOLD, } IconThemeDirType; /* In reverse search order: */ --- 33,39 ---- { ICON_THEME_DIR_FIXED, ICON_THEME_DIR_SCALABLE, ! ICON_THEME_DIR_THRESHOLD } IconThemeDirType; /* In reverse search order: */ *************** *** 41,49 **** { ICON_SUFFIX_NONE = 0, ICON_SUFFIX_XPM, - ICON_SUFFIX_SVGZ, ICON_SUFFIX_SVG, ! ICON_SUFFIX_PNG, } IconSuffix; --- 41,48 ---- { ICON_SUFFIX_NONE = 0, ICON_SUFFIX_XPM, ICON_SUFFIX_SVG, ! ICON_SUFFIX_PNG } IconSuffix; *************** *** 132,138 **** static guint signal_changed = 0; ! static GObjectClass *parent_class = NULL; GType gnome_icon_theme_get_type (void) --- 131,137 ---- static guint signal_changed = 0; ! GType gnome_icon_theme_get_type (void) *************** *** 171,178 **** { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - parent_class = g_type_class_peek_parent (klass); - gobject_class->finalize = gnome_icon_theme_finalize; signal_changed = g_signal_new ("changed", --- 170,175 ---- *************** *** 344,351 **** blow_themes (priv); g_free (priv); - - G_OBJECT_CLASS (parent_class)->finalize (object); } void --- 341,346 ---- *************** *** 659,666 **** while ((file = g_dir_read_name (gdir))) { if (my_g_str_has_suffix (file, ".png") || ! (priv->allow_svg && (my_g_str_has_suffix (file, ".svg") || ! my_g_str_has_suffix (file, ".svgz"))) || my_g_str_has_suffix (file, ".xpm")) { abs_file = g_build_filename (dir, file, NULL); --- 654,660 ---- while ((file = g_dir_read_name (gdir))) { if (my_g_str_has_suffix (file, ".png") || ! (priv->allow_svg && my_g_str_has_suffix (file, ".svg")) || my_g_str_has_suffix (file, ".xpm")) { abs_file = g_build_filename (dir, file, NULL); *************** *** 876,881 **** --- 870,876 ---- { GnomeIconThemePrivate *priv; IconThemeDirMtime *dir_mtime; + char *path; GList *d; int stat_res; struct stat stat_buf; *************** *** 975,982 **** return ".xpm"; case ICON_SUFFIX_SVG: return ".svg"; - case ICON_SUFFIX_SVGZ: - return ".svgz"; case ICON_SUFFIX_PNG: return ".png"; default: --- 970,975 ---- *************** *** 994,1001 **** retval = ICON_SUFFIX_PNG; else if (my_g_str_has_suffix (name, ".svg")) retval = ICON_SUFFIX_SVG; - else if (my_g_str_has_suffix (name, ".svgz")) - retval = ICON_SUFFIX_SVGZ; else if (my_g_str_has_suffix (name, ".xpm")) retval = ICON_SUFFIX_XPM; else --- 987,992 ---- *************** *** 1018,1023 **** --- 1009,1040 ---- gboolean smaller, has_larger; IconSuffix suffix; + l = theme->dirs; + while (l != NULL) + { + dir = l->data; + + if (theme_dir_size_difference (dir, size, &smaller) == 0) + { + suffix = GPOINTER_TO_INT (g_hash_table_lookup (dir->icons, icon_name)); + if (suffix != ICON_SUFFIX_NONE) { + file = g_strconcat (icon_name, string_from_suffix (suffix), NULL); + absolute_file = g_build_filename (dir->dir, file, NULL); + g_free (file); + + if (icon_data && dir->icon_data != NULL) + *icon_data = g_hash_table_lookup (dir->icon_data, icon_name); + + if (base_size) + *base_size = dir->size; + + return absolute_file; + } + } + + l = l->next; + } + min_difference = G_MAXINT; min_dir = NULL; has_larger = FALSE; *************** *** 1026,1061 **** { dir = l->data; ! if (g_hash_table_lookup (dir->icons, icon_name) != ICON_SUFFIX_NONE) { ! difference = theme_dir_size_difference (dir, size, &smaller); ! ! if (difference == 0) { min_dir = dir; ! break; ! } ! ! if (!has_larger) ! { ! if (difference < min_difference || smaller) ! { ! min_difference = difference; ! min_dir = dir; ! has_larger = smaller; ! } } ! else { ! if (difference < min_difference && smaller) ! { ! min_difference = difference; ! min_dir = dir; ! } } - } ! l = l->next; } --- 1043,1069 ---- { dir = l->data; ! difference = theme_dir_size_difference (dir, size, &smaller); ! if (!has_larger) { ! if ((difference < min_difference || smaller) && ! g_hash_table_lookup (dir->icons, icon_name) != ICON_SUFFIX_NONE) { + min_difference = difference; min_dir = dir; ! has_larger = smaller; } ! } ! else ! { ! if ((difference < min_difference && smaller) && ! g_hash_table_lookup (dir->icons, icon_name) != ICON_SUFFIX_NONE) { ! min_difference = difference; ! min_dir = dir; } } ! l = l->next; } *************** *** 1229,1235 **** suffix = suffix_from_name (name); if (suffix == ICON_SUFFIX_NONE || ! ((suffix == ICON_SUFFIX_SVG || suffix == ICON_SUFFIX_SVGZ) && !allow_svg)) continue; base_name = g_strdup (name); --- 1237,1243 ---- suffix = suffix_from_name (name); if (suffix == ICON_SUFFIX_NONE || ! (suffix == ICON_SUFFIX_SVG && !allow_svg)) continue; base_name = g_strdup (name);