Merge lp:~sforshee/powerd/remove-g-type-init into lp:powerd

[Seth Forshee]

Remove unnecessary calls to g_type_init()

Remove unnecessary calls to g_type_init()

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:25
http://jenkins.qa.ubuntu.com/job/powerd-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-raring-armhf-ci/39

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/39/rebuild

review: Approve (continuous-integration)

[Matt Fischer (mfisch)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:26
http://jenkins.qa.ubuntu.com/job/powerd-ci/44/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-raring-armhf-ci/44

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/44/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/powerd-autolanding/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/powerd-raring-armhf-autolanding/19/console

review: Needs Fixing (continuous-integration)

[lp:~sforshee/powerd/remove-g-type-init]

27. By Seth Forshee on 2013-05-31

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'cli/powerd-cli.c'
--- cli/powerd-cli.c	2013-05-22 20:22:08 +0000
+++ cli/powerd-cli.c	2013-05-31 16:06:24 +0000
@@ -324,8 +324,6 @@
         return -1;
     }
 
-    g_type_init();
-
     powerd_proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM,
                 G_DBUS_PROXY_FLAGS_NONE,
                 NULL,

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-31 15:18:41 +0000
+++ debian/changelog	2013-05-31 16:06:24 +0000
@@ -2,8 +2,9 @@
 
   * Fix use of uninitialized variable in wait_for_fb_thread(). Also
     change type of the variable to elimante warning on 64-bit builds.
+  * Remove unnecessary calls to g_type_init()
 
- -- Seth Forshee <[e-mail]>  Fri, 31 May 2013 10:15:13 -0500
+ -- Seth Forshee <[e-mail]>  Fri, 31 May 2013 10:24:56 -0500
 
 powerd (0.11) raring; urgency=low
 

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2013-05-30 18:50:58 +0000
+++ src/powerd.cpp	2013-05-31 16:06:24 +0000
@@ -218,7 +218,6 @@
 {
     int i, ret;
 
-    g_type_init();
     name_id = g_bus_own_name(G_BUS_TYPE_SYSTEM, "com.canonical.powerd",
         G_BUS_NAME_OWNER_FLAGS_REPLACE, powerd_bus_acquired_cb,
         powerd_name_acquired_cb, powerd_name_lost_cb, NULL, NULL);