Diff of /trunk/src/misc.c

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

revision 308 by harbaum, Wed Oct 14 07:25:55 2009 UTC revision 314 by harbaum, Mon Nov 23 18:33:12 2009 UTC
# Line 25  static void vmessagef(GtkWidget *parent, Line 25  static void vmessagef(GtkWidget *parent,
25    
26    char *buf = g_strdup_vprintf(fmt, args);    char *buf = g_strdup_vprintf(fmt, args);
27    
28    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
29    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
30                       GTK_WINDOW(parent),                             GTK_WINDOW(parent),
31                       GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
32                       type, buttons, buf);                             type, buttons, buf);
33    
34    gtk_window_set_title(GTK_WINDOW(dialog), title);    gtk_window_set_title(GTK_WINDOW(dialog), title);
35    #else
36      GtkWidget *dialog =
37        hildon_note_new_information(GTK_WINDOW(parent), buf);
38    #endif
39    
40    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
41    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
# Line 38  static void vmessagef(GtkWidget *parent, Line 43  static void vmessagef(GtkWidget *parent,
43    g_free(buf);    g_free(buf);
44  }  }
45    
 #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)  
 #define MSG_TYPE(a)  a  
 #else  
 #define MSG_TYPE(a)  GTK_MESSAGE_OTHER  
 #endif  
   
46  void messagef(GtkWidget *parent, char *title, const char *fmt, ...) {  void messagef(GtkWidget *parent, char *title, const char *fmt, ...) {
47    va_list args;    va_list args;
48    va_start( args, fmt );    va_start( args, fmt );
49    vmessagef(parent, MSG_TYPE(GTK_MESSAGE_INFO),    vmessagef(parent, GTK_MESSAGE_INFO,
50              GTK_BUTTONS_OK, title, fmt, args);              GTK_BUTTONS_OK, title, fmt, args);
51    va_end( args );    va_end( args );
52  }  }
# Line 56  void errorf(GtkWidget *parent, const cha Line 55  void errorf(GtkWidget *parent, const cha
55    va_list args;    va_list args;
56    va_start( args, fmt );    va_start( args, fmt );
57    
58    vmessagef(parent, MSG_TYPE(GTK_MESSAGE_ERROR),    vmessagef(parent, GTK_MESSAGE_ERROR,
59              GTK_BUTTONS_CLOSE, _("Error"), fmt, args);              GTK_BUTTONS_CLOSE, _("Error"), fmt, args);
60    va_end( args );    va_end( args );
61  }  }
# Line 64  void errorf(GtkWidget *parent, const cha Line 63  void errorf(GtkWidget *parent, const cha
63  void warningf(GtkWidget *parent, const char *fmt, ...) {  void warningf(GtkWidget *parent, const char *fmt, ...) {
64    va_list args;    va_list args;
65    va_start( args, fmt );    va_start( args, fmt );
66    vmessagef(parent, MSG_TYPE(GTK_MESSAGE_WARNING),    vmessagef(parent, GTK_MESSAGE_WARNING,
67              GTK_BUTTONS_CLOSE, _("Warning"), fmt, args);              GTK_BUTTONS_CLOSE, _("Warning"), fmt, args);
68    va_end( args );    va_end( args );
69  }  }
Legend:
Removed from v.308  
changed lines
  Added in v.314