summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog12
-rw-r--r--icons/Makefile.am1
-rw-r--r--icons/nautilus-launch-icon.pngbin0 -> 4472 bytes
-rw-r--r--src/nautilus-navigation-window.c87
-rw-r--r--src/nautilus-object-window.c87
-rw-r--r--src/nautilus-spatial-window.c87
-rw-r--r--src/nautilus-window.c87
7 files changed, 53 insertions, 308 deletions
diff --git a/ChangeLog b/ChangeLog
index 47353e220..a761fdeec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2002-03-11 Anders Carlsson <andersca@gnu.org>
+ * icons/Makefile.am:
+ * icons/nautilus-launch-icon.png:
+ Re-add nautilus-launch-icon.
+
+ * src/nautilus-window.c: (set_up_default_icon_list):
+ Use nautilus_pixmap_file to get the full path to the icons used.
+ (nautilus_window_class_init):
+ Remove nautilus_window_realize function, it only contained
+ stuff we don't need to do these days.
+
+2002-03-11 Anders Carlsson <andersca@gnu.org>
+
* src/nautilus-window.c: (nautilus_window_set_up_sidebar),
(nautilus_window_tear_down_sidebar), (nautilus_window_constructed),
(nautilus_window_hide_sidebar), (nautilus_window_show_sidebar),
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 82ac2b421..86610aefb 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -29,6 +29,7 @@ icon_DATA =\
emblems.png \
increment.png \
knob.png \
+ nautilus-launch-icon.png \
nautilus-mini-logo.png \
note-indicator.png \
number_strip.png \
diff --git a/icons/nautilus-launch-icon.png b/icons/nautilus-launch-icon.png
new file mode 100644
index 000000000..87cfae569
--- /dev/null
+++ b/icons/nautilus-launch-icon.png
Binary files differ
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 346884314..bb7f2eff6 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -113,9 +113,6 @@ enum {
static GList *history_list;
-static GdkPixmap *mini_icon_pixmap;
-static GdkBitmap *mini_icon_mask;
-
static void update_sidebar_panels_from_preferences (NautilusWindow *window);
static void sidebar_panels_changed_callback (gpointer user_data);
static void cancel_view_as_callback (NautilusWindow *window);
@@ -124,53 +121,25 @@ GNOME_CLASS_BOILERPLATE (NautilusWindow, nautilus_window,
BonoboWindow, BONOBO_TYPE_WINDOW)
static void
-unref_mini_icon (void)
-{
- g_object_unref (mini_icon_pixmap);
- if (mini_icon_mask != NULL) {
- g_object_unref (mini_icon_mask);
- }
-}
-
-static void
-load_mini_icon (void)
-{
- char *filename;
- GdkPixbuf *pixbuf;
- static gboolean loaded;
-
- if (loaded) {
- return;
- }
- loaded = TRUE;
-
- filename = nautilus_pixmap_file ("nautilus-mini-logo.png");
- if (filename == NULL) {
- return;
- }
-
- pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- if (pixbuf != NULL) {
- gdk_pixbuf_render_pixmap_and_mask
- (pixbuf, &mini_icon_pixmap, &mini_icon_mask,
- EEL_STANDARD_ALPHA_THRESHHOLD);
- g_object_unref (pixbuf);
- eel_debug_call_at_shutdown (unref_mini_icon);
- }
- g_free (filename);
-}
-
-static void
set_up_default_icon_list (void)
{
GList *icon_list;
guint i;
GdkPixbuf *pixbuf;
+ char *path;
const char *icon_filenames[] = { "nautilus-mini-logo.png", "nautilus-launch-icon.png" };
icon_list = NULL;
for (i = 0; i < G_N_ELEMENTS (icon_filenames); i++) {
- pixbuf = gdk_pixbuf_new_from_file (icon_filenames[i], NULL);
+ path = nautilus_pixmap_file (icon_filenames[i]);
+
+ if (path == NULL) {
+ continue;
+ }
+
+ pixbuf = gdk_pixbuf_new_from_file (path, NULL);
+ g_free (path);
+
if (pixbuf != NULL) {
icon_list = g_list_prepend (icon_list, pixbuf);
}
@@ -915,41 +884,6 @@ nautilus_window_close (NautilusWindow *window)
}
static void
-nautilus_window_update_launcher (GdkWindow *window)
-{
- struct timeval tmp;
-
- gettimeofday (&tmp, NULL);
-
- /* Set a property on the root window to the time of day in seconds.
- * The launcher will monitor the root window for this property change
- * to update its launching state */
- gdk_property_change (gdk_get_default_root_window (),
- gdk_atom_intern ("_NAUTILUS_LAST_WINDOW_REALIZE_TIME", FALSE),
- gdk_x11_xatom_to_atom (XA_CARDINAL),
- 32,
- PropModeReplace,
- (guchar *) &tmp.tv_sec,
- 1);
-}
-
-static void
-nautilus_window_realize (GtkWidget *widget)
-{
- /* Create our GdkWindow */
- GTK_WIDGET_CLASS (parent_class)->realize (widget);
-
- /* Set the mini icon */
- load_mini_icon ();
- if (mini_icon_pixmap != NULL) {
- eel_set_mini_icon (widget->window, mini_icon_pixmap, mini_icon_mask);
- }
-
- /* Notify the launcher that our window has been realized */
- nautilus_window_update_launcher (widget->window);
-}
-
-static void
nautilus_window_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
@@ -2139,7 +2073,6 @@ nautilus_window_class_init (NautilusWindowClass *class)
GTK_OBJECT_CLASS (class)->destroy = nautilus_window_destroy;
GTK_WIDGET_CLASS (class)->show = nautilus_window_show;
GTK_WIDGET_CLASS (class)->unrealize = nautilus_window_unrealize;
- GTK_WIDGET_CLASS (class)->realize = nautilus_window_realize;
GTK_WIDGET_CLASS (class)->size_request = nautilus_window_size_request;
class->add_current_location_to_history_list = real_add_current_location_to_history_list;
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index 346884314..bb7f2eff6 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -113,9 +113,6 @@ enum {
static GList *history_list;
-static GdkPixmap *mini_icon_pixmap;
-static GdkBitmap *mini_icon_mask;
-
static void update_sidebar_panels_from_preferences (NautilusWindow *window);
static void sidebar_panels_changed_callback (gpointer user_data);
static void cancel_view_as_callback (NautilusWindow *window);
@@ -124,53 +121,25 @@ GNOME_CLASS_BOILERPLATE (NautilusWindow, nautilus_window,
BonoboWindow, BONOBO_TYPE_WINDOW)
static void
-unref_mini_icon (void)
-{
- g_object_unref (mini_icon_pixmap);
- if (mini_icon_mask != NULL) {
- g_object_unref (mini_icon_mask);
- }
-}
-
-static void
-load_mini_icon (void)
-{
- char *filename;
- GdkPixbuf *pixbuf;
- static gboolean loaded;
-
- if (loaded) {
- return;
- }
- loaded = TRUE;
-
- filename = nautilus_pixmap_file ("nautilus-mini-logo.png");
- if (filename == NULL) {
- return;
- }
-
- pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- if (pixbuf != NULL) {
- gdk_pixbuf_render_pixmap_and_mask
- (pixbuf, &mini_icon_pixmap, &mini_icon_mask,
- EEL_STANDARD_ALPHA_THRESHHOLD);
- g_object_unref (pixbuf);
- eel_debug_call_at_shutdown (unref_mini_icon);
- }
- g_free (filename);
-}
-
-static void
set_up_default_icon_list (void)
{
GList *icon_list;
guint i;
GdkPixbuf *pixbuf;
+ char *path;
const char *icon_filenames[] = { "nautilus-mini-logo.png", "nautilus-launch-icon.png" };
icon_list = NULL;
for (i = 0; i < G_N_ELEMENTS (icon_filenames); i++) {
- pixbuf = gdk_pixbuf_new_from_file (icon_filenames[i], NULL);
+ path = nautilus_pixmap_file (icon_filenames[i]);
+
+ if (path == NULL) {
+ continue;
+ }
+
+ pixbuf = gdk_pixbuf_new_from_file (path, NULL);
+ g_free (path);
+
if (pixbuf != NULL) {
icon_list = g_list_prepend (icon_list, pixbuf);
}
@@ -915,41 +884,6 @@ nautilus_window_close (NautilusWindow *window)
}
static void
-nautilus_window_update_launcher (GdkWindow *window)
-{
- struct timeval tmp;
-
- gettimeofday (&tmp, NULL);
-
- /* Set a property on the root window to the time of day in seconds.
- * The launcher will monitor the root window for this property change
- * to update its launching state */
- gdk_property_change (gdk_get_default_root_window (),
- gdk_atom_intern ("_NAUTILUS_LAST_WINDOW_REALIZE_TIME", FALSE),
- gdk_x11_xatom_to_atom (XA_CARDINAL),
- 32,
- PropModeReplace,
- (guchar *) &tmp.tv_sec,
- 1);
-}
-
-static void
-nautilus_window_realize (GtkWidget *widget)
-{
- /* Create our GdkWindow */
- GTK_WIDGET_CLASS (parent_class)->realize (widget);
-
- /* Set the mini icon */
- load_mini_icon ();
- if (mini_icon_pixmap != NULL) {
- eel_set_mini_icon (widget->window, mini_icon_pixmap, mini_icon_mask);
- }
-
- /* Notify the launcher that our window has been realized */
- nautilus_window_update_launcher (widget->window);
-}
-
-static void
nautilus_window_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
@@ -2139,7 +2073,6 @@ nautilus_window_class_init (NautilusWindowClass *class)
GTK_OBJECT_CLASS (class)->destroy = nautilus_window_destroy;
GTK_WIDGET_CLASS (class)->show = nautilus_window_show;
GTK_WIDGET_CLASS (class)->unrealize = nautilus_window_unrealize;
- GTK_WIDGET_CLASS (class)->realize = nautilus_window_realize;
GTK_WIDGET_CLASS (class)->size_request = nautilus_window_size_request;
class->add_current_location_to_history_list = real_add_current_location_to_history_list;
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 346884314..bb7f2eff6 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -113,9 +113,6 @@ enum {
static GList *history_list;
-static GdkPixmap *mini_icon_pixmap;
-static GdkBitmap *mini_icon_mask;
-
static void update_sidebar_panels_from_preferences (NautilusWindow *window);
static void sidebar_panels_changed_callback (gpointer user_data);
static void cancel_view_as_callback (NautilusWindow *window);
@@ -124,53 +121,25 @@ GNOME_CLASS_BOILERPLATE (NautilusWindow, nautilus_window,
BonoboWindow, BONOBO_TYPE_WINDOW)
static void
-unref_mini_icon (void)
-{
- g_object_unref (mini_icon_pixmap);
- if (mini_icon_mask != NULL) {
- g_object_unref (mini_icon_mask);
- }
-}
-
-static void
-load_mini_icon (void)
-{
- char *filename;
- GdkPixbuf *pixbuf;
- static gboolean loaded;
-
- if (loaded) {
- return;
- }
- loaded = TRUE;
-
- filename = nautilus_pixmap_file ("nautilus-mini-logo.png");
- if (filename == NULL) {
- return;
- }
-
- pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- if (pixbuf != NULL) {
- gdk_pixbuf_render_pixmap_and_mask
- (pixbuf, &mini_icon_pixmap, &mini_icon_mask,
- EEL_STANDARD_ALPHA_THRESHHOLD);
- g_object_unref (pixbuf);
- eel_debug_call_at_shutdown (unref_mini_icon);
- }
- g_free (filename);
-}
-
-static void
set_up_default_icon_list (void)
{
GList *icon_list;
guint i;
GdkPixbuf *pixbuf;
+ char *path;
const char *icon_filenames[] = { "nautilus-mini-logo.png", "nautilus-launch-icon.png" };
icon_list = NULL;
for (i = 0; i < G_N_ELEMENTS (icon_filenames); i++) {
- pixbuf = gdk_pixbuf_new_from_file (icon_filenames[i], NULL);
+ path = nautilus_pixmap_file (icon_filenames[i]);
+
+ if (path == NULL) {
+ continue;
+ }
+
+ pixbuf = gdk_pixbuf_new_from_file (path, NULL);
+ g_free (path);
+
if (pixbuf != NULL) {
icon_list = g_list_prepend (icon_list, pixbuf);
}
@@ -915,41 +884,6 @@ nautilus_window_close (NautilusWindow *window)
}
static void
-nautilus_window_update_launcher (GdkWindow *window)
-{
- struct timeval tmp;
-
- gettimeofday (&tmp, NULL);
-
- /* Set a property on the root window to the time of day in seconds.
- * The launcher will monitor the root window for this property change
- * to update its launching state */
- gdk_property_change (gdk_get_default_root_window (),
- gdk_atom_intern ("_NAUTILUS_LAST_WINDOW_REALIZE_TIME", FALSE),
- gdk_x11_xatom_to_atom (XA_CARDINAL),
- 32,
- PropModeReplace,
- (guchar *) &tmp.tv_sec,
- 1);
-}
-
-static void
-nautilus_window_realize (GtkWidget *widget)
-{
- /* Create our GdkWindow */
- GTK_WIDGET_CLASS (parent_class)->realize (widget);
-
- /* Set the mini icon */
- load_mini_icon ();
- if (mini_icon_pixmap != NULL) {
- eel_set_mini_icon (widget->window, mini_icon_pixmap, mini_icon_mask);
- }
-
- /* Notify the launcher that our window has been realized */
- nautilus_window_update_launcher (widget->window);
-}
-
-static void
nautilus_window_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
@@ -2139,7 +2073,6 @@ nautilus_window_class_init (NautilusWindowClass *class)
GTK_OBJECT_CLASS (class)->destroy = nautilus_window_destroy;
GTK_WIDGET_CLASS (class)->show = nautilus_window_show;
GTK_WIDGET_CLASS (class)->unrealize = nautilus_window_unrealize;
- GTK_WIDGET_CLASS (class)->realize = nautilus_window_realize;
GTK_WIDGET_CLASS (class)->size_request = nautilus_window_size_request;
class->add_current_location_to_history_list = real_add_current_location_to_history_list;
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 346884314..bb7f2eff6 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -113,9 +113,6 @@ enum {
static GList *history_list;
-static GdkPixmap *mini_icon_pixmap;
-static GdkBitmap *mini_icon_mask;
-
static void update_sidebar_panels_from_preferences (NautilusWindow *window);
static void sidebar_panels_changed_callback (gpointer user_data);
static void cancel_view_as_callback (NautilusWindow *window);
@@ -124,53 +121,25 @@ GNOME_CLASS_BOILERPLATE (NautilusWindow, nautilus_window,
BonoboWindow, BONOBO_TYPE_WINDOW)
static void
-unref_mini_icon (void)
-{
- g_object_unref (mini_icon_pixmap);
- if (mini_icon_mask != NULL) {
- g_object_unref (mini_icon_mask);
- }
-}
-
-static void
-load_mini_icon (void)
-{
- char *filename;
- GdkPixbuf *pixbuf;
- static gboolean loaded;
-
- if (loaded) {
- return;
- }
- loaded = TRUE;
-
- filename = nautilus_pixmap_file ("nautilus-mini-logo.png");
- if (filename == NULL) {
- return;
- }
-
- pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- if (pixbuf != NULL) {
- gdk_pixbuf_render_pixmap_and_mask
- (pixbuf, &mini_icon_pixmap, &mini_icon_mask,
- EEL_STANDARD_ALPHA_THRESHHOLD);
- g_object_unref (pixbuf);
- eel_debug_call_at_shutdown (unref_mini_icon);
- }
- g_free (filename);
-}
-
-static void
set_up_default_icon_list (void)
{
GList *icon_list;
guint i;
GdkPixbuf *pixbuf;
+ char *path;
const char *icon_filenames[] = { "nautilus-mini-logo.png", "nautilus-launch-icon.png" };
icon_list = NULL;
for (i = 0; i < G_N_ELEMENTS (icon_filenames); i++) {
- pixbuf = gdk_pixbuf_new_from_file (icon_filenames[i], NULL);
+ path = nautilus_pixmap_file (icon_filenames[i]);
+
+ if (path == NULL) {
+ continue;
+ }
+
+ pixbuf = gdk_pixbuf_new_from_file (path, NULL);
+ g_free (path);
+
if (pixbuf != NULL) {
icon_list = g_list_prepend (icon_list, pixbuf);
}
@@ -915,41 +884,6 @@ nautilus_window_close (NautilusWindow *window)
}
static void
-nautilus_window_update_launcher (GdkWindow *window)
-{
- struct timeval tmp;
-
- gettimeofday (&tmp, NULL);
-
- /* Set a property on the root window to the time of day in seconds.
- * The launcher will monitor the root window for this property change
- * to update its launching state */
- gdk_property_change (gdk_get_default_root_window (),
- gdk_atom_intern ("_NAUTILUS_LAST_WINDOW_REALIZE_TIME", FALSE),
- gdk_x11_xatom_to_atom (XA_CARDINAL),
- 32,
- PropModeReplace,
- (guchar *) &tmp.tv_sec,
- 1);
-}
-
-static void
-nautilus_window_realize (GtkWidget *widget)
-{
- /* Create our GdkWindow */
- GTK_WIDGET_CLASS (parent_class)->realize (widget);
-
- /* Set the mini icon */
- load_mini_icon ();
- if (mini_icon_pixmap != NULL) {
- eel_set_mini_icon (widget->window, mini_icon_pixmap, mini_icon_mask);
- }
-
- /* Notify the launcher that our window has been realized */
- nautilus_window_update_launcher (widget->window);
-}
-
-static void
nautilus_window_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
@@ -2139,7 +2073,6 @@ nautilus_window_class_init (NautilusWindowClass *class)
GTK_OBJECT_CLASS (class)->destroy = nautilus_window_destroy;
GTK_WIDGET_CLASS (class)->show = nautilus_window_show;
GTK_WIDGET_CLASS (class)->unrealize = nautilus_window_unrealize;
- GTK_WIDGET_CLASS (class)->realize = nautilus_window_realize;
GTK_WIDGET_CLASS (class)->size_request = nautilus_window_size_request;
class->add_current_location_to_history_list = real_add_current_location_to_history_list;
View Lorry Controller Status