Diff of /trunk/src/misc.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 167 by harbaum, Mon Apr 27 11:29:55 2009 UTC revision 200 by harbaum, Thu Jul 9 11:44:27 2009 UTC
# Line 215  file_chain_t *file_scan(char *pattern) { Line 215  file_chain_t *file_scan(char *pattern) {
215  static const gint dialog_sizes[][2] = {  static const gint dialog_sizes[][2] = {
216    { 400, 100 },  // SMALL    { 400, 100 },  // SMALL
217    { 450, 300 },  // MEDIUM    { 450, 300 },  // MEDIUM
218    #if MAEMO_VERSION_MAJOR < 5
219    { 800, 480 },  // LARGE    { 800, 480 },  // LARGE
220    #else
221      { 800, 380 },  // LARGE
222    #endif
223    { 640, 100 },  // WIDE    { 640, 100 },  // WIDE
224    {   0,   0 },  // HIGH    { 450, 480 },  // HIGH
225  };  };
226  #else  #else
227  static const gint dialog_sizes[][2] = {  static const gint dialog_sizes[][2] = {
# Line 225  static const gint dialog_sizes[][2] = { Line 229  static const gint dialog_sizes[][2] = {
229    { 400, 300 },  // MEDIUM    { 400, 300 },  // MEDIUM
230    { 500, 350 },  // LARGE    { 500, 350 },  // LARGE
231    { 450, 100 },  // WIDE    { 450, 100 },  // WIDE
232    {   0,   0 },  // HIGH    { 200, 350 },  // HIGH
233  };  };
234  #endif  #endif
235    
# Line 256  GtkWidget *misc_dialog_new(guint hint, c Line 260  GtkWidget *misc_dialog_new(guint hint, c
260    
261    return dialog;    return dialog;
262  }  }
263    
264    #if defined(USE_HILDON) && (MAEMO_VERSION_MAJOR == 5)
265    #include <hildon/hildon-pannable-area.h>
266    /* create a pannable area */
267    GtkWidget *misc_scrolled_window_new(gboolean etched_in) {
268      return hildon_pannable_area_new();
269    }
270    
271    void misc_scrolled_window_add_with_viewport(GtkWidget *win, GtkWidget *child) {
272      hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(win), child);
273    }
274    
275    #else
276    /* create a scrolled window */
277    GtkWidget *misc_scrolled_window_new(gboolean etched_in) {
278      GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);
279      gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
280                                     GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
281      if(etched_in)
282        gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window),
283                                            GTK_SHADOW_ETCHED_IN);
284      return scrolled_window;
285    }
286    
287    void misc_scrolled_window_add_with_viewport(GtkWidget *win, GtkWidget *child) {
288      gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(win), child);
289    }
290    
291    
292    #endif
293    
294    const char *misc_get_proxy_uri(settings_t *settings) {
295      static char proxy_buffer[64];
296    
297      /* use environment settings if preset */
298      const char *proxy = g_getenv("http_proxy");
299      if(proxy) return proxy;
300    
301      /* otherwise try settings */
302      if(!settings || !settings->proxy ||
303         !settings->proxy->host) return NULL;
304    
305      snprintf(proxy_buffer, sizeof(proxy_buffer),
306               "http://%s:%u", settings->proxy->host,
307               settings->proxy->port);
308      proxy_buffer[sizeof(proxy_buffer)-1] = 0;
309      return proxy_buffer;
310    }
Legend:
Removed from v.167  
changed lines
  Added in v.200