[evolution] Rename EMailPartAudioInline to EMailPartAudio.



commit 179d763cf5437c4f7f7306e9d50791895c831c44
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun May 19 11:13:01 2013 -0400

    Rename EMailPartAudioInline to EMailPartAudio.

 modules/audio-inline/Makefile.am                   |    2 +-
 .../audio-inline/e-mail-formatter-audio-inline.c   |   16 ++++++++--------
 modules/audio-inline/e-mail-parser-audio-inline.c  |   10 +++++-----
 ...ail-part-audio-inline.h => e-mail-part-audio.h} |   12 ++++++------
 4 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/modules/audio-inline/Makefile.am b/modules/audio-inline/Makefile.am
index eaf2c02..9da77d0 100644
--- a/modules/audio-inline/Makefile.am
+++ b/modules/audio-inline/Makefile.am
@@ -15,7 +15,7 @@ module_audio_inline_la_SOURCES =                              \
        e-mail-formatter-audio-inline.h                                 \
        e-mail-parser-audio-inline.c                                    \
        e-mail-parser-audio-inline.h                                    \
-       e-mail-part-audio-inline.h                                      \
+       e-mail-part-audio.h                                             \
        evolution-module-audio-inline.c
 
 module_audio_inline_la_LIBADD =                                \
diff --git a/modules/audio-inline/e-mail-formatter-audio-inline.c 
b/modules/audio-inline/e-mail-formatter-audio-inline.c
index 3545efd..760dc08 100644
--- a/modules/audio-inline/e-mail-formatter-audio-inline.c
+++ b/modules/audio-inline/e-mail-formatter-audio-inline.c
@@ -32,7 +32,7 @@
 #include <em-format/e-mail-formatter-extension.h>
 #include <em-format/e-mail-formatter.h>
 
-#include "e-mail-part-audio-inline.h"
+#include "e-mail-part-audio.h"
 
 #define d(x)
 
@@ -76,7 +76,7 @@ static const gchar *formatter_mime_types[] = {
 
 static void
 pause_clicked (GtkWidget *button,
-               EMailPartAudioInline *part)
+               EMailPartAudio *part)
 {
        if (part->playbin) {
                /* pause playing */
@@ -86,7 +86,7 @@ pause_clicked (GtkWidget *button,
 
 static void
 stop_clicked (GtkWidget *button,
-              EMailPartAudioInline *part)
+              EMailPartAudio *part)
 {
        if (part->playbin) {
                /* ready to play */
@@ -116,7 +116,7 @@ gst_callback (GstBus *bus,
               GstMessage *message,
               gpointer data)
 {
-       EMailPartAudioInline *part = data;
+       EMailPartAudio *part = data;
        GstMessageType msg_type;
 
        g_return_val_if_fail (part != NULL, TRUE);
@@ -167,7 +167,7 @@ gst_callback (GstBus *bus,
 
 static void
 play_clicked (GtkWidget *button,
-              EMailPartAudioInline *part)
+              EMailPartAudio *part)
 {
        GstState cur_state;
 
@@ -285,10 +285,10 @@ emfe_audio_inline_get_widget (EMailFormatterExtension *extension,
                               GHashTable *params)
 {
        GtkWidget *box;
-       EMailPartAudioInline *ai_part;
+       EMailPartAudio *ai_part;
 
-       g_return_val_if_fail (E_MAIL_PART_IS (part, EMailPartAudioInline), NULL);
-       ai_part = (EMailPartAudioInline *) part;
+       g_return_val_if_fail (E_MAIL_PART_IS (part, EMailPartAudio), NULL);
+       ai_part = (EMailPartAudio *) part;
 
        /* it is OK to call UI functions here, since we are called from UI thread */
        box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
diff --git a/modules/audio-inline/e-mail-parser-audio-inline.c 
b/modules/audio-inline/e-mail-parser-audio-inline.c
index 1ebbf90..54d6a98 100644
--- a/modules/audio-inline/e-mail-parser-audio-inline.c
+++ b/modules/audio-inline/e-mail-parser-audio-inline.c
@@ -26,7 +26,7 @@
 #include <glib/gstdio.h>
 
 #include "e-mail-parser-audio-inline.h"
-#include "e-mail-part-audio-inline.h"
+#include "e-mail-part-audio.h"
 
 #include <camel/camel.h>
 
@@ -78,7 +78,7 @@ static const gchar *parser_mime_types[] = {
 static void
 mail_part_audio_inline_free (EMailPart *mail_part)
 {
-       EMailPartAudioInline *ai_part = (EMailPartAudioInline *) mail_part;
+       EMailPartAudio *ai_part = (EMailPartAudio *) mail_part;
 
        g_clear_object (&ai_part->play_button);
        g_clear_object (&ai_part->pause_button);
@@ -110,7 +110,7 @@ empe_audio_inline_parse (EMailParserExtension *extension,
                          GCancellable *cancellable,
                          GQueue *out_mail_queue)
 {
-       EMailPartAudioInline *mail_part;
+       EMailPartAudio *mail_part;
        GQueue work_queue = G_QUEUE_INIT;
        gint len;
        gint n_parts_added = 0;
@@ -120,8 +120,8 @@ empe_audio_inline_parse (EMailParserExtension *extension,
 
        d (printf ("audio inline formatter: format classid %s\n", part_id->str));
 
-       mail_part = (EMailPartAudioInline *) e_mail_part_subclass_new (
-               part, part_id->str, sizeof (EMailPartAudioInline),
+       mail_part = (EMailPartAudio *) e_mail_part_subclass_new (
+               part, part_id->str, sizeof (EMailPartAudio),
                (GFreeFunc) mail_part_audio_inline_free);
        mail_part->parent.mime_type = camel_content_type_simple (
                camel_mime_part_get_content_type (part));
diff --git a/modules/audio-inline/e-mail-part-audio-inline.h b/modules/audio-inline/e-mail-part-audio.h
similarity index 80%
rename from modules/audio-inline/e-mail-part-audio-inline.h
rename to modules/audio-inline/e-mail-part-audio.h
index e087ecd..628da0b 100644
--- a/modules/audio-inline/e-mail-part-audio-inline.h
+++ b/modules/audio-inline/e-mail-part-audio.h
@@ -1,5 +1,5 @@
 /*
- * e-mail-part-audio-inline.h
+ * e-mail-part-audio.h
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef E_MAIL_PART_AUDIO_INLINE_H
-#define E_MAIL_PART_AUDIO_INLINE_H
+#ifndef E_MAIL_PART_AUDIO_H
+#define E_MAIL_PART_AUDIO_H
 
 #include <glib-object.h>
 
@@ -26,9 +26,9 @@
 
 G_BEGIN_DECLS
 
-typedef struct _EMailPartAudioInline EMailPartAudioInline;
+typedef struct _EMailPartAudio EMailPartAudio;
 
-struct _EMailPartAudioInline {
+struct _EMailPartAudio {
        EMailPart parent;
 
        gchar *filename;
@@ -42,5 +42,5 @@ struct _EMailPartAudioInline {
 
 G_END_DECLS
 
-#endif /* E_MAIL_PART_AUDIO_INLINE_H */
+#endif /* E_MAIL_PART_AUDIO_H */
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]