Index: configure.ac =================================================================== RCS file: /cvs/gnome/gedit/configure.ac,v retrieving revision 1.32 diff -u -p -r1.32 configure.ac --- configure.ac 19 May 2006 10:12:54 -0000 1.32 +++ configure.ac 31 May 2006 12:30:11 -0000 @@ -81,7 +81,7 @@ dnl ==================================== PKG_CHECK_MODULES(GEDIT, [ glib-2.0 >= 2.8.0 gtk+-2.0 >= 2.8.0 - gtksourceview-1.0 >= 1.2.0 + gtksourceview-2.0 >= 2.0.0 libgnomeui-2.0 >= 2.13.0 libglade-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.6.0 Index: gedit/Makefile.am =================================================================== RCS file: /cvs/gnome/gedit/gedit/Makefile.am,v retrieving revision 1.117 diff -u -p -r1.117 Makefile.am --- gedit/Makefile.am 20 May 2006 16:55:59 -0000 1.117 +++ gedit/Makefile.am 31 May 2006 12:30:11 -0000 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in SUBDIRS = dialogs recent-files -bin_PROGRAMS = gedit +bin_PROGRAMS = gedit2 noinst_LTLIBRARIES = libgedit.la @@ -27,10 +27,10 @@ INCLUDES += \ $(AM_CFLAGS) endif -gedit_SOURCES = gedit.c -gedit_LDADD = libgedit.la $(GEDIT_LIBS) +gedit2_SOURCES = gedit.c +gedit2_LDADD = libgedit.la $(GEDIT_LIBS) -gedit_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" +gedit2_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" libgedit_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" @@ -90,8 +90,6 @@ INST_H_FILES = \ gedit-plugin.h \ gedit-prefs-manager-app.h \ gedit-prefs-manager.h \ - gedit-print.h \ - gedit-print-job-preview.h \ gedit-progress-message-area.h \ gedit-recent.h \ gedit-statusbar.h \ @@ -139,7 +137,6 @@ libgedit_la_SOURCES = \ gedit-prefs-manager-app.c \ gedit-prefs-manager.c \ gedit-prefs-manager-private.h \ - gedit-print.c \ gedit-print-job-preview.c \ gedit-progress-message-area.c \ gedit-recent.c \ Index: gedit/gedit-commands-file-print.c =================================================================== RCS file: /cvs/gnome/gedit/gedit/gedit-commands-file-print.c,v retrieving revision 1.2 diff -u -p -r1.2 gedit-commands-file-print.c --- gedit/gedit-commands-file-print.c 12 Dec 2005 17:27:55 -0000 1.2 +++ gedit/gedit-commands-file-print.c 31 May 2006 12:30:11 -0000 @@ -48,144 +48,17 @@ void gedit_cmd_file_page_setup (GtkAction *action, GeditWindow *window) { - gedit_debug (DEBUG_COMMANDS); - - gedit_show_page_setup_dialog (GTK_WINDOW (window)); } void gedit_cmd_file_print_preview (GtkAction *action, GeditWindow *window) { - GeditDocument *doc; - GeditTab *tab; - GeditPrintJob *pjob; - GtkTextIter start; - GtkTextIter end; - - gedit_debug (DEBUG_COMMANDS); - - tab = gedit_window_get_active_tab (window); - if (tab == NULL) - return; - - doc = gedit_tab_get_document (tab); - - pjob = gedit_print_job_new (doc); - - gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (doc) , &start, &end); - - _gedit_tab_print_preview (tab, pjob, &start, &end); - g_object_unref (pjob); -} - -static void -print_dialog_response_cb (GtkWidget *dialog, - gint response, - GeditPrintJob *pjob) -{ - GtkTextIter start; - GtkTextIter end; - gint line_start; - gint line_end; - GnomePrintRangeType range_type; - GtkTextBuffer *buffer; - GeditTab *tab; - - gedit_debug (DEBUG_COMMANDS); - - range_type = gnome_print_dialog_get_range (GNOME_PRINT_DIALOG (dialog)); - - buffer = GTK_TEXT_BUFFER ( - gtk_source_print_job_get_buffer (GTK_SOURCE_PRINT_JOB (pjob))); - - gtk_text_buffer_get_bounds (buffer, &start, &end); - - tab = gedit_tab_get_from_document (GEDIT_DOCUMENT (buffer)); - - switch (range_type) - { - case GNOME_PRINT_RANGE_ALL: - break; - - case GNOME_PRINT_RANGE_SELECTION: - gtk_text_buffer_get_selection_bounds (buffer, - &start, - &end); - break; - - case GNOME_PRINT_RANGE_RANGE: - gnome_print_dialog_get_range_page (GNOME_PRINT_DIALOG (dialog), - &line_start, - &line_end); - - gtk_text_iter_set_line (&start, line_start - 1); - gtk_text_iter_set_line (&end, line_end - 1); - - gtk_text_iter_forward_to_line_end (&end); - - break; - - default: - g_return_if_reached (); - } - - switch (response) - { - case GNOME_PRINT_DIALOG_RESPONSE_PRINT: - gedit_debug_message (DEBUG_PRINT, - "Print button pressed."); - - _gedit_tab_print (tab, pjob, &start, &end); - - break; - - case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW: - gedit_debug_message (DEBUG_PRINT, - "Preview button pressed."); - - _gedit_tab_print_preview (tab, pjob, &start, &end); - - break; - } - - g_object_unref (pjob); - gtk_widget_destroy (dialog); } void gedit_cmd_file_print (GtkAction *action, GeditWindow *window) { - GeditDocument *doc; - GeditPrintJob *pjob; - GtkWidget *print_dialog; - GtkWindowGroup *wg; - - gedit_debug (DEBUG_COMMANDS); - - doc = gedit_window_get_active_document (window); - if (doc == NULL) - return; - - pjob = gedit_print_job_new (doc); - - print_dialog = gedit_print_dialog_new (pjob); - - wg = gedit_window_get_group (window); - - gtk_window_group_add_window (wg, - GTK_WINDOW (print_dialog)); - - gtk_window_set_transient_for (GTK_WINDOW (print_dialog), - GTK_WINDOW (window)); - gtk_window_set_modal (GTK_WINDOW (print_dialog), TRUE); - - g_signal_connect (print_dialog, - "response", - G_CALLBACK (print_dialog_response_cb), - pjob); - - gtk_widget_show (print_dialog); } Index: gedit/gedit-print.h =================================================================== RCS file: /cvs/gnome/gedit/gedit/gedit-print.h,v retrieving revision 1.9 diff -u -p -r1.9 gedit-print.h --- gedit/gedit-print.h 12 Dec 2005 17:27:55 -0000 1.9 +++ gedit/gedit-print.h 31 May 2006 12:30:11 -0000 @@ -33,7 +33,7 @@ #define __GEDIT_PRINT_H__ #include -#include +//#include #include G_BEGIN_DECLS @@ -56,7 +56,8 @@ typedef struct _GeditPrintJob GeditPrint struct _GeditPrintJob { - GtkSourcePrintJob parent; + GObject a; +// GtkSourcePrintJob parent; }; /* @@ -66,22 +67,23 @@ typedef struct _GeditPrintJobClass Gedit struct _GeditPrintJobClass { - GtkSourcePrintJobClass parent_class; + GObjectClass a; +// GtkSourcePrintJobClass parent_class; }; /* * Public methods */ -GType gedit_print_job_get_type (void) G_GNUC_CONST; +GType gedit_print_job_get_type (void) {return 87625;} -GeditPrintJob *gedit_print_job_new (GeditDocument *doc); +GeditPrintJob *gedit_print_job_new (GeditDocument *doc) {return NULL;} -void gedit_print_job_save_config (GeditPrintJob *job); +void gedit_print_job_save_config (GeditPrintJob *job) {}; /* GeditPrintDialog (it is a GnomePrintDialog) */ -GtkWidget *gedit_print_dialog_new (GeditPrintJob *job); +GtkWidget *gedit_print_dialog_new (GeditPrintJob *job) {return NULL;}; G_END_DECLS Index: gedit/gedit-tab.c =================================================================== RCS file: /cvs/gnome/gedit/gedit/gedit-tab.c,v retrieving revision 1.11 diff -u -p -r1.11 gedit-tab.c --- gedit/gedit-tab.c 20 Apr 2006 17:01:13 -0000 1.11 +++ gedit/gedit-tab.c 31 May 2006 12:30:13 -0000 @@ -63,7 +63,7 @@ struct _GeditTabPrivate GtkWidget *message_area; GtkWidget *print_preview; - GeditPrintJob *print_job; +// GeditPrintJob *print_job; /* tmp data for saving */ gchar *tmp_save_uri; @@ -227,7 +227,8 @@ static void gedit_tab_finalize (GObject *object) { GeditTab *tab = GEDIT_TAB (object); - + +#if 0 if (tab->priv->print_job != NULL) { gedit_debug_message (DEBUG_TAB, "Cancelling printing"); @@ -235,7 +236,7 @@ gedit_tab_finalize (GObject *object) gtk_source_print_job_cancel (GTK_SOURCE_PRINT_JOB (tab->priv->print_job)); g_object_unref (tab->priv->print_job); } - +#endif if (tab->priv->timer != NULL) g_timer_destroy (tab->priv->timer); @@ -1991,9 +1992,9 @@ set_print_preview (GeditTab *tab, GtkWi #define MIN_PAGES 15 static void -print_page_cb (GtkSourcePrintJob *pjob, GeditTab *tab) +print_page_cb (void *pjob, GeditTab *tab) { - gchar *str; +/* gchar *str; gint page_num; gint total; @@ -2018,11 +2019,13 @@ print_page_cb (GtkSourcePrintJob *pjob, gedit_progress_message_area_set_fraction (GEDIT_PROGRESS_MESSAGE_AREA (tab->priv->message_area), 1.0 * page_num / total); +*/ } static void -preview_finished_cb (GtkSourcePrintJob *pjob, GeditTab *tab) +preview_finished_cb (void *pjob, GeditTab *tab) { +#if 0 GnomePrintJob *gjob; GtkWidget *preview = NULL; @@ -2040,11 +2043,13 @@ preview_finished_cb (GtkSourcePrintJob * g_object_unref (pjob); gedit_tab_set_state (tab, GEDIT_TAB_STATE_SHOWING_PRINT_PREVIEW); +#endif } static void -print_finished_cb (GtkSourcePrintJob *pjob, GeditTab *tab) +print_finished_cb (void *pjob, GeditTab *tab) { +#if 0 GnomePrintJob *gjob; g_return_if_fail (GEDIT_IS_PROGRESS_MESSAGE_AREA (tab->priv->message_area)); @@ -2060,6 +2065,7 @@ print_finished_cb (GtkSourcePrintJob *pj g_object_unref (pjob); gedit_tab_set_state (tab, GEDIT_TAB_STATE_NORMAL); +#endif } static void @@ -2069,8 +2075,8 @@ print_cancelled (GeditMessageArea *area, { g_return_if_fail (GEDIT_IS_PROGRESS_MESSAGE_AREA (tab->priv->message_area)); - gtk_source_print_job_cancel (GTK_SOURCE_PRINT_JOB (tab->priv->print_job)); - g_object_unref (tab->priv->print_job); +// gtk_source_print_job_cancel (GTK_SOURCE_PRINT_JOB (tab->priv->print_job)); +// g_object_unref (tab->priv->print_job); set_message_area (tab, NULL); /* destroy the message area */ @@ -2103,10 +2109,11 @@ show_printing_message_area (GeditTab void _gedit_tab_print (GeditTab *tab, - GeditPrintJob *pjob, + void *pjob, GtkTextIter *start, GtkTextIter *end) { +#if 0 GeditDocument *doc; g_return_if_fail (GEDIT_IS_TAB (tab)); @@ -2144,14 +2151,16 @@ _gedit_tab_print (GeditTab *tab, g_warning ("Async print preview failed"); g_object_unref (pjob); } +#endif } void _gedit_tab_print_preview (GeditTab *tab, - GeditPrintJob *pjob, + void *pjob, GtkTextIter *start, GtkTextIter *end) { +#if 0 GeditDocument *doc; g_return_if_fail (GEDIT_IS_TAB (tab)); @@ -2187,6 +2196,7 @@ _gedit_tab_print_preview (GeditTab g_warning ("Async print preview failed"); g_object_unref (pjob); } +#endif } void Index: gedit/gedit-tab.h =================================================================== RCS file: /cvs/gnome/gedit/gedit/gedit-tab.h,v retrieving revision 1.4 diff -u -p -r1.4 gedit-tab.h --- gedit/gedit-tab.h 19 Feb 2006 18:01:09 -0000 1.4 +++ gedit/gedit-tab.h 31 May 2006 12:30:13 -0000 @@ -35,7 +35,6 @@ #include #include -#include G_BEGIN_DECLS @@ -147,11 +146,11 @@ void _gedit_tab_save_as (GeditTab const gchar *uri, const GeditEncoding *encoding); void _gedit_tab_print (GeditTab *tab, - GeditPrintJob *pjob, + void *pjob, GtkTextIter *start, GtkTextIter *end); void _gedit_tab_print_preview (GeditTab *tab, - GeditPrintJob *pjob, + void *pjob, GtkTextIter *start, GtkTextIter *end); void _gedit_tab_mark_for_closing (GeditTab *tab); Index: gedit/gedit.c =================================================================== RCS file: /cvs/gnome/gedit/gedit/gedit.c,v retrieving revision 1.139 diff -u -p -r1.139 gedit.c --- gedit/gedit.c 18 May 2006 22:55:17 -0000 1.139 +++ gedit/gedit.c 31 May 2006 12:30:13 -0000 @@ -463,7 +463,7 @@ main (int argc, char *argv[]) gedit_debug_message (DEBUG_APP, "Create bacon connection"); - connection = bacon_message_connection_new ("gedit"); + connection = bacon_message_connection_new ("gedit-gsv2"); if (connection != NULL) {