aboutsummaryrefslogtreecommitdiff
path: root/print/xfce4-print/files/patch-xfprint::main.c
blob: 900a89423c5f49e61a5342656ccd37b812b8a43d (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
--- xfprint/main.c.orig	Wed Apr 13 23:55:06 2005
+++ xfprint/main.c	Wed Apr 13 23:55:07 2005
@@ -87,22 +87,17 @@
     mcs_client_add_channel (client, CHANNEL);
 
     if (mcs_client_get_setting (client, "XfPrint/system", CHANNEL, &setting) == MCS_SUCCESS) {
-      if (!load_printing_system (setting->data.v_string))
-        g_error ("Unable to load printing system module %s", setting->data.v_string);
+      if (!load_printing_system (setting->data.v_string) && strncmp(setting->data.v_string,"file_plugin.so",14) == 0) {
+        g_print ("Configure your printing system using the Xfce Settings Manager first\n");
+        exit (EXIT_FAILURE);
+      } else if (!load_printing_system (setting->data.v_string) ) {
+          g_error ("Unable to load printing system module %s", setting->data.v_string);
+      }
       mcs_setting_free (setting);
     }
     else {
-      gchar *default_system = NULL;
-
-      g_warning ("No mcs-setting found for XfPrint/system in channel %s, using default printing-system", CHANNEL);
-
-      default_system = g_build_filename (PLUGIN_DIR, "file_plugin.so", NULL);
-
-      if (!load_printing_system (default_system)) {
-        g_error ("Unable to load default printing system module %s", default_system);
-      }
-
-      g_free (default_system);
+        g_print ("Configure your printing system using the Xfce Settings Manager first\n");      
+        exit (EXIT_FAILURE);
     }
 
     mcs_client_destroy (client);