diff options
| author | Darin Adler <darin@src.gnome.org> | 2000-09-14 18:34:50 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2000-09-14 18:34:50 +0000 |
| commit | 3b322e95f34573d8f68748ee9578f603427734ce (patch) | |
| tree | bb84c1be41c14fba82c7c013f71581c9ba4ecb0f /libnautilus-extensions | |
| parent | 146c7178ee17764cd882d18e25a0e6ae7c344b52 (diff) | |
| download | nautilus-3b322e95f34573d8f68748ee9578f603427734ce.tar.gz | |
Some fixes to "make dist" to make the tinderbox happy.
* components/rpmview/Makefile.am:
* components/tree/Makefile.am:
* libnautilus-extensions/Makefile.am:
* src/Makefile.am:
Added missing .h files.
* src/file-manager/.cvsignore:
Ignore some ancient generated files.
* libnautilus-extensions/nautilus-gtk-extensions.c:
(nautilus_gtk_label_make_bold): Formatting tweak.
(nautilus_gtk_widget_set_foreground_color): Don't set the base
color when you set the foreground. The base is more like the
background color.
* libnautilus-extensions/nautilus-volume-monitor.c:
(mnttab_add_mount_volume): Formatting tweak.
Diffstat (limited to 'libnautilus-extensions')
| -rw-r--r-- | libnautilus-extensions/Makefile.am | 2 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-gtk-extensions.c | 9 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-volume-monitor.c | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/libnautilus-extensions/Makefile.am b/libnautilus-extensions/Makefile.am index 1ebddf7e8..1388a1662 100644 --- a/libnautilus-extensions/Makefile.am +++ b/libnautilus-extensions/Makefile.am @@ -154,6 +154,8 @@ noinst_HEADERS = \ nautilus-directory-private.h \ nautilus-directory.h \ nautilus-drag.h \ + nautilus-druid.h \ + nautilus-druid-page-eazel.h \ nautilus-entry.h \ nautilus-file-attributes.h \ nautilus-file-changes-queue.h \ diff --git a/libnautilus-extensions/nautilus-gtk-extensions.c b/libnautilus-extensions/nautilus-gtk-extensions.c index b9a4f3876..646bf441f 100644 --- a/libnautilus-extensions/nautilus-gtk-extensions.c +++ b/libnautilus-extensions/nautilus-gtk-extensions.c @@ -1062,15 +1062,14 @@ nautilus_gtk_label_make_bold (GtkLabel *label) GdkFont *bold_font; g_return_if_fail (GTK_IS_LABEL (label)); - style = gtk_widget_get_style (GTK_WIDGET(label)); - bold_font = nautilus_gdk_font_get_bold (style->font); + style = gtk_widget_get_style (GTK_WIDGET (label)); + bold_font = nautilus_gdk_font_get_bold (style->font); if (bold_font == NULL) { return; } - - nautilus_gtk_widget_set_font (GTK_WIDGET(label), bold_font); + nautilus_gtk_widget_set_font (GTK_WIDGET (label), bold_font); gdk_font_unref (bold_font); } @@ -1115,9 +1114,7 @@ nautilus_gtk_widget_set_foreground_color (GtkWidget *widget, nautilus_gdk_color_parse_with_white_default (color_spec, &color); style->fg[GTK_STATE_NORMAL] = color; - style->base[GTK_STATE_NORMAL] = color; style->fg[GTK_STATE_ACTIVE] = color; - style->base[GTK_STATE_ACTIVE] = color; /* Put the style in the widget. */ gtk_widget_set_style (widget, style); diff --git a/libnautilus-extensions/nautilus-volume-monitor.c b/libnautilus-extensions/nautilus-volume-monitor.c index e14ac35e3..5f5c8a617 100644 --- a/libnautilus-extensions/nautilus-volume-monitor.c +++ b/libnautilus-extensions/nautilus-volume-monitor.c @@ -741,7 +741,7 @@ mnttab_add_mount_volume (NautilusVolumeMonitor *monitor, struct mnttab *tab) gboolean mounted; volume = g_new0 (NautilusVolume, 1); - volume->fsname = g_strdup(tab->mnt_fstype); + volume->fsname = g_strdup (tab->mnt_fstype); volume->mount_path = g_strdup (tab->mnt_mountp); mounted = FALSE; |