Commit e7c0e224 authored by James Willcox's avatar James Willcox Committed by James Willcox

Update to latest recent-files stuff in libegg. This fixes a crasher bug.



2003-01-04  James Willcox  <jwillcox@gnome.org>

	* recent-files/Makefile.am:
	* recent-files/egg-recent-item.c: (egg_recent_item_set_uri),
	(egg_recent_item_get_uri_for_display):
	* recent-files/egg-recent-model.c: (egg_recent_model_update_item),
	(egg_recent_model_filter):
	* recent-files/egg-recent-view-bonobo.c:
	(egg_recent_view_bonobo_set_model), (egg_recent_view_bonobo_init):
	* recent-files/egg-recent-view-gtk.c:
	(egg_recent_view_gtk_set_model), (egg_recent_view_gtk_init):

	Update to latest recent-files stuff in libegg.  This fixes a crasher
	bug.

2003-01-03  James Willcox  <jwillcox@gnome.org>

	* gedit2.c: (gedit_handle_automation_cmdline):

	Tell the startup-notification stuff that we are all done.

2003-01-03  James Willcox  <jwillcox@gnome.org>

	* data/gedit.desktop.in:

	Enable startup notification
parent 2080a010
2003-01-03 James Willcox <jwillcox@gnome.org>
* data/gedit.desktop.in:
Enable startup notification
2003-01-02 Paolo Maggi <paolo.maggi@polito.it>
* configure.in: requires libgnomeprintui-2.2 >= 2.1.7
......
......@@ -10,3 +10,4 @@ Categories=Application;Utility;TextEditor;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gedit
X-GNOME-Bugzilla-Component=general
StartupNotify=true
2003-01-04 James Willcox <jwillcox@gnome.org>
* recent-files/Makefile.am:
* recent-files/egg-recent-item.c: (egg_recent_item_set_uri),
(egg_recent_item_get_uri_for_display):
* recent-files/egg-recent-model.c: (egg_recent_model_update_item),
(egg_recent_model_filter):
* recent-files/egg-recent-view-bonobo.c:
(egg_recent_view_bonobo_set_model), (egg_recent_view_bonobo_init):
* recent-files/egg-recent-view-gtk.c:
(egg_recent_view_gtk_set_model), (egg_recent_view_gtk_init):
Update to latest recent-files stuff in libegg. This fixes a crasher
bug.
2003-01-03 James Willcox <jwillcox@gnome.org>
* gedit2.c: (gedit_handle_automation_cmdline):
Tell the startup-notification stuff that we are all done.
2003-01-02 Paolo Maggi <paolo.maggi@polito.it>
* gedit-plugins-engine.c: fixed bug #102343 (Plugins changes
......
......@@ -315,6 +315,10 @@ gedit_handle_automation_cmdline (GnomeProgram *program)
bonobo_object_release_unref (server, &env);
CORBA_exception_free (&env);
/* we never popup a window, so tell startup-notification that
* we're done */
gdk_notify_startup_complete ();
}
int
......
......@@ -18,9 +18,7 @@ EGG_FILES = \
egg-recent-view-gtk.c \
egg-recent-view-gtk.h \
egg-recent-util.c \
egg-recent-util.h \
egg-recent-vfs-utils.c \
egg-recent-vfs-utils.h
egg-recent-util.h
noinst_LIBRARIES = librecent.a
......
......@@ -25,7 +25,6 @@
#include <libgnomevfs/gnome-vfs.h>
#include <libgnomevfs/gnome-vfs-mime-utils.h>
#include "egg-recent-item.h"
#include "egg-recent-vfs-utils.h"
......@@ -187,7 +186,7 @@ egg_recent_item_set_uri (EggRecentItem *item, const gchar *uri)
/* if G_BROKEN_FILENAMES is not set, this should succede */
if (g_utf8_validate (uri, -1, NULL)) {
item->uri = egg_recent_vfs_make_uri_from_input (uri);
item->uri = gnome_vfs_make_uri_from_input (uri);
} else {
utf8_uri = g_filename_to_utf8 (uri, -1, NULL, NULL, NULL);
......@@ -197,7 +196,7 @@ egg_recent_item_set_uri (EggRecentItem *item, const gchar *uri)
}
if (g_utf8_validate (utf8_uri, -1, NULL)) {
item->uri = egg_recent_vfs_make_uri_from_input (utf8_uri);
item->uri = gnome_vfs_make_uri_from_input (utf8_uri);
} else {
g_free (utf8_uri);
return FALSE;
......@@ -233,7 +232,7 @@ egg_recent_item_get_uri_utf8 (const EggRecentItem *item)
gchar *
egg_recent_item_get_uri_for_display (const EggRecentItem *item)
{
return egg_recent_vfs_format_uri_for_display (item->uri);
return gnome_vfs_format_uri_for_display (item->uri);
}
void
......
......@@ -36,7 +36,6 @@
#include <gconf/gconf-client.h>
#include "egg-recent-model.h"
#include "egg-recent-item.h"
#include "egg-recent-vfs-utils.h"
#define EGG_RECENT_MODEL_FILE_PATH "/.recently-used"
#define EGG_RECENT_MODEL_BUFFER_SIZE 8192
......@@ -261,7 +260,7 @@ egg_recent_model_update_item (GList *items, EggRecentItem *upd_item)
while (tmp) {
EggRecentItem *item = tmp->data;
if (egg_recent_vfs_uris_match (egg_recent_item_peek_uri (item), uri)) {
if (gnome_vfs_uris_match (egg_recent_item_peek_uri (item), uri)) {
egg_recent_item_set_timestamp (item, (time_t) -1);
egg_recent_model_add_new_groups (item, upd_item);
......@@ -559,7 +558,7 @@ egg_recent_model_filter (EggRecentModel *model,
model->priv->scheme_filter_values != NULL) {
gchar *scheme;
scheme = egg_recent_vfs_get_uri_scheme (uri);
scheme = gnome_vfs_get_uri_scheme (uri);
if (egg_recent_model_string_match
(model->priv->scheme_filter_values, scheme))
......
......@@ -343,8 +343,10 @@ egg_recent_view_bonobo_set_model (EggRecentView *view_parent, EggRecentModel *mo
view->model = model;
g_object_ref (view->model);
view->changed_cb_id = g_signal_connect (G_OBJECT (model), "changed",
G_CALLBACK (model_changed_cb), view);
view->changed_cb_id = g_signal_connect_object (G_OBJECT (model),
"changed",
G_CALLBACK (model_changed_cb),
view, 0);
egg_recent_model_changed (view->model);
}
......@@ -518,8 +520,8 @@ egg_recent_view_bonobo_init (EggRecentViewBonobo *view)
view->uid = egg_recent_util_get_unique_id ();
#ifndef USE_STABLE_LIBGNOMEUI
view->theme = gnome_icon_theme_new ();
g_signal_connect (view->theme, "changed",
G_CALLBACK (theme_changed_cb), view);
g_signal_connect_object (view->theme, "changed",
G_CALLBACK (theme_changed_cb), view, 0);
#endif
view->client = gconf_client_get_default ();
......
......@@ -372,8 +372,10 @@ egg_recent_view_gtk_set_model (EggRecentView *view_parent,
view->model = model;
g_object_ref (view->model);
view->changed_cb_id = g_signal_connect (G_OBJECT (model), "changed",
G_CALLBACK (model_changed_cb), view);
view->changed_cb_id = g_signal_connect_object (G_OBJECT (model),
"changed",
G_CALLBACK (model_changed_cb),
view, 0);
egg_recent_model_changed (view->model);
}
......@@ -592,8 +594,8 @@ egg_recent_view_gtk_init (EggRecentViewGtk * view)
view->uid = egg_recent_util_get_unique_id ();
#ifndef USE_STABLE_LIBGNOMEUI
view->theme = gnome_icon_theme_new ();
g_signal_connect (view->theme, "changed",
G_CALLBACK (theme_changed_cb), view);
g_signal_connect_object (view->theme, "changed",
G_CALLBACK (theme_changed_cb), view, 0);
#endif
view->tooltips = gtk_tooltips_new ();
g_object_ref (view->tooltips);
......
2003-01-04 James Willcox <jwillcox@gnome.org>
* recent-files/Makefile.am:
* recent-files/egg-recent-item.c: (egg_recent_item_set_uri),
(egg_recent_item_get_uri_for_display):
* recent-files/egg-recent-model.c: (egg_recent_model_update_item),
(egg_recent_model_filter):
* recent-files/egg-recent-view-bonobo.c:
(egg_recent_view_bonobo_set_model), (egg_recent_view_bonobo_init):
* recent-files/egg-recent-view-gtk.c:
(egg_recent_view_gtk_set_model), (egg_recent_view_gtk_init):
Update to latest recent-files stuff in libegg. This fixes a crasher
bug.
2003-01-03 James Willcox <jwillcox@gnome.org>
* gedit2.c: (gedit_handle_automation_cmdline):
Tell the startup-notification stuff that we are all done.
2003-01-02 Paolo Maggi <paolo.maggi@polito.it>
* gedit-plugins-engine.c: fixed bug #102343 (Plugins changes
......
......@@ -315,6 +315,10 @@ gedit_handle_automation_cmdline (GnomeProgram *program)
bonobo_object_release_unref (server, &env);
CORBA_exception_free (&env);
/* we never popup a window, so tell startup-notification that
* we're done */
gdk_notify_startup_complete ();
}
int
......
......@@ -18,9 +18,7 @@ EGG_FILES = \
egg-recent-view-gtk.c \
egg-recent-view-gtk.h \
egg-recent-util.c \
egg-recent-util.h \
egg-recent-vfs-utils.c \
egg-recent-vfs-utils.h
egg-recent-util.h
noinst_LIBRARIES = librecent.a
......
......@@ -25,7 +25,6 @@
#include <libgnomevfs/gnome-vfs.h>
#include <libgnomevfs/gnome-vfs-mime-utils.h>
#include "egg-recent-item.h"
#include "egg-recent-vfs-utils.h"
......@@ -187,7 +186,7 @@ egg_recent_item_set_uri (EggRecentItem *item, const gchar *uri)
/* if G_BROKEN_FILENAMES is not set, this should succede */
if (g_utf8_validate (uri, -1, NULL)) {
item->uri = egg_recent_vfs_make_uri_from_input (uri);
item->uri = gnome_vfs_make_uri_from_input (uri);
} else {
utf8_uri = g_filename_to_utf8 (uri, -1, NULL, NULL, NULL);
......@@ -197,7 +196,7 @@ egg_recent_item_set_uri (EggRecentItem *item, const gchar *uri)
}
if (g_utf8_validate (utf8_uri, -1, NULL)) {
item->uri = egg_recent_vfs_make_uri_from_input (utf8_uri);
item->uri = gnome_vfs_make_uri_from_input (utf8_uri);
} else {
g_free (utf8_uri);
return FALSE;
......@@ -233,7 +232,7 @@ egg_recent_item_get_uri_utf8 (const EggRecentItem *item)
gchar *
egg_recent_item_get_uri_for_display (const EggRecentItem *item)
{
return egg_recent_vfs_format_uri_for_display (item->uri);
return gnome_vfs_format_uri_for_display (item->uri);
}
void
......
......@@ -36,7 +36,6 @@
#include <gconf/gconf-client.h>
#include "egg-recent-model.h"
#include "egg-recent-item.h"
#include "egg-recent-vfs-utils.h"
#define EGG_RECENT_MODEL_FILE_PATH "/.recently-used"
#define EGG_RECENT_MODEL_BUFFER_SIZE 8192
......@@ -261,7 +260,7 @@ egg_recent_model_update_item (GList *items, EggRecentItem *upd_item)
while (tmp) {
EggRecentItem *item = tmp->data;
if (egg_recent_vfs_uris_match (egg_recent_item_peek_uri (item), uri)) {
if (gnome_vfs_uris_match (egg_recent_item_peek_uri (item), uri)) {
egg_recent_item_set_timestamp (item, (time_t) -1);
egg_recent_model_add_new_groups (item, upd_item);
......@@ -559,7 +558,7 @@ egg_recent_model_filter (EggRecentModel *model,
model->priv->scheme_filter_values != NULL) {
gchar *scheme;
scheme = egg_recent_vfs_get_uri_scheme (uri);
scheme = gnome_vfs_get_uri_scheme (uri);
if (egg_recent_model_string_match
(model->priv->scheme_filter_values, scheme))
......
......@@ -343,8 +343,10 @@ egg_recent_view_bonobo_set_model (EggRecentView *view_parent, EggRecentModel *mo
view->model = model;
g_object_ref (view->model);
view->changed_cb_id = g_signal_connect (G_OBJECT (model), "changed",
G_CALLBACK (model_changed_cb), view);
view->changed_cb_id = g_signal_connect_object (G_OBJECT (model),
"changed",
G_CALLBACK (model_changed_cb),
view, 0);
egg_recent_model_changed (view->model);
}
......@@ -518,8 +520,8 @@ egg_recent_view_bonobo_init (EggRecentViewBonobo *view)
view->uid = egg_recent_util_get_unique_id ();
#ifndef USE_STABLE_LIBGNOMEUI
view->theme = gnome_icon_theme_new ();
g_signal_connect (view->theme, "changed",
G_CALLBACK (theme_changed_cb), view);
g_signal_connect_object (view->theme, "changed",
G_CALLBACK (theme_changed_cb), view, 0);
#endif
view->client = gconf_client_get_default ();
......
......@@ -372,8 +372,10 @@ egg_recent_view_gtk_set_model (EggRecentView *view_parent,
view->model = model;
g_object_ref (view->model);
view->changed_cb_id = g_signal_connect (G_OBJECT (model), "changed",
G_CALLBACK (model_changed_cb), view);
view->changed_cb_id = g_signal_connect_object (G_OBJECT (model),
"changed",
G_CALLBACK (model_changed_cb),
view, 0);
egg_recent_model_changed (view->model);
}
......@@ -592,8 +594,8 @@ egg_recent_view_gtk_init (EggRecentViewGtk * view)
view->uid = egg_recent_util_get_unique_id ();
#ifndef USE_STABLE_LIBGNOMEUI
view->theme = gnome_icon_theme_new ();
g_signal_connect (view->theme, "changed",
G_CALLBACK (theme_changed_cb), view);
g_signal_connect_object (view->theme, "changed",
G_CALLBACK (theme_changed_cb), view, 0);
#endif
view->tooltips = gtk_tooltips_new ();
g_object_ref (view->tooltips);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment