[mms-lib] Housekeeping

Removed some unnecessary code.
sailfishos · Feb 24, 2014 · a9da235 · a9da235
1 parent d03becd
commit a9da235
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 31 deletions.
diff --git a/mms-lib/src/mms_task.c b/mms-lib/src/mms_task.c
@@ -134,20 +134,13 @@ mms_task_finalize(
     G_OBJECT_CLASS(mms_task_parent_class)->finalize(object);
 }
 
-void
-mms_task_init_class(
-    MMSTaskClass* klass)
-{
-    klass->fn_cancel = mms_task_cancel_cb;
-    G_OBJECT_CLASS(klass)->finalize = mms_task_finalize;
-}
-
 static
 void
 mms_task_class_init(
     MMSTaskClass* klass)
 {
-    mms_task_init_class(klass);
+    klass->fn_cancel = mms_task_cancel_cb;
+    G_OBJECT_CLASS(klass)->finalize = mms_task_finalize;
 }
 
 static

diff --git a/mms-lib/src/mms_task.h b/mms-lib/src/mms_task.h
@@ -87,10 +87,6 @@ GType mms_task_get_type(void);
 #define MMS_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
         MMS_TYPE_TASK, MMSTaskClass))
 
-void
-mms_task_init_class(
-    MMSTaskClass* klass);
-
 void*
 mms_task_alloc(
     GType type,

diff --git a/mms-lib/src/mms_task_decode.c b/mms-lib/src/mms_task_decode.c
@@ -244,7 +244,6 @@ void
 mms_task_decode_class_init(
     MMSTaskDecodeClass* klass)
 {
-    mms_task_init_class(MMS_TASK_CLASS(mms_task_decode_parent_class));
     klass->fn_run = mms_task_decode_run;
     G_OBJECT_CLASS(klass)->finalize = mms_task_decode_finalize;
 }

diff --git a/mms-lib/src/mms_task_http.c b/mms-lib/src/mms_task_http.c
@@ -544,13 +544,13 @@ mms_task_http_finalize(
 /**
  * Per class initializer
  */
+static
 void
-mms_task_http_init_class(
+mms_task_http_class_init(
     MMSTaskHttpClass* klass)
 {
     GObjectClass* object_class = G_OBJECT_CLASS(klass);
     MMSTaskClass* task_class = &klass->task;
-    mms_task_init_class(MMS_TASK_CLASS(mms_task_http_parent_class));
     task_class->fn_run = mms_task_http_run;
     task_class->fn_transmit = mms_task_http_transmit;
     task_class->fn_network_unavailable = mms_task_http_network_unavailable;
@@ -559,14 +559,6 @@ mms_task_http_init_class(
     object_class->finalize = mms_task_http_finalize;
 }
 
-static
-void
-mms_task_http_class_init(
-    MMSTaskHttpClass* klass)
-{
-    mms_task_http_init_class(klass);
-}
-
 /**
  * Per instance initializer
  */

diff --git a/mms-lib/src/mms_task_http.h b/mms-lib/src/mms_task_http.h
@@ -42,10 +42,6 @@ GType mms_task_http_get_type(void);
 #define MMS_TASK_HTTP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
         MMS_TYPE_TASK_HTTP, MMSTaskHttpClass))
 
-void
-mms_task_http_init_class(
-    MMSTaskHttpClass* klass);
-
 /* If send_file is not NULL, it does a POST, otherwise it's a GET */
 void*
 mms_task_http_alloc(

diff --git a/mms-lib/src/mms_task_notification.c b/mms-lib/src/mms_task_notification.c
@@ -219,7 +219,6 @@ void
 mms_task_notification_class_init(
     MMSTaskNotificationClass* klass)
 {
-    mms_task_init_class(MMS_TASK_CLASS(mms_task_notification_parent_class));
     klass->fn_run = mms_task_notification_run;
     G_OBJECT_CLASS(klass)->finalize = mms_task_notification_finalize;
 }

diff --git a/mms-lib/src/mms_task_publish.c b/mms-lib/src/mms_task_publish.c
@@ -60,7 +60,6 @@ void
 mms_task_publish_class_init(
     MMSTaskPublishClass* klass)
 {
-    mms_task_init_class(MMS_TASK_CLASS(mms_task_publish_parent_class));
     klass->fn_run = mms_task_publish_run;
     G_OBJECT_CLASS(klass)->finalize = mms_task_publish_finalize;
 }

diff --git a/mms-lib/src/mms_task_retrieve.c b/mms-lib/src/mms_task_retrieve.c
@@ -95,7 +95,6 @@ void
 mms_task_retrieve_class_init(
     MMSTaskRetrieveClass* klass)
 {
-    mms_task_http_init_class(MMS_TASK_HTTP_CLASS(mms_task_retrieve_parent_class));
     klass->fn_started = mms_task_retrieve_started;
     klass->fn_paused = mms_task_retrieve_paused;
     klass->fn_done = mms_task_retrieve_done;