← Back to branch summary

~ubuntu-branches/ubuntu/lucid/quick-lounge-applet/lucid

« back to all changes in this revision

Viewing changes to debian/patches/01-rows.patch

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Rottmann
  • Date: 2004-12-16 13:06:08 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20041216130608-i7tq2h21kzrdy4yl
Tags: 2.2.0-1
* New upstream release.
* Build-Depend on debhelper (>= 4.1.0), fixes linda error.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01-rows.patch
1
 
diff -ruN quick-lounge-applet-2.1.1.orig/src/dlg-properties.c quick-lounge-applet-2.1.1/src/dlg-properties.c
2
 
--- quick-lounge-applet-2.1.1.orig/src/dlg-properties.c 2004-03-30 19:31:54.000000000 +0200
3
 
+++ quick-lounge-applet-2.1.1/src/dlg-properties.c      2004-04-27 10:47:04.000000000 +0200
 
1
diff -ruN quick-lounge-applet-2.2.0.orig/src/dlg-properties.c quick-lounge-applet-2.2.0/src/dlg-properties.c
 
2
--- quick-lounge-applet-2.2.0.orig/src/dlg-properties.c 2004-10-13 14:52:34.000000000 +0000
 
3
+++ quick-lounge-applet-2.2.0/src/dlg-properties.c      2004-12-16 11:55:41.000000000 +0000
4
4
@@ -98,7 +98,7 @@
5
5
 
6
6
        GtkWidget     *p_minsize_spinbutton;
10
10
 
11
11
        int            n;
12
12
        GtkTreeModel  *model;
13
 
@@ -686,10 +686,10 @@
 
13
@@ -689,10 +689,10 @@
14
14
 
15
15
 
16
16
 static void
24
24
 }
25
25
 
26
26
 
27
 
@@ -1014,7 +1014,7 @@
 
27
@@ -1016,7 +1016,7 @@
28
28
 
29
29
        data->p_minsize_spinbutton = glade_xml_get_widget (data->gui, "p_minsize_spinbutton");
30
30
        data->p_maxsize_spinbutton = glade_xml_get_widget (data->gui, "p_maxsize_spinbutton");
33
33
 
34
34
        btn_close = glade_xml_get_widget (data->gui, "p_close_button");
35
35
        btn_help = glade_xml_get_widget (data->gui, "p_help_button");
36
 
@@ -1034,7 +1034,7 @@
 
36
@@ -1036,7 +1036,7 @@
37
37
 
38
38
        gtk_spin_button_set_value (GTK_SPIN_BUTTON (data->p_minsize_spinbutton), quick_box_get_min_visible_cols (data->quick_box));
39
39
        gtk_spin_button_set_value (GTK_SPIN_BUTTON (data->p_maxsize_spinbutton), quick_box_get_max_visible_cols (data->quick_box));
42
42
 
43
43
        /* Set the signals handlers. */
44
44
        
45
 
@@ -1102,9 +1102,9 @@
 
45
@@ -1104,9 +1104,9 @@
46
46
                           "value_changed",
47
47
                           G_CALLBACK (max_size_value_changed_cb),
48
48
                          data);
55
55
                          data);
56
56
 
57
57
        /* Drag & Drop */
58
 
diff -ruN quick-lounge-applet-2.1.1.orig/src/quick-box.c quick-lounge-applet-2.1.1/src/quick-box.c
59
 
--- quick-lounge-applet-2.1.1.orig/src/quick-box.c      2004-03-30 19:31:54.000000000 +0200
60
 
+++ quick-lounge-applet-2.1.1/src/quick-box.c   2004-04-27 10:47:04.000000000 +0200
 
58
diff -ruN quick-lounge-applet-2.2.0.orig/src/quick-box.c quick-lounge-applet-2.2.0/src/quick-box.c
 
59
--- quick-lounge-applet-2.2.0.orig/src/quick-box.c      2004-10-13 14:52:34.000000000 +0000
 
60
+++ quick-lounge-applet-2.2.0/src/quick-box.c   2004-12-16 11:55:41.000000000 +0000
61
61
@@ -38,7 +38,7 @@
62
62
 #include "xstuff.h"
63
63
 
75
75
 
76
76
        int                rows;
77
77
        int                columns;
78
 
@@ -508,8 +507,7 @@
 
78
@@ -510,8 +509,7 @@
79
79
 
80
80
        g_return_val_if_fail (quick_box->priv->rows > 0, 0);
81
81
 
85
85
                return quick_box->priv->size;
86
86
 
87
87
        child_size = quick_box->priv->size / quick_box->priv->rows;
88
 
@@ -1270,7 +1268,6 @@
 
88
@@ -1297,7 +1295,6 @@
89
89
 
90
90
        priv = quick_box->priv = g_new0 (QuickBoxPrivate, 1);
91
91
        priv->size                    = ICON_SIZE_PANEL;
93
93
        priv->orient                  = PANEL_APPLET_ORIENT_DOWN;
94
94
        priv->drag_pos                = -1;
95
95
        priv->drag_pos_begin          = -1;
96
 
@@ -1646,10 +1643,6 @@
 
96
@@ -1673,10 +1670,6 @@
97
97
        g_return_if_fail (QUICK_IS_BOX (quick_box));
98
98
 
99
99
        quick_box->priv->size = size;
104
104
 
105
105
        child_size = get_child_size (quick_box);
106
106
 
107
 
@@ -1708,21 +1701,21 @@
 
107
@@ -1735,21 +1728,21 @@
108
108
 
109
109
 
110
110
 void
132
132
 }
133
133
 
134
134
 
135
 
diff -ruN quick-lounge-applet-2.1.1.orig/src/quick-box.h quick-lounge-applet-2.1.1/src/quick-box.h
136
 
--- quick-lounge-applet-2.1.1.orig/src/quick-box.h      2004-03-30 19:31:54.000000000 +0200
137
 
+++ quick-lounge-applet-2.1.1/src/quick-box.h   2004-04-27 10:47:04.000000000 +0200
 
135
diff -ruN quick-lounge-applet-2.2.0.orig/src/quick-box.h quick-lounge-applet-2.2.0/src/quick-box.h
 
136
--- quick-lounge-applet-2.2.0.orig/src/quick-box.h      2004-10-13 14:52:34.000000000 +0000
 
137
+++ quick-lounge-applet-2.2.0/src/quick-box.h   2004-12-16 11:55:41.000000000 +0000
138
138
@@ -77,10 +77,10 @@
139
139
 
140
140
 int                 quick_box_get_max_visible_cols (QuickBox          *qbox);
149
149
 
150
150
 const int *         quick_box_get_size_hint_list   (QuickBox          *qbox,
151
151
                                                    int               *n_elements);
152
 
diff -ruN quick-lounge-applet-2.1.1.orig/src/quick-lounge.c quick-lounge-applet-2.1.1/src/quick-lounge.c
153
 
--- quick-lounge-applet-2.1.1.orig/src/quick-lounge.c   2004-03-30 19:31:54.000000000 +0200
154
 
+++ quick-lounge-applet-2.1.1/src/quick-lounge.c        2004-04-27 10:47:04.000000000 +0200
 
152
diff -ruN quick-lounge-applet-2.2.0.orig/src/quick-lounge.c quick-lounge-applet-2.2.0/src/quick-lounge.c
 
153
--- quick-lounge-applet-2.2.0.orig/src/quick-lounge.c   2004-10-13 14:52:34.000000000 +0000
 
154
+++ quick-lounge-applet-2.2.0/src/quick-lounge.c        2004-12-16 11:55:41.000000000 +0000
155
155
@@ -51,12 +51,13 @@
156
156
 #define PREFS_ORDER                    "order"
157
157
 #define PREFS_MIN_VISIBLE_COLS         "min_size"
167
167
 
168
168
 #define ERROR_FORMAT "<span size=\"large\" weight=\"bold\">%s</span>\n\n%s"
169
169
 
170
 
@@ -1291,17 +1292,17 @@
 
170
@@ -1295,17 +1296,17 @@
171
171
 
172
172
 
173
173
 void
194
194
                _gtk_error_dialog_from_gerror_run (NULL, &error);
195
195
 }
196
196
 
197
 
@@ -1397,8 +1398,7 @@
 
197
@@ -1402,8 +1403,7 @@
198
198
        QuickLounge *quick_lounge;
199
199
        GError      *error = NULL;
200
200
        char        *uri;
204
204
 
205
205
        quick_lounge = g_new0 (QuickLounge, 1);
206
206
 
207
 
@@ -1439,10 +1439,10 @@
 
207
@@ -1444,10 +1444,10 @@
208
208
                max_size = DEFAULT_MAX_SIZE;
209
209
        }
210
210
 
218
218
        }
219
219
 
220
220
        /**/
221
 
@@ -1450,7 +1450,7 @@
 
221
@@ -1455,7 +1455,7 @@
222
222
        quick_lounge->quick_box = QUICK_BOX (quick_box_new (quick_lounge->orientation, quick_lounge->size, quick_lounge->icon_theme));
223
223
        quick_box_set_min_visible_cols (quick_lounge->quick_box, min_cols);
224
224
        quick_box_set_max_visible_cols (quick_lounge->quick_box, max_size);
227
227
 
228
228
        g_object_set_data (G_OBJECT (quick_lounge->quick_box),
229
229
                           "quick_lounge",
230
 
diff -ruN quick-lounge-applet-2.1.1.orig/src/quick-lounge.glade quick-lounge-applet-2.1.1/src/quick-lounge.glade
231
 
--- quick-lounge-applet-2.1.1.orig/src/quick-lounge.glade       2004-03-30 19:31:54.000000000 +0200
232
 
+++ quick-lounge-applet-2.1.1/src/quick-lounge.glade    2004-04-27 10:54:29.000000000 +0200
 
230
diff -ruN quick-lounge-applet-2.2.0.orig/src/quick-lounge.glade quick-lounge-applet-2.2.0/src/quick-lounge.glade
 
231
--- quick-lounge-applet-2.2.0.orig/src/quick-lounge.glade       2004-10-13 14:52:34.000000000 +0000
 
232
+++ quick-lounge-applet-2.2.0/src/quick-lounge.glade    2004-12-16 11:58:37.000000000 +0000
233
233
@@ -645,7 +645,7 @@
234
234
                      <child>
235
235
                        <widget class="GtkTable" id="table3">
307
307
                        </widget>
308
308
                        <packing>
309
309
                          <property name="padding">0</property>
310
 
@@ -845,25 +906,6 @@
311
 
                          <property name="fill">True</property>
 
310
@@ -846,24 +907,6 @@
312
311
                        </packing>
313
312
                      </child>
314
 
-
 
313
 
315
314
-                     <child>
316
315
-                       <widget class="GtkCheckButton" id="p_icon_size_checkbutton">
317
316
-                         <property name="visible">True</property>
318
317
-                         <property name="can_focus">True</property>
319
 
-                         <property name="label" translatable="yes">Icon size _follows panel size.</property>
 
318
-                         <property name="label" translatable="yes">Always use one row</property>
320
319
-                         <property name="use_underline">True</property>
321
320
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
322
321
-                         <property name="focus_on_click">True</property>
333
332
                    </widget>
334
333
                    <packing>
335
334
                      <property name="padding">0</property>
336
 
diff -ruN quick-lounge-applet-2.1.1.orig/src/quick-lounge.h quick-lounge-applet-2.1.1/src/quick-lounge.h
337
 
--- quick-lounge-applet-2.1.1.orig/src/quick-lounge.h   2004-03-30 19:31:54.000000000 +0200
338
 
+++ quick-lounge-applet-2.1.1/src/quick-lounge.h        2004-04-27 10:47:09.000000000 +0200
 
335
diff -ruN quick-lounge-applet-2.2.0.orig/src/quick-lounge.h quick-lounge-applet-2.2.0/src/quick-lounge.h
 
336
--- quick-lounge-applet-2.2.0.orig/src/quick-lounge.h   2004-10-13 14:52:34.000000000 +0000
 
337
+++ quick-lounge-applet-2.2.0/src/quick-lounge.h        2004-12-16 11:55:41.000000000 +0000
339
338
@@ -59,8 +59,8 @@
340
339
 void    quick_lounge_set_max_size                (QuickLounge  *quick_lounge, 
341
340
                                                  int           value);
347
346
 
348
347
 void    quick_lounge_new_launcher                (QuickLounge  *quick_lounge,
349
348
                                                  int           pos);
350
 
diff -ruN quick-lounge-applet-2.1.1.orig/src/quick-lounge.schemas.in quick-lounge-applet-2.1.1/src/quick-lounge.schemas.in
351
 
--- quick-lounge-applet-2.1.1.orig/src/quick-lounge.schemas.in  2004-03-30 19:31:54.000000000 +0200
352
 
+++ quick-lounge-applet-2.1.1/src/quick-lounge.schemas.in       2004-04-27 10:50:38.000000000 +0200
353
 
@@ -34,12 +34,12 @@
 
349
diff -ruN quick-lounge-applet-2.2.0.orig/src/quick-lounge.schemas.in quick-lounge-applet-2.2.0/src/quick-lounge.schemas.in
 
350
--- quick-lounge-applet-2.2.0.orig/src/quick-lounge.schemas.in  2004-10-13 14:52:34.000000000 +0000
 
351
+++ quick-lounge-applet-2.2.0/src/quick-lounge.schemas.in       2004-12-16 12:01:43.000000000 +0000
 
352
@@ -24,12 +24,12 @@
354
353
       </schema>
355
354
 
356
355
       <schema>
357
 
-        <key>/schemas/apps/quick-lounge-applet/prefs/icon_size_follow_panel</key>
 
356
-        <key>/schemas/apps/quick-lounge-applet/prefs/icon_size_follows_panel</key>
358
357
+        <key>/schemas/apps/quick-lounge-applet/prefs/rows</key>
359
358
         <owner>quick-lounge-applet</owner>
360
359
-        <type>bool</type>
366
365
+          <short>Number of rows to display</short>
367
366
           <long></long>
368
367
         </locale>
369
 
 
 
368
       </schema>