reuse window for the same image when opening application. Fixes bug

2007-08-27  Lucas Rocha  <lucasr@gnome.org>

	* src/eog-application.c (eog_application_get_uri_window,
	eog_application_real_open_uri_list): reuse window for the same image 
	when opening application. Fixes bug #311308.
	* src/eog-window.c (eog_window_get_uri), bindings/python/eog.defs: 
	removed useless method.

svn path=/trunk/; revision=4002
This commit is contained in:
Lucas Rocha 2007-08-27 18:43:54 +00:00 committed by Lucas Almeida Rocha
parent 5621e5513a
commit 036f73d153
5 changed files with 15 additions and 21 deletions

View file

@ -1,3 +1,11 @@
2007-08-27 Lucas Rocha <lucasr@gnome.org>
* src/eog-application.c (eog_application_get_uri_window,
eog_application_real_open_uri_list): reuse window for the same image
when opening application. Fixes bug #311308.
* src/eog-window.c (eog_window_get_uri), bindings/python/eog.defs:
removed useless method.
2007-08-27 Lucas Rocha <lucasr@gnome.org>
* src/eog-plugin-manager.c (eog_plugin_manager_init): make plugin list

View file

@ -1292,12 +1292,6 @@
(return-type "EogImage*")
)
(define-method get_uri
(of-object "EogWindow")
(c-name "eog_window_get_uri")
(return-type "const-char*")
)
(define-method open_uri_list
(of-object "EogWindow")
(c-name "eog_window_open_uri_list")

View file

@ -198,9 +198,8 @@ eog_application_open_window (EogApplication *application,
return TRUE;
}
#if 0
static EogWindow *
eog_application_get_uri_window (EogApplication *application, const char *uri)
eog_application_get_uri_window (EogApplication *application, GnomeVFSURI *uri)
{
EogWindow *uri_window = NULL;
GList *windows;
@ -214,10 +213,11 @@ eog_application_get_uri_window (EogApplication *application, const char *uri)
for (l = windows; l != NULL; l = l->next) {
if (EOG_IS_WINDOW (l->data)) {
EogWindow *window = EOG_WINDOW (l->data);
const char *window_uri = eog_window_get_uri (window);
EogImage *image = eog_window_get_image (window);
GnomeVFSURI *window_uri = eog_image_get_uri (image);
if (window_uri && strcmp (window_uri, uri) == 0 &&
!eog_window_is_empty (window)) {
if (!eog_window_is_empty (window) &&
gnome_vfs_uri_equal (window_uri, uri)) {
uri_window = window;
break;
}
@ -228,7 +228,6 @@ eog_application_get_uri_window (EogApplication *application, const char *uri)
return uri_window;
}
#endif
static void
eog_application_show_window (EogWindow *window, gpointer user_data)
@ -250,7 +249,8 @@ eog_application_real_open_uri_list (EogApplication *application,
{
EogWindow *new_window = NULL;
//new_window = eog_application_get_uri_window (application, (const char *) uri_list->data);
new_window = eog_application_get_uri_window (application,
(GnomeVFSURI *) uri_list->data);
if (new_window != NULL) {
gtk_window_present_with_time (GTK_WINDOW (new_window),

View file

@ -4501,12 +4501,6 @@ eog_window_new (EogStartupFlags flags)
return GTK_WIDGET (window);
}
const char*
eog_window_get_uri (EogWindow *window)
{
return NULL;
}
static void
eog_window_list_store_image_added (GtkTreeModel *tree_model,
GtkTreePath *path,

View file

@ -102,8 +102,6 @@ GtkWidget *eog_window_get_statusbar (EogWindow *window);
EogImage *eog_window_get_image (EogWindow *window);
const char *eog_window_get_uri (EogWindow *window);
void eog_window_open_uri_list (EogWindow *window,
GSList *uri_list);