diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-06-19 03:52:10 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-06-19 03:52:10 +0000 |
| commit | e6cdab1bfc10eb334ac5a8b5a4696c19dbcba1e0 (patch) | |
| tree | 2b3524ba2013a27d2d65181f785e51eeb975ae21 | |
| parent | b57f1571de1bd09e849ec44e2c9823c1c6c42fc8 (diff) | |
| download | gtk+-e6cdab1bfc10eb334ac5a8b5a4696c19dbcba1e0.tar.gz | |
Don't open a display connection.
2006-06-18 Matthias Clasen <mclasen@redhat.com>
* tests/testnouiprint.c (main): Don't open a display connection.
* gtk/gtkprintbackend.c (gtk_print_backend_load_modules): Make
this work without a display connection. (339702, Alexander Larsson)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | gtk/gtkprintbackend.c | 6 | ||||
| -rw-r--r-- | tests/testnouiprint.c | 8 |
4 files changed, 16 insertions, 8 deletions
@@ -1,5 +1,10 @@ 2006-06-18 Matthias Clasen <mclasen@redhat.com> + * tests/testnouiprint.c (main): Don't open a display connection. + + * gtk/gtkprintbackend.c (gtk_print_backend_load_modules): Make + this work without a display connection. (339702, Alexander Larsson) + * gtk/gtkwindow.c (gtk_window_move): Small doc addition. (#345275, Behdad Esfahbod) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 01f174a2d0..69affb2a02 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2006-06-18 Matthias Clasen <mclasen@redhat.com> + * tests/testnouiprint.c (main): Don't open a display connection. + + * gtk/gtkprintbackend.c (gtk_print_backend_load_modules): Make + this work without a display connection. (339702, Alexander Larsson) + * gtk/gtkwindow.c (gtk_window_move): Small doc addition. (#345275, Behdad Esfahbod) diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c index a70582b7a1..613d88d4be 100644 --- a/gtk/gtkprintbackend.c +++ b/gtk/gtkprintbackend.c @@ -284,8 +284,10 @@ gtk_print_backend_load_modules (void) gtk_print_backend_initialize (); settings = gtk_settings_get_default (); - - g_object_get (settings, "gtk-print-backends", &setting, NULL); + if (settings) + g_object_get (settings, "gtk-print-backends", &setting, NULL); + else + setting = g_strdup (GTK_PRINT_BACKENDS); backends = g_strsplit (setting, ",", -1); diff --git a/tests/testnouiprint.c b/tests/testnouiprint.c index 585c5ddbec..1c39ae9a7c 100644 --- a/tests/testnouiprint.c +++ b/tests/testnouiprint.c @@ -84,12 +84,8 @@ main (int argc, char **argv) GtkPrintOperationResult res; GtkPrintSettings *settings; - - /* Unfortunately we need a display for the XSettings to get the - list of backends... */ - /* gtk_parse_args (&argc, &argv); */ - gtk_init (&argc, &argv); - + g_type_init (); + loop = g_main_loop_new (NULL, TRUE); settings = gtk_print_settings_new (); |