Merge branch 'next-gtk2'
authorHenry Gebhardt <hsggebhardt@gmail.com>
Sat, 14 Sep 2013 14:42:26 +0000 (10:42 -0400)
committerHenry Gebhardt <hsggebhardt@gmail.com>
Sat, 14 Sep 2013 14:42:26 +0000 (10:42 -0400)
Conflicts:
src/plugins/volumealsa/volumealsa.c

1  2 
src/misc.c
src/panel.c
src/plugins/cpu/cpu.c
src/plugins/dclock.c
src/plugins/launchbar.c
src/plugins/monitors/monitors.c
src/plugins/volumealsa/volumealsa.c

diff --cc src/misc.c
Simple merge
diff --cc src/panel.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -661,16 -661,16 +661,16 @@@ PluginClass volumealsa_plugin_class = 
  
      PLUGINCLASS_VERSIONING,
  
-     type : "volumealsa",
-     name : N_("Volume Control"),
-     version: "1.0",
-     description : N_("Display and control volume for ALSA"),
-     constructor : volumealsa_constructor,
-     destructor  : volumealsa_destructor,
-     config :volumealsa_configure,
-     save : NULL,
-     panel_configuration_changed : volumealsa_panel_configuration_changed
+     .type = "volumealsa",
+     .name = N_("Volume Control"),
+     .version = "1.0",
 -    .description = "Display and control volume for ALSA",
++    .description = N_("Display and control volume for ALSA"),
+     .constructor = volumealsa_constructor,
+     .destructor  = volumealsa_destructor,
 -    .config  =volumealsa_configure,
++    .config = volumealsa_configure,
+     .save = NULL,
+     .panel_configuration_changed = volumealsa_panel_configuration_changed
  
  };