← Back to branch summary

~ubuntu-branches/ubuntu/lucid/x11-apps/lucid

« back to all changes in this revision

Viewing changes to debian/patches/06_xclock_geometry.diff

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau
  • Date: 2008-09-23 00:24:45 UTC
  • mfrom: (1.1.2 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080923002445-mb2rwkif45zz1vlj
Tags: 7.3+4
http://bugs.debian.org/321434
* Remove xedit from the package, it's unmaintained and broken
  (closes: #321434).
* Remove xedit's conffiles on upgrade.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/06_xclock_geometry.diff
 
1
From upstream commits 870ebb6762f63c6587ee75aba50ee93257fa610b and
 
2
8c6739ba1179337c7f8fa25680871e0813ef5181.
 
3
 
 
4
Index: x11-apps-7.3+1.0/xclock/Clock.c
 
5
===================================================================
 
6
--- x11-apps-7.3+1.0.orig/xclock/Clock.c        2008-05-12 19:43:06.000000000 -0400
 
7
+++ x11-apps-7.3+1.0/xclock/Clock.c     2008-05-12 20:29:19.000000000 -0400
 
8
@@ -656,46 +656,48 @@
 
9
                     2 * w->clock.padding;
 
10
        }
 
11
        else
 
12
+       {
 
13
 #endif
 
14
 #ifndef NO_I18N 
 
15
-       if (!no_locale) {
 
16
-          XFontSetExtents *fse;
 
17
+         if (!no_locale) {
 
18
+             XFontSetExtents *fse;
 
19
 
 
20
-          if(w->clock.fontSet == NULL) {
 
21
-              char **missing, *default_str;
 
22
-              int n_missing;
 
23
-              w->clock.fontSet = XCreateFontSet( XtDisplay(w),
 
24
-                XtDefaultFontSet,
 
25
-                &missing,
 
26
-                &n_missing,
 
27
-                &default_str);
 
28
-          }
 
29
-          if (w->clock.fontSet != NULL)
 
30
-          {
 
31
-              /* don't free this... it's freed with the XFontSet. */
 
32
-              fse = XExtentsOfFontSet(w->clock.fontSet);
 
33
-              
 
34
-              min_width = XmbTextEscapement(w->clock.fontSet,str,
 
35
-                len)
 
36
-                + 2 * w->clock.padding;
 
37
-              min_height = fse->max_logical_extent.height +
 
38
-                3 * w->clock.padding;
 
39
-          } else {
 
40
-              no_locale = True;
 
41
-          }
 
42
-       }
 
43
+             if(w->clock.fontSet == NULL) {
 
44
+                 char **missing, *default_str;
 
45
+                 int n_missing;
 
46
+                 w->clock.fontSet = XCreateFontSet( XtDisplay(w),
 
47
+                   XtDefaultFontSet,
 
48
+                   &missing,
 
49
+                   &n_missing,
 
50
+                   &default_str);
 
51
+             }
 
52
+             if (w->clock.fontSet != NULL)
 
53
+             {
 
54
+                 /* don't free this... it's freed with the XFontSet. */
 
55
+                 fse = XExtentsOfFontSet(w->clock.fontSet);
 
56
+
 
57
+                 min_width = XmbTextEscapement(w->clock.fontSet,str,
 
58
+                   len)
 
59
+                   + 2 * w->clock.padding;
 
60
+                 min_height = fse->max_logical_extent.height +
 
61
+                   3 * w->clock.padding;
 
62
+             } else {
 
63
+                 no_locale = True;
 
64
+             }
 
65
+         }
 
66
 
 
67
-       if (!no_locale)
 
68
-#endif /* NO_I18N */
 
69
-       {
 
70
-          if (w->clock.font == NULL)
 
71
-              w->clock.font = XQueryFont( XtDisplay(w),
 
72
-                                          XGContextFromGC(
 
73
-                                           DefaultGCOfScreen(XtScreen(w))) );
 
74
-          min_width = XTextWidth(w->clock.font, str, len) +
 
75
-              2 * w->clock.padding;
 
76
-          min_height = w->clock.font->ascent +
 
77
-              w->clock.font->descent + 2 * w->clock.padding;
 
78
+         if (no_locale)
 
79
+   #endif /* NO_I18N */
 
80
+         {
 
81
+             if (w->clock.font == NULL)
 
82
+                 w->clock.font = XQueryFont( XtDisplay(w),
 
83
+                                             XGContextFromGC(
 
84
+                                              DefaultGCOfScreen(XtScreen(w))) );
 
85
+             min_width = XTextWidth(w->clock.font, str, len) +
 
86
+                 2 * w->clock.padding;
 
87
+             min_height = w->clock.font->ascent +
 
88
+                 w->clock.font->descent + 2 * w->clock.padding;
 
89
+         }
 
90
        }
 
91
     }
 
92
     if (w->core.width == 0)